[Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton

All of lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton
@ 2017-04-29  8:37 Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 01/31] package/kodi-visualisation-fountain: remove package Bernd Kuhls
                   ` (33 more replies)
  0 siblings, 34 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Hi,

this series bumps Kodi to 17.1-Krypton, released 2017/03/21:
https://kodi.tv/kodi-v17-1-krypton/

Patches 0001-0021 must be committed together to avoid having
incompatible package versions in buildroot.

Please note the Kodi needs patched versions of libdvdcss, libdvdread
and libdvdnav. Instead of including the Kodi-specific patches in the
respective buildroot packages we let Kodi build the libraries during
make and provide the pre-downloaded and patched tarballs for it.
Debian chose a similar approach to avoid patching the system versions
of libdvd*:
https://sources.debian.net/src/kodi/2:17.1%2Bdfsg1-2/debian/README.source/#L11

Regards, Bernd

v7: rebased
    kodi
    - removed libgrypt from dependencies, it was already an optional
      dependency in Kodi 16, it is not part of the CMake buildsystem
      anymore
    - re-worked patch to support more archs
      With the exception of one arch (i386 without sse - upstream
      decision) all arch-specific limitations were removed
      added -latomic for the BR2_TOOLCHAIN_HAS_LIBATOMIC=y case,
      therefore BR2_TOOLCHAIN_HAS_SYNC_8 was also removed
    - added comment why va & vdpau depend on x11/opengl/egl (Yann)

    To-Do
    - kodi-screensaver-rsxs: take review from Yann into account

v6: rebased
    removed patch to disable online check (Yann)
    re-ordered addon version bump patches (Yann)

    kodi
    - removed gmp, leftover code before
      CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
      was added (Yann)
    - event clients: added URL to Config.in help text (Yann)
    - added dependency to BR2_TOOLCHAIN_HAS_SYNC_4 for pulseaudio,
      added comment about libglib2 dependencies (Yann)
    - added libxml2 as additional dependency for optional xslt support
      (Yann)
    - squashed removal of internal rtmp support (Yann)
    - added commit note that libva support depends on x11 (Yann)
    - added explanation why gcc >= 4.8 is now required (Yann)
    - depends on locale support (needs libiconv_open), removed
      0002-cmake-add-FindIconv.cmake.patch (Yann)
    - removed dependency to host-gettext

    kodi-jsonschemabuilder
    - updated (Yann)
    - share source tarball with kodi package

    kodi-texturepacker
    - updated (Yann)
    - share source tarball with kodi package

    kodi-platform: bump (Yann)

    libplatform: updated according to Yann's comments

    kodi-inputstream-rtmp: add select for the new package in
    Config.in.legacy (Yann)

    kodi-pvr-mediaportal-tvserver: removed "needs locale support" patch,
    kodi itself now depends on locale

    kodi-skin-confluence: removed patch for now. Fixing it will require
    some time and debugging (it works for me, though, and I would like
    to see the working part of the series in buildroot 2017.05, if
    possible.

    libsquish
    - removed patch to remove libsquish (Yann)
    - removed Kodi-specific patch
    - bumped to 1.15 (Yann)

    To-Do
    - kodi-screensaver-rsxs: take review from Yann into account
    - explain why libva and libvdpau depend on OpenGL
    - optimize KODI_CONF_OPTS for -DWITH_ARCH & -DWITH_CPU (includes
      much testing), this patch can be committed later. Therefore this
      patch is the last one in the series.

v5: removed patches for libdvd*
    add dependency to libglib2 for pulseaudio
    fix c/cxxflags for gles
    BR2_PACKAGE_KODI_LIBVA depends on xorg
    squashed patches to enhance supported archs
    bumped kodi-pvr-dvblink
    enable optional support for OpenGL on arm
v4: package/kodi: switched up CMake, bumped to 17.1
    package/libdvd*: static build is not needed anymore
    various addon bumps and new optional packages for Kodi
v3: fixed legal-info for libplatform & kodi-skin-confluence
v2: added commit log to "package/kodi: add Kconfig option to make
    TexturePacker optional" (Thomas)
    

Bernd Kuhls (31):
  package/kodi-visualisation-fountain: remove package
  package/libplatform: bump version
  package/kodi-platform: bump version
  package/libcec: bump version to 4.0.2
  package/xmlstarlet: add host variant
  package/kodi-jsonschemabuilder: new host package
  package/kodi-texturepacker: new host package
  package/kodi: bump to version 17.1-Krypton
  package/kodi-pvr-*: mass version bump
  package/kodi-pvr-mythtv: bump version to 4.15.0
  package/kodi-pvr-nextpvr: bump version to 2.4.11
  package/kodi-adsp-basic: bump version
  package/kodi-adsp-freesurround: bump version
  package/kodi-audioencoder-*: mass version bump
  package/kodi-audiodecoder-*: mass version bump
  package/kodi-audiodecoder-timidity: bump version
  package/kodi-screensaver-*: mass version bump
  package/kodi-screensaver-rsxs: bump version
  package/kodi-visualisation-*: mass version bump
  package/kodi-visualisation-waveforhue: bump version
  package/kodi-visualisation-shadertoy: bump version
  package/kodi: add optional support for bluez5
  package/kodi: libxslt is an optional package
  package/kodi: add optional support for pulseaudio
  package/kodi: add optional support for event clients
  package/kodi: add optional support for lcms2
  package/kodi-inputstream-rtmp: new package
  package/kodi-inputstream-adaptive: new package
  package/libsquish: Remove Kodi-specific patch
  package/libsquish: bump version to 1.15
  package/kodi: Add support for more archs

 Config.in.legacy                                   |   14 +
 package/kodi-adsp-basic/kodi-adsp-basic.hash       |    2 +-
 package/kodi-adsp-basic/kodi-adsp-basic.mk         |    4 +-
 .../kodi-adsp-freesurround.hash                    |    2 +-
 .../kodi-adsp-freesurround.mk                      |    4 +-
 .../kodi-audiodecoder-modplug.hash                 |    2 +-
 .../kodi-audiodecoder-modplug.mk                   |    2 +-
 .../kodi-audiodecoder-nosefart.hash                |    2 +-
 .../kodi-audiodecoder-nosefart.mk                  |    2 +-
 .../kodi-audiodecoder-opus.hash                    |    2 +-
 .../kodi-audiodecoder-opus.mk                      |    2 +-
 .../kodi-audiodecoder-sidplay.hash                 |    2 +-
 .../kodi-audiodecoder-sidplay.mk                   |    2 +-
 .../kodi-audiodecoder-snesapu.hash                 |    2 +-
 .../kodi-audiodecoder-snesapu.mk                   |    2 +-
 .../kodi-audiodecoder-stsound.hash                 |    2 +-
 .../kodi-audiodecoder-stsound.mk                   |    2 +-
 package/kodi-audiodecoder-timidity/Config.in       |    1 -
 .../kodi-audiodecoder-timidity.hash                |    2 +-
 .../kodi-audiodecoder-timidity.mk                  |    4 +-
 .../kodi-audiodecoder-vgmstream.hash               |    2 +-
 .../kodi-audiodecoder-vgmstream.mk                 |    2 +-
 .../kodi-audioencoder-flac.hash                    |    2 +-
 .../kodi-audioencoder-flac.mk                      |    2 +-
 .../kodi-audioencoder-lame.hash                    |    2 +-
 .../kodi-audioencoder-lame.mk                      |    2 +-
 .../kodi-audioencoder-vorbis.hash                  |    2 +-
 .../kodi-audioencoder-vorbis.mk                    |    2 +-
 .../kodi-audioencoder-wav.hash                     |    2 +-
 .../kodi-audioencoder-wav/kodi-audioencoder-wav.mk |    2 +-
 package/kodi-inputstream-adaptive/Config.in        |    8 +
 .../kodi-inputstream-adaptive.hash                 |    2 +
 .../kodi-inputstream-adaptive.mk                   |   13 +
 package/kodi-inputstream-rtmp/Config.in            |    7 +
 .../kodi-inputstream-rtmp.hash                     |    2 +
 .../kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk |   13 +
 .../kodi-jsonschemabuilder.hash                    |    1 +
 .../kodi-jsonschemabuilder.mk                      |   25 +
 package/kodi-platform/kodi-platform.hash           |    2 +-
 package/kodi-platform/kodi-platform.mk             |    2 +-
 package/kodi-pvr-argustv/kodi-pvr-argustv.hash     |    2 +-
 package/kodi-pvr-argustv/kodi-pvr-argustv.mk       |    4 +-
 package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash     |    2 +-
 package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk       |    4 +-
 package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash |    2 +-
 package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk   |    4 +-
 package/kodi-pvr-filmon/kodi-pvr-filmon.hash       |    2 +-
 package/kodi-pvr-filmon/kodi-pvr-filmon.mk         |    4 +-
 package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash |    2 +-
 package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk   |    4 +-
 package/kodi-pvr-hts/kodi-pvr-hts.hash             |    2 +-
 package/kodi-pvr-hts/kodi-pvr-hts.mk               |    4 +-
 .../kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash   |    2 +-
 package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk |    4 +-
 package/kodi-pvr-mediaportal-tvserver/Config.in    |    2 +
 .../kodi-pvr-mediaportal-tvserver.hash             |    2 +-
 .../kodi-pvr-mediaportal-tvserver.mk               |    4 +-
 package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash       |    2 +-
 package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk         |    6 +-
 ...epresentation-of-char_class_e-in-struct-t.patch |   48 -
 package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash     |    2 +-
 package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk       |    4 +-
 package/kodi-pvr-njoy/kodi-pvr-njoy.hash           |    2 +-
 package/kodi-pvr-njoy/kodi-pvr-njoy.mk             |    4 +-
 package/kodi-pvr-pctv/kodi-pvr-pctv.hash           |    2 +-
 package/kodi-pvr-pctv/kodi-pvr-pctv.mk             |    4 +-
 package/kodi-pvr-stalker/kodi-pvr-stalker.hash     |    2 +-
 package/kodi-pvr-stalker/kodi-pvr-stalker.mk       |    4 +-
 package/kodi-pvr-vbox/kodi-pvr-vbox.hash           |    2 +-
 package/kodi-pvr-vbox/kodi-pvr-vbox.mk             |    4 +-
 package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash   |    2 +-
 package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk     |    4 +-
 package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash       |    2 +-
 package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk         |    4 +-
 package/kodi-pvr-wmc/kodi-pvr-wmc.hash             |    2 +-
 package/kodi-pvr-wmc/kodi-pvr-wmc.mk               |    4 +-
 .../kodi-screensaver-asteroids.hash                |    2 +-
 .../kodi-screensaver-asteroids.mk                  |    2 +-
 .../kodi-screensaver-asterwave.hash                |    2 +-
 .../kodi-screensaver-asterwave.mk                  |    2 +-
 .../kodi-screensaver-biogenesis.hash               |    2 +-
 .../kodi-screensaver-biogenesis.mk                 |    2 +-
 .../kodi-screensaver-cpblobs.hash                  |    2 +-
 .../kodi-screensaver-cpblobs.mk                    |    2 +-
 .../kodi-screensaver-crystalmorph.hash             |    2 +-
 .../kodi-screensaver-crystalmorph.mk               |    2 +-
 .../kodi-screensaver-greynetic.hash                |    2 +-
 .../kodi-screensaver-greynetic.mk                  |    2 +-
 .../kodi-screensaver-matrixtrails.hash             |    2 +-
 .../kodi-screensaver-matrixtrails.mk               |    2 +-
 .../kodi-screensaver-pingpong.hash                 |    2 +-
 .../kodi-screensaver-pingpong.mk                   |    2 +-
 .../kodi-screensaver-planestate.hash               |    2 +-
 .../kodi-screensaver-planestate.mk                 |    2 +-
 .../kodi-screensaver-pyro.hash                     |    2 +-
 .../kodi-screensaver-pyro/kodi-screensaver-pyro.mk |    2 +-
 .../kodi-screensaver-rsxs/0001-cross-compile.patch |    2 +-
 .../0002-fix-default-include-dir.patch             |   28 +
 package/kodi-screensaver-rsxs/Config.in            |    1 +
 .../kodi-screensaver-rsxs.hash                     |    2 +-
 .../kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk |    5 +-
 .../kodi-screensaver-stars.hash                    |    2 +-
 .../kodi-screensaver-stars.mk                      |    2 +-
 .../0001-texturepacker.patch}                      |    0
 package/kodi-texturepacker/kodi-texturepacker.hash |    1 +
 package/kodi-texturepacker/kodi-texturepacker.mk   |   41 +
 .../kodi-visualisation-fishbmc.hash                |    2 +-
 .../kodi-visualisation-fishbmc.mk                  |    2 +-
 package/kodi-visualisation-fountain/Config.in      |   11 -
 .../kodi-visualisation-fountain.hash               |    2 -
 .../kodi-visualisation-fountain.mk                 |   11 -
 .../kodi-visualisation-goom.hash                   |    2 +-
 .../kodi-visualisation-goom.mk                     |    2 +-
 ...GLES2-also-search-for-egl-with-pkg-config.patch |    4 +-
 package/kodi-visualisation-shadertoy/Config.in     |    1 -
 .../kodi-visualisation-shadertoy.hash              |    2 +-
 .../kodi-visualisation-shadertoy.mk                |    6 +-
 .../kodi-visualisation-spectrum.hash               |    2 +-
 .../kodi-visualisation-spectrum.mk                 |    2 +-
 .../kodi-visualisation-waveforhue.hash             |    2 +-
 .../kodi-visualisation-waveforhue.mk               |    4 +-
 .../kodi-visualisation-waveform.hash               |    2 +-
 .../kodi-visualisation-waveform.mk                 |    2 +-
 package/kodi/0001-Fixup-include-path.patch         |   33 -
 ....cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch |   42 +
 ...e-dependency-on-gmp-and-libintl-from-Find.patch |   39 +
 ...0003-ALSA-fix-device-change-event-support.patch |   67 -
 package/kodi/0003-Add-support-for-sh4.patch        |  108 ++
 package/kodi/0004-Add-support-for-sparc.patch      |   91 ++
 ....cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch |   41 -
 package/kodi/0005-Add-support-for-arc.patch        |   91 ++
 ...exturePacker-fix-compilation-with-gcc-4.6.patch |   53 -
 package/kodi/0006-Add-support-for-xtensa.patch     |   91 ++
 package/kodi/0006-ffmpeg30.patch                   |  646 ---------
 ...r-out-of-memory-errors-with-large-numbers.patch |   45 -
 ...ding-issue-when-reading-certain-id3v1-tag.patch |   82 --
 ...lib-cximage-6.0-fix-compilation-with-gcc6.patch | 1438 --------------------
 ...10-curl-support-version-7.5.0-and-upwards.patch |   34 -
 ...bmc_pvr_types.h-Fix-compilation-with-gcc6.patch |   30 -
 package/kodi/0012-Fix_includes_in_amcodec.patch    |   38 -
 package/kodi/Config.in                             |  106 +-
 package/kodi/kodi.hash                             |    8 +-
 package/kodi/kodi.mk                               |  359 +++--
 package/libcec/libcec.hash                         |    2 +-
 package/libcec/libcec.mk                           |    4 +-
 .../0001-p8-platform-config-fix-lookup-paths.patch |   38 +
 ...nfig.cmake-fix-paths-for-cross-compilatio.patch |   40 -
 package/libplatform/libplatform.hash               |    2 +-
 package/libplatform/libplatform.mk                 |    6 +-
 package/libsquish/0001-kodi.patch                  |  327 -----
 package/libsquish/libsquish.hash                   |    3 +-
 package/libsquish/libsquish.mk                     |    2 +-
 package/xmlstarlet/xmlstarlet.mk                   |    3 +
 153 files changed, 1088 insertions(+), 3270 deletions(-)
 create mode 100644 package/kodi-inputstream-adaptive/Config.in
 create mode 100644 package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
 create mode 100644 package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
 create mode 100644 package/kodi-inputstream-rtmp/Config.in
 create mode 100644 package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
 create mode 100644 package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
 create mode 120000 package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash
 create mode 100644 package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
 delete mode 100644 package/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch
 create mode 100644 package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
 rename package/{kodi/0002-texturepacker.patch => kodi-texturepacker/0001-texturepacker.patch} (100%)
 create mode 120000 package/kodi-texturepacker/kodi-texturepacker.hash
 create mode 100644 package/kodi-texturepacker/kodi-texturepacker.mk
 delete mode 100644 package/kodi-visualisation-fountain/Config.in
 delete mode 100644 package/kodi-visualisation-fountain/kodi-visualisation-fountain.hash
 delete mode 100644 package/kodi-visualisation-fountain/kodi-visualisation-fountain.mk
 delete mode 100644 package/kodi/0001-Fixup-include-path.patch
 create mode 100644 package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
 create mode 100644 package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
 delete mode 100644 package/kodi/0003-ALSA-fix-device-change-event-support.patch
 create mode 100644 package/kodi/0003-Add-support-for-sh4.patch
 create mode 100644 package/kodi/0004-Add-support-for-sparc.patch
 delete mode 100644 package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
 create mode 100644 package/kodi/0005-Add-support-for-arc.patch
 delete mode 100644 package/kodi/0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch
 create mode 100644 package/kodi/0006-Add-support-for-xtensa.patch
 delete mode 100644 package/kodi/0006-ffmpeg30.patch
 delete mode 100644 package/kodi/0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch
 delete mode 100644 package/kodi/0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch
 delete mode 100644 package/kodi/0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch
 delete mode 100644 package/kodi/0010-curl-support-version-7.5.0-and-upwards.patch
 delete mode 100644 package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch
 delete mode 100644 package/kodi/0012-Fix_includes_in_amcodec.patch
 create mode 100644 package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch
 delete mode 100644 package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch
 delete mode 100644 package/libsquish/0001-kodi.patch

-- 
2.11.0

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 01/31] package/kodi-visualisation-fountain: remove package
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:25   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 02/31] package/libplatform: bump version Bernd Kuhls
                   ` (32 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Remove broken package:
https://github.com/notspiff/visualization.fountain/issues/1#issuecomment-166156021

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 Config.in.legacy                                              |  7 +++++++
 package/kodi-visualisation-fountain/Config.in                 | 11 -----------
 .../kodi-visualisation-fountain.hash                          |  2 --
 .../kodi-visualisation-fountain.mk                            | 11 -----------
 package/kodi/Config.in                                        |  1 -
 5 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 package/kodi-visualisation-fountain/Config.in
 delete mode 100644 package/kodi-visualisation-fountain/kodi-visualisation-fountain.hash
 delete mode 100644 package/kodi-visualisation-fountain/kodi-visualisation-fountain.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 8e9f3d175d..a13e4453b2 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,13 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2017.05"
 
+config BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN
+	bool "kodi-visualisation-fountain has been removed"
+	select BR2_LEGACY
+	help
+	  According to upstream 'the visualization is not currently
+	  in a working shape.'
+
 config BR2_PACKAGE_PORTMAP
 	bool "portmap has been removed"
 	select BR2_LEGACY
diff --git a/package/kodi-visualisation-fountain/Config.in b/package/kodi-visualisation-fountain/Config.in
deleted file mode 100644
index 570d169338..0000000000
--- a/package/kodi-visualisation-fountain/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN
-	bool "kodi-visualisation-fountain"
-	depends on BR2_PACKAGE_HAS_LIBGL # libsoil
-	select BR2_PACKAGE_LIBSOIL
-	help
-	  Fountain visualization for Kodi
-
-	  https://github.com/notspiff/visualization.fountain
-
-comment "kodi-visualisation-fountain needs OpenGL"
-	depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/kodi-visualisation-fountain/kodi-visualisation-fountain.hash b/package/kodi-visualisation-fountain/kodi-visualisation-fountain.hash
deleted file mode 100644
index 8dc933effa..0000000000
--- a/package/kodi-visualisation-fountain/kodi-visualisation-fountain.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally computed
-sha256 7b2867f415f22e4bc4ba834034f00117fcf76774aea0afc7bf30b5f2d1991dd7 kodi-visualisation-fountain-f22deacd2396a204694d346f85369ea9ea70e16f.tar.gz
diff --git a/package/kodi-visualisation-fountain/kodi-visualisation-fountain.mk b/package/kodi-visualisation-fountain/kodi-visualisation-fountain.mk
deleted file mode 100644
index 5684402a2a..0000000000
--- a/package/kodi-visualisation-fountain/kodi-visualisation-fountain.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-################################################################################
-#
-# kodi-visualisation-fountain
-#
-################################################################################
-
-KODI_VISUALISATION_FOUNTAIN_VERSION = f22deacd2396a204694d346f85369ea9ea70e16f
-KODI_VISUALISATION_FOUNTAIN_SITE = $(call github,notspiff,visualization.fountain,$(KODI_VISUALISATION_FOUNTAIN_VERSION))
-KODI_VISUALISATION_FOUNTAIN_DEPENDENCIES = kodi libsoil
-
-$(eval $(cmake-package))
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index f2a3e2e032..f94e2c7c20 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -315,7 +315,6 @@ endmenu
 
 menu "Visualisations"
 	source "package/kodi-visualisation-fishbmc/Config.in"
-	source "package/kodi-visualisation-fountain/Config.in"
 	source "package/kodi-visualisation-goom/Config.in"
 	source "package/kodi-visualisation-shadertoy/Config.in"
 	source "package/kodi-visualisation-spectrum/Config.in"
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 01/31] package/kodi-visualisation-fountain: remove package
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 01/31] package/kodi-visualisation-fountain: remove package Bernd Kuhls
@ 2017-04-29  9:25   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:25 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:21 +0200, Bernd Kuhls wrote:
> Remove broken package:
> https://github.com/notspiff/visualization.fountain/issues/1#issuecomment-166156021
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  Config.in.legacy                                              |  7 +++++++
>  package/kodi-visualisation-fountain/Config.in                 | 11 -----------
>  .../kodi-visualisation-fountain.hash                          |  2 --
>  .../kodi-visualisation-fountain.mk                            | 11 -----------
>  package/kodi/Config.in                                        |  1 -
>  5 files changed, 7 insertions(+), 25 deletions(-)
>  delete mode 100644 package/kodi-visualisation-fountain/Config.in
>  delete mode 100644 package/kodi-visualisation-fountain/kodi-visualisation-fountain.hash
>  delete mode 100644 package/kodi-visualisation-fountain/kodi-visualisation-fountain.mk

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 02/31] package/libplatform: bump version
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 01/31] package/kodi-visualisation-fountain: remove package Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:31   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 03/31] package/kodi-platform: " Bernd Kuhls
                   ` (31 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Replaced patch 0001 with an alternate solution.

Updated license info after
https://github.com/Pulse-Eight/platform/commit/a1e5905874d5cdbce110344558d21a2810dead9c

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../0001-p8-platform-config-fix-lookup-paths.patch | 38 ++++++++++++++++++++
 ...nfig.cmake-fix-paths-for-cross-compilatio.patch | 40 ----------------------
 package/libplatform/libplatform.hash               |  2 +-
 package/libplatform/libplatform.mk                 |  6 ++--
 4 files changed, 42 insertions(+), 44 deletions(-)
 create mode 100644 package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch
 delete mode 100644 package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch

diff --git a/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch b/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch
new file mode 100644
index 0000000000..d487fd942e
--- /dev/null
+++ b/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch
@@ -0,0 +1,38 @@
+From 01b5478638c705af29f09ad4ed70289f70a21dcf Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Mon, 6 Feb 2017 14:04:47 +0100
+Subject: [PATCH] p8-platform-config: fix lookup paths
+
+Use the proper methods to find the headers and the library.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ p8-platform-config.cmake.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in
+index 47f30f1..f59418d 100644
+--- a/p8-platform-config.cmake.in
++++ b/p8-platform-config.cmake.in
+@@ -10,7 +10,7 @@
+ #
+ # propagate these properties from one build system to the other
+ set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR at .@p8-platform_VERSION_MINOR@")
+-set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include)
++find_path (p8-platform_INCLUDE_DIRS p8-platform/os.h)
+ set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
+ set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@")
+ set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@")
+@@ -19,7 +19,7 @@ set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@")
+ if(WIN32)
+   set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib")
+ else(WIN32)
+-  set (p8-platform_LIBRARY "-L at CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform")
++  find_library (p8-platform_LIBRARY p8-platform)
+ endif(WIN32)
+ set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@")
+ mark_as_advanced (p8-platform_LIBRARY)
+-- 
+2.7.4
+
diff --git a/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch b/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch
deleted file mode 100644
index 89f35bdb3d..0000000000
--- a/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 65ba437ed5514dd5762a796d349ed5db49e40fe7 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 29 Jul 2015 21:26:16 +0200
-Subject: [PATCH] platform-config.cmake: fix paths for cross-compilation
-
-Headers and library paths in platform-config.cmake must take into
-account ${CMAKE_FIND_ROOT_PATH} to work in cross-compilation.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- platform-config.cmake.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/platform-config.cmake.in b/platform-config.cmake.in
-index 7fe35fe..78b5085 100644
---- a/platform-config.cmake.in
-+++ b/platform-config.cmake.in
-@@ -10,16 +10,16 @@
- #
- # propagate these properties from one build system to the other
- set (platform_VERSION "@platform_VERSION_MAJOR at .@platform_VERSION_MINOR@")
--set (platform_INCLUDE_DIRS @platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include)
-+set (platform_INCLUDE_DIRS ${CMAKE_FIND_ROOT_PATH}/@platform_INCLUDE_DIRS@ ${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/include)
- set (platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
- set (platform_LINKER_FLAGS "@platform_LINKER_FLAGS@")
- set (platform_CONFIG_VARS "@platform_CONFIG_VARS@")
- 
- # libraries come from the build tree where this file was generated
- if(WIN32)
--  set (platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/platform.lib")
-+  set (platform_LIBRARY "${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/platform.lib")
- else(WIN32)
--  set (platform_LIBRARY "-L at CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lplatform")
-+  set (platform_LIBRARY "-L${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lplatform")
- endif(WIN32)
- set (platform_LIBRARIES ${platform_LIBRARY} "@platform_LIBRARIES@")
- mark_as_advanced (platform_LIBRARY)
--- 
-2.5.0
-
diff --git a/package/libplatform/libplatform.hash b/package/libplatform/libplatform.hash
index 8975dfd8ab..5162b43fad 100644
--- a/package/libplatform/libplatform.hash
+++ b/package/libplatform/libplatform.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  3603ead8b16a48cb35b1e6dea330a693f10552b1a6ea036c5db9ec248cd8baf5  libplatform-feafe68e3e0b02c3261aefb3d711863ef6fadd38.tar.gz
+sha256 dd07bea9cb5676220586e772f09eab51f1093e5ef0faadee80f7c0e99f5f6c1c  libplatform-2d90f98620e25f47702c9e848380c0d93f29462b.tar.gz
diff --git a/package/libplatform/libplatform.mk b/package/libplatform/libplatform.mk
index d0137994de..c805af2e16 100644
--- a/package/libplatform/libplatform.mk
+++ b/package/libplatform/libplatform.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBPLATFORM_VERSION = feafe68e3e0b02c3261aefb3d711863ef6fadd38
+LIBPLATFORM_VERSION = 2d90f98620e25f47702c9e848380c0d93f29462b
 LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION))
-LIBPLATFORM_LICENSE = GPL-2.0+, PHP-3.01
-LIBPLATFORM_LICENSE_FILES = src/os.h src/util/fstrcmp.c
+LIBPLATFORM_LICENSE = GPL-2.0+
+LIBPLATFORM_LICENSE_FILES = src/os.h
 LIBPLATFORM_INSTALL_STAGING = YES
 
 $(eval $(cmake-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 02/31] package/libplatform: bump version
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 02/31] package/libplatform: bump version Bernd Kuhls
@ 2017-04-29  9:31   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:31 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:22 +0200, Bernd Kuhls wrote:
> Replaced patch 0001 with an alternate solution.
> 
> Updated license info after
> https://github.com/Pulse-Eight/platform/commit/a1e5905874d5cdbce110344558d21a2810dead9c
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  .../0001-p8-platform-config-fix-lookup-paths.patch | 38 ++++++++++++++++++++
>  ...nfig.cmake-fix-paths-for-cross-compilatio.patch | 40 ----------------------
>  package/libplatform/libplatform.hash               |  2 +-
>  package/libplatform/libplatform.mk                 |  6 ++--
>  4 files changed, 42 insertions(+), 44 deletions(-)
>  create mode 100644 package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch
>  delete mode 100644 package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 03/31] package/kodi-platform: bump version
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 01/31] package/kodi-visualisation-fountain: remove package Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 02/31] package/libplatform: bump version Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:31   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 04/31] package/libcec: bump version to 4.0.2 Bernd Kuhls
                   ` (30 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-platform/kodi-platform.hash | 2 +-
 package/kodi-platform/kodi-platform.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/kodi-platform/kodi-platform.hash b/package/kodi-platform/kodi-platform.hash
index a2484484e3..d99c6225cb 100644
--- a/package/kodi-platform/kodi-platform.hash
+++ b/package/kodi-platform/kodi-platform.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  88741358d5d54a0031553ac28aa63bc56c44d994a76f8651bac94a1e244a6595  kodi-platform-45d6ad1984fdb1dc855076ff18484dbec33939d1.tar.gz
+sha256 c53f37888d752e233f5adabc6ecfb8a1ea02728e010007200bbf671f6b9462de  kodi-platform-36fb49371dbce49bf470a5bb1fc51b74b4a3612d.tar.gz
diff --git a/package/kodi-platform/kodi-platform.mk b/package/kodi-platform/kodi-platform.mk
index 9658918e5e..53f8ce956b 100644
--- a/package/kodi-platform/kodi-platform.mk
+++ b/package/kodi-platform/kodi-platform.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_PLATFORM_VERSION = 45d6ad1984fdb1dc855076ff18484dbec33939d1
+KODI_PLATFORM_VERSION = 36fb49371dbce49bf470a5bb1fc51b74b4a3612d
 KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION))
 KODI_PLATFORM_LICENSE = GPL-2.0+
 KODI_PLATFORM_LICENSE_FILES = src/util/XMLUtils.h
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 03/31] package/kodi-platform: bump version
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 03/31] package/kodi-platform: " Bernd Kuhls
@ 2017-04-29  9:31   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:31 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:23 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/kodi-platform/kodi-platform.hash | 2 +-
>  package/kodi-platform/kodi-platform.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 04/31] package/libcec: bump version to 4.0.2
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (2 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 03/31] package/kodi-platform: " Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:31   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 05/31] package/xmlstarlet: add host variant Bernd Kuhls
                   ` (29 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/libcec/libcec.hash | 2 +-
 package/libcec/libcec.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/libcec/libcec.hash b/package/libcec/libcec.hash
index 377f343a22..5416c20fec 100644
--- a/package/libcec/libcec.hash
+++ b/package/libcec/libcec.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  0f29d5a2d155b507807ba896bc3b3e50a0ab56bf8f543a2bf5c2798c790292b5  libcec-2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd.tar.gz
+sha256 b8b8dd31f3ebdd5472f03ab7d401600ea0d959b1288b9ca24bf457ef60e2ba27  libcec-4.0.2.tar.gz
diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk
index e2b5c1fb4d..6d14447958 100644
--- a/package/libcec/libcec.mk
+++ b/package/libcec/libcec.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBCEC_VERSION = 2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd
-LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION))
+LIBCEC_VERSION = 4.0.2
+LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION))
 LIBCEC_LICENSE = GPL-2.0+
 LIBCEC_LICENSE_FILES = COPYING
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 04/31] package/libcec: bump version to 4.0.2
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 04/31] package/libcec: bump version to 4.0.2 Bernd Kuhls
@ 2017-04-29  9:31   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:31 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:24 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/libcec/libcec.hash | 2 +-
>  package/libcec/libcec.mk   | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 05/31] package/xmlstarlet: add host variant
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (3 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 04/31] package/libcec: bump version to 4.0.2 Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:31   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 06/31] package/kodi-jsonschemabuilder: new host package Bernd Kuhls
                   ` (28 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Needed for the Kodi skin package to control the default skin setup.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/xmlstarlet/xmlstarlet.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk
index 61d38f29ff..091c371e82 100644
--- a/package/xmlstarlet/xmlstarlet.mk
+++ b/package/xmlstarlet/xmlstarlet.mk
@@ -24,4 +24,7 @@ else
 XMLSTARLET_CONF_OPTS += --disable-static-libs
 endif
 
+HOST_XMLSTARLET_DEPENDENCIES += host-libxml2 host-libxslt
+
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 05/31] package/xmlstarlet: add host variant
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 05/31] package/xmlstarlet: add host variant Bernd Kuhls
@ 2017-04-29  9:31   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:31 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:25 +0200, Bernd Kuhls wrote:
> Needed for the Kodi skin package to control the default skin setup.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/xmlstarlet/xmlstarlet.mk | 3 +++
>  1 file changed, 3 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 06/31] package/kodi-jsonschemabuilder: new host package
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (4 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 05/31] package/xmlstarlet: add host variant Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:32   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 07/31] package/kodi-texturepacker: " Bernd Kuhls
                   ` (27 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Needed for upcoming kodi version bump to 17.1-Krypton which will also
switch the kodi build system to CMake.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../kodi-jsonschemabuilder.hash                    |  1 +
 .../kodi-jsonschemabuilder.mk                      | 25 ++++++++++++++++++++++
 .../0001-texturepacker.patch}                      |  0
 package/kodi/kodi.hash                             |  1 +
 4 files changed, 27 insertions(+)
 create mode 120000 package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash
 create mode 100644 package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
 rename package/{kodi/0002-texturepacker.patch => kodi-texturepacker/0001-texturepacker.patch} (100%)

diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash
new file mode 120000
index 0000000000..a575750997
--- /dev/null
+++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash
@@ -0,0 +1 @@
+../kodi/kodi.hash
\ No newline at end of file
diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
new file mode 100644
index 0000000000..b3cbe9886e
--- /dev/null
+++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# kodi-jsonschemabuilder
+#
+################################################################################
+
+# Not possible to directly refer to kodi variables, because of
+# first/second expansion trickery...
+KODI_JSONSCHEMABUILDER_VERSION = 17.1-Krypton
+KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION))
+KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz
+KODI_JSONSCHEMABUILDER_LICENSE = GPLv2
+KODI_JSONSCHEMABUILDER_LICENSE_FILES = LICENSE.GPL
+HOST_KODI_JSONSCHEMABUILDER_SUBDIR = tools/depends/native/JsonSchemaBuilder
+
+HOST_KODI_JSONSCHEMABUILDER_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(@D)/project/cmake/modules
+
+define HOST_KODI_JSONSCHEMABUILDER_INSTALL_CMDS
+	$(INSTALL) -m 755 -D \
+		$(@D)/tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \
+		$(HOST_DIR)/usr/bin/JsonSchemaBuilder
+endef
+
+$(eval $(host-cmake-package))
diff --git a/package/kodi/0002-texturepacker.patch b/package/kodi-texturepacker/0001-texturepacker.patch
similarity index 100%
rename from package/kodi/0002-texturepacker.patch
rename to package/kodi-texturepacker/0001-texturepacker.patch
diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash
index 5aa580ec7a..6f1ab40430 100644
--- a/package/kodi/kodi.hash
+++ b/package/kodi/kodi.hash
@@ -1,2 +1,3 @@
 # Locally computed
 sha256	7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10	kodi-16.1-Jarvis.tar.gz
+sha256 303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee  kodi-17.1-Krypton.tar.gz
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 06/31] package/kodi-jsonschemabuilder: new host package
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 06/31] package/kodi-jsonschemabuilder: new host package Bernd Kuhls
@ 2017-04-29  9:32   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:32 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:26 +0200, Bernd Kuhls wrote:

>  create mode 120000 package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash
>  create mode 100644 package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
>  rename package/{kodi/0002-texturepacker.patch => kodi-texturepacker/0001-texturepacker.patch} (100%)

This change was not related to this patch, it should have been in the
next patch, so I've dropped it from this commit.

> +KODI_JSONSCHEMABUILDER_LICENSE = GPLv2

We now use SPDX license codes, so I've changed this to GPL-2.0.

Applied with those issues fixed.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 07/31] package/kodi-texturepacker: new host package
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (5 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 06/31] package/kodi-jsonschemabuilder: new host package Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:37   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (26 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Needed for upcoming kodi version bump to 17.1-Krypton which will also
switch the kodi build system to CMake.

"-std=c++0x" is needed to maintain compatability with host-gcc 4.6.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-texturepacker/kodi-texturepacker.hash |  1 +
 package/kodi-texturepacker/kodi-texturepacker.mk   | 41 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 120000 package/kodi-texturepacker/kodi-texturepacker.hash
 create mode 100644 package/kodi-texturepacker/kodi-texturepacker.mk

diff --git a/package/kodi-texturepacker/kodi-texturepacker.hash b/package/kodi-texturepacker/kodi-texturepacker.hash
new file mode 120000
index 0000000000..a575750997
--- /dev/null
+++ b/package/kodi-texturepacker/kodi-texturepacker.hash
@@ -0,0 +1 @@
+../kodi/kodi.hash
\ No newline at end of file
diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk
new file mode 100644
index 0000000000..6b445cef2e
--- /dev/null
+++ b/package/kodi-texturepacker/kodi-texturepacker.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# kodi-texturepacker
+#
+################################################################################
+
+# Not possible to directly refer to kodi variables, because of
+# first/second expansion trickery...
+KODI_TEXTUREPACKER_VERSION = 17.1-Krypton
+KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION))
+KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz
+KODI_TEXTUREPACKER_LICENSE = GPLv2
+KODI_TEXTUREPACKER_LICENSE_FILES = LICENSE.GPL
+HOST_KODI_TEXTUREPACKER_SUBDIR = tools/depends/native/TexturePacker
+HOST_KODI_TEXTUREPACKER_DEPENDENCIES += \
+	host-giflib \
+	host-libjpeg \
+	host-libpng \
+	host-lzo
+
+HOST_KODI_TEXTUREPACKER_CXXFLAGS = \
+	"$(HOST_CXXFLAGS) \
+	-std=c++0x \
+	-DTARGET_POSIX \
+	-DTARGET_LINUX \
+	-D_LINUX \
+	-I$(@D)/xbmc/linux"
+
+HOST_KODI_TEXTUREPACKER_CONF_OPTS += \
+	-DCMAKE_CXX_FLAGS=$(HOST_KODI_TEXTUREPACKER_CXXFLAGS) \
+	-DCMAKE_MODULE_PATH=$(@D)/project/cmake/modules \
+	-DCORE_SOURCE_DIR=$(@D) \
+	-Wno-dev
+
+define HOST_KODI_TEXTUREPACKER_INSTALL_CMDS
+	$(INSTALL) -m 755 -D \
+		$(@D)/tools/depends/native/TexturePacker/TexturePacker \
+		$(HOST_DIR)/usr/bin/TexturePacker
+endef
+
+$(eval $(host-cmake-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 07/31] package/kodi-texturepacker: new host package
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 07/31] package/kodi-texturepacker: " Bernd Kuhls
@ 2017-04-29  9:37   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:37 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:27 +0200, Bernd Kuhls wrote:

>  package/kodi-texturepacker/kodi-texturepacker.hash |  1 +
>  package/kodi-texturepacker/kodi-texturepacker.mk   | 41 ++++++++++++++++++++++

I've moved to this commit the move of the Kodi texture packer patch.


> +KODI_TEXTUREPACKER_LICENSE = GPLv2

Changed to use SPDX license code.

> +KODI_TEXTUREPACKER_LICENSE_FILES = LICENSE.GPL
> +HOST_KODI_TEXTUREPACKER_SUBDIR = tools/depends/native/TexturePacker
> +HOST_KODI_TEXTUREPACKER_DEPENDENCIES += \

+= not needed here.

> +HOST_KODI_TEXTUREPACKER_CXXFLAGS = \
> +	"$(HOST_CXXFLAGS) \
> +	-std=c++0x \
> +	-DTARGET_POSIX \
> +	-DTARGET_LINUX \
> +	-D_LINUX \
> +	-I$(@D)/xbmc/linux"

We generally don't put the double quotes here, but rather...

> +
> +HOST_KODI_TEXTUREPACKER_CONF_OPTS += \
> +	-DCMAKE_CXX_FLAGS=$(HOST_KODI_TEXTUREPACKER_CXXFLAGS) \

... here. So I've changed that as well.

Applied with those changes.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (6 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 07/31] package/kodi-texturepacker: " Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:56   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 09/31] package/kodi-pvr-*: mass version bump Bernd Kuhls
                   ` (25 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Removed unneeded patches
- 0001-Fixup-include-path.patch (not needed after CMake switch)
- 0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch
  (applied upstream)
- 0006-ffmpeg30.patch (was backported from 17.0-Krypton to 16.0-Jarvis)
- 0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch
  (was backported from 17.0-Krypton to 16.0-Jarvis)
- 0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch
  (was backported from 17.0-Krypton to 16.0-Jarvis)
- 0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch
  (cximage was removed in bump from 16.x to 17.0)
- 0010-curl-support-version-7.5.0-and-upwards.patch
  (applied upstream)
- 0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch
  (applied upstream)
- 0012-Fix_includes_in_amcodec.patch
  (was backported from 17.0-Krypton to 16.0-Jarvis)

Rebased patches
- 0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
  also renamed to 0001-...

Removed dependencies not needed anymore:
- boost
  https://github.com/xbmc/xbmc/commit/41ae93f0913f7ba72087a48370f8d66a3eac9fcc
- giflib
  https://github.com/xbmc/xbmc/commit/d44338baf1f6d1e6b76cd7dbab6453d76cc2ac31
- jasper/tiff
  https://github.com/xbmc/xbmc/commit/00724eb109a702f0098089d849f7c02ea173a4a9
- jpeg
  https://github.com/xbmc/xbmc/commit/7d5bdfb9a09348bde92b323ef6077b5e75edaca7
- libdcadec
  https://github.com/xbmc/xbmc/commit/378eb2687c1da5f97ef47c78431033b52f0d4417
- libglew
  https://github.com/xbmc/xbmc/commit/03ff0d5ea02963b1283fe8bc7c1bad18f2dd97b6
- libgcrypt
  was already an optional dependency in Kodi 16, not part of the CMake
  buildsystem anymore
- libmpeg2
  https://github.com/xbmc/xbmc/commit/d22c829d67937e8d03fdac8f8b0bf2d1fa8fbf70
- libogg/libvorbis
  https://github.com/xbmc/xbmc/commit/4c609691776ab845d83153e19d191b7fd445edb9
- libpng
  https://github.com/xbmc/xbmc/commit/be6b50c6c3f91809a9045c199d054cbc1d637d5d
- librtmp, the new rtmp inputstream addon will be added later
  https://github.com/xbmc/xbmc/commit/d04f43a4eb6f920cc42a28627b580f17e2be1bb5
- libsquish
  https://github.com/xbmc/xbmc/commit/ed03f828be3615d294eb4a4cfccc5cdccec22997
- xlib_libXmu
- xlib_libXt

Switched to CMake, autoconf was deprecated:
https://github.com/xbmc/xbmc/pull/10797

The dependency for egl/gles on arm, formerly enforced by the automake
build system, was not ported to CMake.

Bumped BR2_TOOLCHAIN_GCC_AT_LEAST to 4.8 to fix build errors with
gcc-4.7 found while testing
http://autobuild.buildroot.net/toolchains/configs/sourcery-x86.config
For details please read
http://lists.busybox.net/pipermail/buildroot/2017-April/190195.html

Added hard-dependency for libegl, needed after
https://github.com/xbmc/xbmc/commit/0ac305f7cf82e98021b6e0d70c3d4c51fc1cf18a

Libva support depends on X11
https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/modules/FindVAAPI.cmake#L42
and OpenGL/EGL
https://github.com/xbmc/xbmc/blob/Krypton/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h#L23

Libvdpau support depends on X11
https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/modules/FindVDPAU.cmake#L21
and OpenGL/EGL
https://github.com/xbmc/xbmc/blob/Krypton/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h#L43

Updated clean-up hook and added host-xmlstarlet as dependency to
manipulate the list of default system addons in addon-manifest.xml.

Added dependency to BR2_ENABLE_LOCALE, needs iconv_open:
https://github.com/xbmc/xbmc/blob/Krypton/xbmc/utils/CharsetConverter.cpp#L200

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 Config.in.legacy                                   |    6 +
 package/kodi/0001-Fixup-include-path.patch         |   33 -
 ....cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch |   42 +
 ...e-dependency-on-gmp-and-libintl-from-Find.patch |   39 +
 ...0003-ALSA-fix-device-change-event-support.patch |   67 -
 ....cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch |   41 -
 ...exturePacker-fix-compilation-with-gcc-4.6.patch |   53 -
 package/kodi/0006-ffmpeg30.patch                   |  646 ---------
 ...r-out-of-memory-errors-with-large-numbers.patch |   45 -
 ...ding-issue-when-reading-certain-id3v1-tag.patch |   82 --
 ...lib-cximage-6.0-fix-compilation-with-gcc6.patch | 1438 --------------------
 ...10-curl-support-version-7.5.0-and-upwards.patch |   34 -
 ...bmc_pvr_types.h-Fix-compilation-with-gcc6.patch |   30 -
 package/kodi/0012-Fix_includes_in_amcodec.patch    |   38 -
 package/kodi/Config.in                             |   65 +-
 package/kodi/kodi.hash                             |    7 +-
 package/kodi/kodi.mk                               |  298 ++--
 17 files changed, 279 insertions(+), 2685 deletions(-)
 delete mode 100644 package/kodi/0001-Fixup-include-path.patch
 create mode 100644 package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
 create mode 100644 package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
 delete mode 100644 package/kodi/0003-ALSA-fix-device-change-event-support.patch
 delete mode 100644 package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
 delete mode 100644 package/kodi/0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch
 delete mode 100644 package/kodi/0006-ffmpeg30.patch
 delete mode 100644 package/kodi/0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch
 delete mode 100644 package/kodi/0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch
 delete mode 100644 package/kodi/0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch
 delete mode 100644 package/kodi/0010-curl-support-version-7.5.0-and-upwards.patch
 delete mode 100644 package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch
 delete mode 100644 package/kodi/0012-Fix_includes_in_amcodec.patch

diff --git a/Config.in.legacy b/Config.in.legacy
index a13e4453b2..6b038dba2c 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,12 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2017.05"
 
+config BR2_PACKAGE_KODI_RTMPDUMP
+	bool "kodi rtmp"
+	select BR2_LEGACY
+	help
+	  Internal rtmp support was removed from Kodi.
+
 config BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN
 	bool "kodi-visualisation-fountain has been removed"
 	select BR2_LEGACY
diff --git a/package/kodi/0001-Fixup-include-path.patch b/package/kodi/0001-Fixup-include-path.patch
deleted file mode 100644
index 9298981c4f..0000000000
--- a/package/kodi/0001-Fixup-include-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 63c255f1f5d68363f49193aceed343e602dc8bdf Mon Sep 17 00:00:00 2001
-From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
-Date: Thu, 26 Dec 2013 21:17:10 +0100
-Subject: [PATCH] Fixup include path
-
-Patch originally taken from :
-http://repository.timesys.com/buildsources/x/xbmc/xbmc-11.0/xbmc-11.0-fixups.patch
-
-Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
----
- lib/enca/configure                           | 3 ---
- lib/enca/configure.ac                        | 3 ---
- lib/libdvd/libdvdread/misc/dvdread-config.sh | 6 +++---
- lib/timidity/configure.in                    | 6 +++---
- 4 files changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/lib/libdvd/libdvdread/misc/dvdread-config.sh b/lib/libdvd/libdvdread/misc/dvdread-config.sh
-index e170c7e..25ee893 100644
---- a/lib/libdvd/libdvdread/misc/dvdread-config.sh
-+++ b/lib/libdvd/libdvdread/misc/dvdread-config.sh
-@@ -48,9 +48,9 @@ if test "$echo_prefix" = "yes"; then
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I$prefix/include $extracflags
-+      echo $extracflags
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L$libdir $dvdreadlib
--fi      
-+      echo $dvdreadlib
-+fi
diff --git a/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
new file mode 100644
index 0000000000..0b88ce9d27
--- /dev/null
+++ b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
@@ -0,0 +1,42 @@
+From 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 29 Jul 2015 23:13:33 +0200
+Subject: [PATCH] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix
+ cross-compilation
+
+When cross-compiling, the location at build time of the libraries is
+not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable
+is here to handle this difference, so use it in kodi-config.cmake.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+(rebased and simplified for Kodi 17.0-Krypton)
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ project/cmake/KodiConfig.cmake.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in
+index 76626ec..ffb8e1d 100644
+--- a/project/cmake/KodiConfig.cmake.in
++++ b/project/cmake/KodiConfig.cmake.in
+@@ -7,7 +7,7 @@ if(NOT @APP_NAME_UC at _PREFIX)
+   set(@APP_NAME_UC at _PREFIX @APP_PREFIX@)
+ endif()
+ if(NOT @APP_NAME_UC at _INCLUDE_DIR)
+-  set(@APP_NAME_UC at _INCLUDE_DIR @APP_INCLUDE_DIR@)
++  set(@APP_NAME_UC at _INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@)
+ endif()
+ if(NOT @APP_NAME_UC at _LIB_DIR)
+   set(@APP_NAME_UC at _LIB_DIR @APP_LIB_DIR@)
+@@ -18,7 +18,7 @@ endif()
+ if(NOT WIN32)
+   set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
+ endif()
+-list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake)
++list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake)
+ 
+ string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@")
+ add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON)
+-- 
+2.5.0
+
diff --git a/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch b/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
new file mode 100644
index 0000000000..80bf954d5e
--- /dev/null
+++ b/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
@@ -0,0 +1,39 @@
+CMake: Remove dependency on gmp and libintl from FindPython.cmake
+
+Downloaded from Openelec:
+https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/mediacenter/kodi/patches/kodi-998.02-cmake-python.patch
+
+The dependency for libintl and gmp was introduced by this commit
+https://github.com/xbmc/xbmc/commit/8558d672e98b62f3ea0126ba491376add8ed71cb
+without further explanation and, apparently, without necessity.
+
+A question asking whether this is really needed was sent upstream:
+https://github.com/xbmc/xbmc/pull/10973#pullrequestreview-34179550
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -Naur kodi-17.1-Krypton/project/cmake/modules/FindPython.cmake kodi-17.1-Krypton.patch/project/cmake/modules/FindPython.cmake
+--- kodi-17.1-Krypton/project/cmake/modules/FindPython.cmake	2017-03-20 17:17:49.000000000 +0100
++++ kodi-17.1-Krypton.patch/project/cmake/modules/FindPython.cmake	2017-03-30 11:10:01.065718667 +0200
+@@ -16,14 +16,12 @@
+ if(KODI_DEPENDSBUILD)
+   find_library(FFI_LIBRARY ffi REQUIRED)
+   find_library(EXPAT_LIBRARY expat REQUIRED)
+-  find_library(INTL_LIBRARY intl REQUIRED)
+-  find_library(GMP_LIBRARY gmp REQUIRED)
+ 
+   if(NOT CORE_SYSTEM_NAME STREQUAL android)
+     set(PYTHON_DEP_LIBRARIES pthread dl util)
+   endif()
+ 
+-  set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES})
++  set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${PYTHON_DEP_LIBRARIES})
+ else()
+   find_package(PythonLibs 2.7 REQUIRED)
+   list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES})
+@@ -36,4 +34,4 @@
+   set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
+ endif()
+ 
+-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY)
++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY)
diff --git a/package/kodi/0003-ALSA-fix-device-change-event-support.patch b/package/kodi/0003-ALSA-fix-device-change-event-support.patch
deleted file mode 100644
index b5f37b94da..0000000000
--- a/package/kodi/0003-ALSA-fix-device-change-event-support.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Patch sent upstream:
-
-https://github.com/xbmc/xbmc/pull/7551
-
-
-From a6d6a1a36ff2dff2586fbad2a068e7df14b55fdc Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sun, 19 Jul 2015 14:12:03 +0200
-Subject: [PATCH 1/1] ALSA: fix device change event support
-
-Current uClibc version 0.9.33.2 does not support eventfd_read/write.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- configure.ac                  |    5 ++++-
- xbmc/linux/FDEventMonitor.cpp |   12 ++++++++++++
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d321f7d..4c6c750 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -911,7 +911,7 @@ AC_FUNC_STRFTIME
- AC_FUNC_STRTOD
- AC_FUNC_UTIME_NULL
- AC_FUNC_VPRINTF
--AC_CHECK_FUNCS([atexit dup2 fdatasync floor fs_stat_dev ftime ftruncate getcwd gethostbyaddr gethostbyname gethostname getpagesize getpass gettimeofday inet_ntoa lchown localeconv memchr memmove memset mkdir modf munmap pow rmdir select setenv setlocale socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strspn strstr strtol strtoul sysinfo tzset utime posix_fadvise localtime_r])
-+AC_CHECK_FUNCS([atexit dup2 fdatasync floor fs_stat_dev ftime ftruncate getcwd gethostbyaddr gethostbyname gethostname getpagesize getpass gettimeofday inet_ntoa lchown localeconv memchr memmove memset mkdir modf munmap pow rmdir select setenv setlocale socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strspn strstr strtol strtoul sysinfo tzset utime posix_fadvise localtime_r eventfd_read eventfd_write])
- 
- # Check for various sizes
- AC_CHECK_SIZEOF([int])
-@@ -2064,6 +2064,9 @@ fi
- if test "$use_alsa" = "yes"; then
-   USE_ALSA=1
-   AC_DEFINE([USE_ALSA],[1],["Define to 1 if alsa is installed"])
-+  if test "$ac_cv_func_eventfd_read" = "yes" -a "$ac_cv_func_eventfd_write" = "yes"; then
-+      AC_DEFINE([HAVE_EVENTFD],[1],["Define to 1 if eventfd is installed"])
-+  fi
-   final_message="$final_message\n  ALSA:\t\tYes"
- else
-   USE_ALSA=0
-diff --git a/xbmc/linux/FDEventMonitor.cpp b/xbmc/linux/FDEventMonitor.cpp
-index 4a41477..84efeb9 100644
---- a/xbmc/linux/FDEventMonitor.cpp
-+++ b/xbmc/linux/FDEventMonitor.cpp
-@@ -28,6 +28,18 @@
- 
- #include "FDEventMonitor.h"
- 
-+#ifndef HAVE_EVENTFD
-+static int eventfd_read(int __fd, eventfd_t *__value)
-+{
-+  return read(__fd, __value, sizeof(eventfd_t)) == sizeof(eventfd_t) ? 0 : -1;
-+}
-+
-+static int eventfd_write(int __fd, eventfd_t __value)
-+{
-+  return write(__fd, &__value, sizeof(eventfd_t)) == sizeof(eventfd_t) ? 0 : -1;
-+}
-+#endif
-+
- CFDEventMonitor::CFDEventMonitor() :
-   CThread("FDEventMonitor"),
-   m_nextID(0),
--- 
-1.7.10.4
-
diff --git a/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
deleted file mode 100644
index 2678a7839e..0000000000
--- a/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 29 Jul 2015 23:13:33 +0200
-Subject: [PATCH] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix
- cross-compilation
-
-When cross-compiling, the location at build time of the libraries is
-not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable
-is here to handle this difference, so use it in kodi-config.cmake.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- project/cmake/kodi-config.cmake.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmake.in
-index 76626ec..ffb8e1d 100644
---- a/project/cmake/kodi-config.cmake.in
-+++ b/project/cmake/kodi-config.cmake.in
-@@ -7,15 +7,15 @@
-   SET(@APP_NAME_UC at _PREFIX @APP_PREFIX@)
- ENDIF()
- IF(NOT @APP_NAME_UC at _INCLUDE_DIR)
--  SET(@APP_NAME_UC at _INCLUDE_DIR @APP_INCLUDE_DIR@)
-+  SET(@APP_NAME_UC at _INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@)
- ENDIF()
- IF(NOT @APP_NAME_UC at _LIB_DIR)
--  SET(@APP_NAME_UC at _LIB_DIR @APP_LIB_DIR@)
-+  SET(@APP_NAME_UC at _LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
- ENDIF()
- IF(NOT WIN32)
-   SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
- ENDIF()
--LIST(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@)
-+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
- ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON)
- 
- if(NOT CORE_SYSTEM_NAME)
--- 
-2.5.0
-
diff --git a/package/kodi/0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch b/package/kodi/0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch
deleted file mode 100644
index 3d9370ff0e..0000000000
--- a/package/kodi/0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2b395fb3f07551ae1ce2e484c14ac59f36e192b0 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Thu, 17 Mar 2016 21:47:53 +0100
-Subject: [PATCH] native/TexturePacker: fix compilation with gcc 4.6
-
-Kodi itself depends on gcc >= 4.7 due to its use of the C++11 standard.
-When cross-compiling the host gcc currently also needs to be >= 4.7 due
-to the texturepacker tool being needed as native binary to compile
-Textures.xbt for the target system.
-
-Cross-compiling on a system where host gcc is at version 4.6 fails atm
-with this error:
-
-cc1plus: error: unrecognized command line option '-std=c++11'
-make[4]: *** [md5.o] Error 1
-make[4]: *** Waiting for unfinished jobs....
-cc1plus: error: unrecognized command line option '-std=c++11'
-cc1plus: error: unrecognized command line option '-std=c++11'
-
-make[4]: *** [DecoderManager.o] Error 1
-make[4]: *** [XBTFWriter.o] Error 1
-cc1plus: error: unrecognized command line option '-std=c++11'
-make[4]: *** [TexturePacker.o] Error 1
-cc1plus: error: unrecognized command line option '-std=c++11'
-make[4]: *** [decoder/PNGDecoder.o] Error 1
-make[3]: *** [all] Error 2
-make[2]: *** [native/TexturePacker] Error 2
-
-Using this patch the problem is fixed and a working TexturePacker host
-binary is created.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-Patch sent upstream: https://github.com/xbmc/xbmc/pull/9378
----
- tools/depends/native/TexturePacker/src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/depends/native/TexturePacker/src/Makefile.am b/tools/depends/native/TexturePacker/src/Makefile.am
-index c1fc8be..d075290 100644
---- a/tools/depends/native/TexturePacker/src/Makefile.am
-+++ b/tools/depends/native/TexturePacker/src/Makefile.am
-@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
- 
- AM_CFLAGS = -DTARGET_POSIX -DUSE_LZO_PACKING
- AM_CFLAGS += @EXTRA_DEFINES@
--AM_CXXFLAGS = $(AM_CFLAGS) -std=c++11
-+AM_CXXFLAGS = $(AM_CFLAGS) -std=c++0x
- 
- AM_CPPFLAGS = \
-   -I. \
--- 
-2.7.0
-
diff --git a/package/kodi/0006-ffmpeg30.patch b/package/kodi/0006-ffmpeg30.patch
deleted file mode 100644
index 9164d48ad7..0000000000
--- a/package/kodi/0006-ffmpeg30.patch
+++ /dev/null
@@ -1,646 +0,0 @@
-Add support for ffmpeg 3.0
-
-Changes from original commit are only in file paths & quilt refresh.
-
-commit c31b7d374062f87c7512d9872cbceac920465913
-Author: Philip Langdale <philipl@overt.org>
-Date:   Mon Sep 21 19:49:36 2015 -0700
-
-    ffmpeg: Update AVPixelFormat and AV_PIX_FMT_* to compile with master
-    
-    The deprecated PixelFormat and PIX_FMT_* names have been removed in
-    ffmpeg master.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Downloaded from
-https://gitweb.gentoo.org/repo/gentoo.git/tree/media-tv/kodi/files/kodi-16-ffmpeg3.patch]
-
-Index: xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h
-@@ -24,7 +24,6 @@
- #include "utils/CPUInfo.h"
- 
- extern "C" {
--#include "libswscale/swscale.h"
- #include "libavcodec/avcodec.h"
- #include "libavformat/avformat.h"
- #include "libavutil/avutil.h"
-@@ -33,23 +32,6 @@ extern "C" {
- #include "libpostproc/postprocess.h"
- }
- 
--inline int SwScaleCPUFlags()
--{
--  unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
--  int flags = 0;
--
--  if (cpuFeatures & CPU_FEATURE_MMX)
--    flags |= SWS_CPU_CAPS_MMX;
--  if (cpuFeatures & CPU_FEATURE_MMX2)
--    flags |= SWS_CPU_CAPS_MMX2;
--  if (cpuFeatures & CPU_FEATURE_3DNOW)
--    flags |= SWS_CPU_CAPS_3DNOW;
--  if (cpuFeatures & CPU_FEATURE_ALTIVEC)
--    flags |= SWS_CPU_CAPS_ALTIVEC;
--
--  return flags;
--}
--
- inline int PPCPUFlags()
- {
-   unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
-@@ -39,7 +39,7 @@ extern "C" {
- #include "libswscale/swscale.h"
- }
- 
--// allocate a new picture (PIX_FMT_YUV420P)
-+// allocate a new picture (AV_PIX_FMT_YUV420P)
- DVDVideoPicture* CDVDCodecUtils::AllocatePicture(int iWidth, int iHeight)
- {
-   DVDVideoPicture* pPicture = new DVDVideoPicture;
-@@ -264,13 +264,13 @@ DVDVideoPicture* CDVDCodecUtils::Convert
- 
-         int dstformat;
-         if (format == RENDER_FMT_UYVY422)
--          dstformat = PIX_FMT_UYVY422;
-+          dstformat = AV_PIX_FMT_UYVY422;
-         else
--          dstformat = PIX_FMT_YUYV422;
-+          dstformat = AV_PIX_FMT_YUYV422;
- 
--        struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, PIX_FMT_YUV420P,
-+        struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, AV_PIX_FMT_YUV420P,
-                                                            pPicture->iWidth, pPicture->iHeight, (AVPixelFormat)dstformat,
--                                                           SWS_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+                                                           SWS_BILINEAR, NULL, NULL, NULL);
-         sws_scale(ctx, src, srcStride, 0, pSrc->iHeight, dst, dstStride);
-         sws_freeContext(ctx);
-       }
-@@ -403,25 +403,25 @@ double CDVDCodecUtils::NormalizeFramedur
- }
- 
- struct EFormatMap {
--  PixelFormat   pix_fmt;
-+  AVPixelFormat   pix_fmt;
-   ERenderFormat format;
- };
- 
- static const EFormatMap g_format_map[] = {
--   { PIX_FMT_YUV420P,     RENDER_FMT_YUV420P    }
--,  { PIX_FMT_YUVJ420P,    RENDER_FMT_YUV420P    }
--,  { PIX_FMT_YUV420P10,   RENDER_FMT_YUV420P10  }
--,  { PIX_FMT_YUV420P16,   RENDER_FMT_YUV420P16  }
--,  { PIX_FMT_UYVY422,     RENDER_FMT_UYVY422    }
--,  { PIX_FMT_YUYV422,     RENDER_FMT_YUYV422    }
--,  { PIX_FMT_VAAPI_VLD,   RENDER_FMT_VAAPI      }
--,  { PIX_FMT_DXVA2_VLD,   RENDER_FMT_DXVA       }
--,  { PIX_FMT_NONE     ,   RENDER_FMT_NONE       }
-+   { AV_PIX_FMT_YUV420P,     RENDER_FMT_YUV420P    }
-+,  { AV_PIX_FMT_YUVJ420P,    RENDER_FMT_YUV420P    }
-+,  { AV_PIX_FMT_YUV420P10,   RENDER_FMT_YUV420P10  }
-+,  { AV_PIX_FMT_YUV420P16,   RENDER_FMT_YUV420P16  }
-+,  { AV_PIX_FMT_UYVY422,     RENDER_FMT_UYVY422    }
-+,  { AV_PIX_FMT_YUYV422,     RENDER_FMT_YUYV422    }
-+,  { AV_PIX_FMT_VAAPI_VLD,   RENDER_FMT_VAAPI      }
-+,  { AV_PIX_FMT_DXVA2_VLD,   RENDER_FMT_DXVA       }
-+,  { AV_PIX_FMT_NONE     ,   RENDER_FMT_NONE       }
- };
- 
- ERenderFormat CDVDCodecUtils::EFormatFromPixfmt(int fmt)
- {
--  for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
-+  for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p)
-   {
-     if(p->pix_fmt == fmt)
-       return p->format;
-@@ -431,10 +431,10 @@ ERenderFormat CDVDCodecUtils::EFormatFro
- 
- int CDVDCodecUtils::PixfmtFromEFormat(ERenderFormat fmt)
- {
--  for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
-+  for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p)
-   {
-     if(p->format == fmt)
-       return p->pix_fmt;
-   }
--  return PIX_FMT_NONE;
-+  return AV_PIX_FMT_NONE;
- }
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-@@ -77,8 +77,8 @@ enum DecoderState
-   STATE_SW_MULTI
- };
- 
--enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx
--                                                , const PixelFormat * fmt )
-+enum AVPixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx
-+                                                , const AVPixelFormat * fmt )
- {
-   CDVDVideoCodecFFmpeg* ctx  = (CDVDVideoCodecFFmpeg*)avctx->opaque;
- 
-@@ -104,8 +104,8 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G
-     avctx->hwaccel_context = 0;
-   }
- 
--  const PixelFormat * cur = fmt;
--  while(*cur != PIX_FMT_NONE)
-+  const AVPixelFormat * cur = fmt;
-+  while(*cur != AV_PIX_FMT_NONE)
-   {
- #ifdef HAVE_LIBVDPAU
-     if(VDPAU::CDecoder::IsVDPAUFormat(*cur) && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVDPAU))
-@@ -137,7 +137,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G
- #endif
- #ifdef HAVE_LIBVA
-     // mpeg4 vaapi decoding is disabled
--    if(*cur == PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
-+    if(*cur == AV_PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
-     {
-       VAAPI::CDecoder* dec = new VAAPI::CDecoder();
-       if(dec->Open(avctx, ctx->m_pCodecContext, *cur, ctx->m_uSurfacesCount) == true)
-@@ -214,11 +214,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre
- 
-   for(std::vector<ERenderFormat>::iterator it = options.m_formats.begin(); it != options.m_formats.end(); ++it)
-   {
--    m_formats.push_back((PixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
-+    m_formats.push_back((AVPixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
-     if(*it == RENDER_FMT_YUV420P)
--      m_formats.push_back(PIX_FMT_YUVJ420P);
-+      m_formats.push_back(AV_PIX_FMT_YUVJ420P);
-   }
--  m_formats.push_back(PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */
-+  m_formats.push_back(AV_PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */
- 
-   pCodec = avcodec_find_decoder(hints.codec);
- 
-@@ -655,7 +655,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCom
-   pDvdVideoPicture->color_transfer = m_pCodecContext->color_trc;
-   pDvdVideoPicture->color_matrix = m_pCodecContext->colorspace;
-   if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG
--  || m_pCodecContext->pix_fmt     == PIX_FMT_YUVJ420P)
-+  || m_pCodecContext->pix_fmt     == AV_PIX_FMT_YUVJ420P)
-     pDvdVideoPicture->color_range = 1;
-   else
-     pDvdVideoPicture->color_range = 0;
-@@ -738,8 +738,8 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DV
-   pDvdVideoPicture->iFlags |= pDvdVideoPicture->data[0] ? 0 : DVP_FLAG_DROPPED;
-   pDvdVideoPicture->extended_format = 0;
- 
--  PixelFormat pix_fmt;
--  pix_fmt = (PixelFormat)m_pFrame->format;
-+  AVPixelFormat pix_fmt;
-+  pix_fmt = (AVPixelFormat)m_pFrame->format;
- 
-   pDvdVideoPicture->format = CDVDCodecUtils::EFormatFromPixfmt(pix_fmt);
-   return true;
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
-@@ -46,7 +46,7 @@ public:
-     public:
-              IHardwareDecoder() {}
-     virtual ~IHardwareDecoder() {};
--    virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces) = 0;
-+    virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces) = 0;
-     virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame) = 0;
-     virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) = 0;
-     virtual int  Check     (AVCodecContext* avctx) = 0;
-@@ -77,7 +77,7 @@ public:
-   void               SetHardware(IHardwareDecoder* hardware);
- 
- protected:
--  static enum PixelFormat GetFormat(struct AVCodecContext * avctx, const PixelFormat * fmt);
-+  static enum AVPixelFormat GetFormat(struct AVCodecContext * avctx, const AVPixelFormat * fmt);
- 
-   int  FilterOpen(const std::string& filters, bool scale);
-   void FilterClose();
-@@ -119,7 +119,7 @@ protected:
-   int m_iLastKeyframe;
-   double m_dts;
-   bool   m_started;
--  std::vector<PixelFormat> m_formats;
-+  std::vector<AVPixelFormat> m_formats;
-   double m_decoderPts;
-   int    m_skippedDeint;
-   bool   m_requestSkipDeint;
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
-@@ -554,11 +554,11 @@ void CDVDVideoCodecVDA::DisplayQueuePop(
- 
- void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t *yuv422_ptr, int yuv422_stride, DVDVideoPicture *picture)
- {
--  // convert PIX_FMT_UYVY422 to PIX_FMT_YUV420P.
-+  // convert AV_PIX_FMT_UYVY422 to AV_PIX_FMT_YUV420P.
-   struct SwsContext *swcontext = sws_getContext(
--    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_UYVY422, 
--    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, 
--    SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_UYVY422,
-+    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
-+    SWS_FAST_BILINEAR, NULL, NULL, NULL);
-   if (swcontext)
-   {
-     uint8_t  *src[] = { yuv422_ptr, 0, 0, 0 };
-@@ -574,11 +574,11 @@ void CDVDVideoCodecVDA::UYVY422_to_YUV42
- 
- void CDVDVideoCodecVDA::BGRA_to_YUV420P(uint8_t *bgra_ptr, int bgra_stride, DVDVideoPicture *picture)
- {
--  // convert PIX_FMT_BGRA to PIX_FMT_YUV420P.
-+  // convert AV_PIX_FMT_BGRA to AV_PIX_FMT_YUV420P.
-   struct SwsContext *swcontext = sws_getContext(
--    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_BGRA, 
--    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, 
--    SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_BGRA,
-+    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
-+    SWS_FAST_BILINEAR, NULL, NULL, NULL);
-   if (swcontext)
-   {
-     uint8_t  *src[] = { bgra_ptr, 0, 0, 0 };
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
-@@ -886,7 +886,7 @@ static bool CheckCompatibility(AVCodecCo
-   return true;
- }
- 
--bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces)
-+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces)
- {
-   if (!CheckCompatibility(avctx))
-     return false;
-@@ -1135,9 +1135,9 @@ bool CDecoder::OpenDecoder()
-   return true;
- }
- 
--bool CDecoder::Supports(enum PixelFormat fmt)
-+bool CDecoder::Supports(enum AVPixelFormat fmt)
- {
--  if(fmt == PIX_FMT_DXVA2_VLD)
-+  if(fmt == AV_PIX_FMT_DXVA2_VLD)
-     return true;
-   return false;
- }
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
-@@ -141,7 +141,7 @@ class CDecoder
- public:
-   CDecoder();
-  ~CDecoder();
--  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces);
-+  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces);
-   virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame);
-   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
-   virtual int  Check     (AVCodecContext* avctx);
-@@ -154,7 +154,7 @@ public:
-   int   GetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
-   void  RelBuffer(uint8_t *data);
- 
--  static bool      Supports(enum PixelFormat fmt);
-+  static bool      Supports(enum AVPixelFormat fmt);
- 
-   void CloseDXVADecoder();
- 
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-@@ -479,7 +479,7 @@ CDecoder::~CDecoder()
-   Close();
- }
- 
--bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces)
-+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces)
- {
-   // don't support broken wrappers by default
-   // nvidia cards with a vaapi to vdpau wrapper
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-@@ -406,7 +406,7 @@ public:
-   CDecoder();
-   virtual ~CDecoder();
- 
--  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
-+  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
-   virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame);
-   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
-   virtual void Reset();
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
-@@ -186,7 +186,7 @@ void CDecoder::Close()
-   m_bitstream = NULL;
- }
- 
--bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces)
-+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces)
- {
-   Close();
- 
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
-@@ -35,7 +35,7 @@ class CDecoder
- public:
-   CDecoder();
-  ~CDecoder();
--  virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
-+  virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
-   virtual int Decode(AVCodecContext* avctx, AVFrame* frame);
-   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
-   virtual int Check(AVCodecContext* avctx);
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-@@ -486,7 +486,7 @@ CDecoder::CDecoder() : m_vdpauOutput(&m_
-   m_vdpauConfig.context = 0;
- }
- 
--bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces)
-+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces)
- {
-   // check if user wants to decode this format with VDPAU
-   std::string gpuvendor = g_Windowing.GetRenderVendor();
-@@ -760,7 +760,7 @@ int CDecoder::Check(AVCodecContext* avct
-   return 0;
- }
- 
--bool CDecoder::IsVDPAUFormat(PixelFormat format)
-+bool CDecoder::IsVDPAUFormat(AVPixelFormat format)
- {
-   if (format == AV_PIX_FMT_VDPAU)
-     return true;
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-@@ -556,7 +556,7 @@ public:
-   CDecoder();
-   virtual ~CDecoder();
- 
--  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
-+  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
-   virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame);
-   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
-   virtual void Reset();
-@@ -571,7 +571,7 @@ public:
-   bool Supports(VdpVideoMixerFeature feature);
-   bool Supports(EINTERLACEMETHOD method);
-   EINTERLACEMETHOD AutoInterlaceMethod();
--  static bool IsVDPAUFormat(PixelFormat fmt);
-+  static bool IsVDPAUFormat(AVPixelFormat fmt);
- 
-   static void FFReleaseBuffer(void *opaque, uint8_t *data);
-   static int FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-@@ -1638,7 +1638,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPack
- 
-   // for video we need a decoder to get desired information into codec context
-   if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->codec->extradata &&
--      (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE))
-+      (!st->codec->width || st->codec->pix_fmt == AV_PIX_FMT_NONE))
-   {
-     // open a decoder, it will be cleared down by ffmpeg on closing the stream
-     if (!st->codec->codec)
-@@ -1695,7 +1695,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
-       st = m_pFormatContext->streams[idx];
-       if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-       {
--        if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
-+        if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
-           return true;
-         hasVideo = true;
-       }
-@@ -1708,7 +1708,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
-       st = m_pFormatContext->streams[i];
-       if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-       {
--        if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
-+        if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
-           return true;
-         hasVideo = true;
-       }
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDFileInfo.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp
-@@ -275,7 +275,7 @@ bool CDVDFileInfo::ExtractThumb(const st
- 
-             uint8_t *pOutBuf = new uint8_t[nWidth * nHeight * 4];
-             struct SwsContext *context = sws_getContext(picture.iWidth, picture.iHeight,
--                  PIX_FMT_YUV420P, nWidth, nHeight, PIX_FMT_BGRA, SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+                  AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
- 
-             if (context)
-             {
-Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
-@@ -2932,7 +2932,7 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
-   }
-   else if (m_format == RENDER_FMT_NV12)
-   {
--    srcFormat = PIX_FMT_NV12;
-+    srcFormat = AV_PIX_FMT_NV12;
-     for (int i = 0; i < 2; i++)
-     {
-       src[i]       = im->plane[i];
-@@ -2941,13 +2941,13 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
-   }
-   else if (m_format == RENDER_FMT_YUYV422)
-   {
--    srcFormat    = PIX_FMT_YUYV422;
-+    srcFormat    = AV_PIX_FMT_YUYV422;
-     src[0]       = im->plane[0];
-     srcStride[0] = im->stride[0];
-   }
-   else if (m_format == RENDER_FMT_UYVY422)
-   {
--    srcFormat    = PIX_FMT_UYVY422;
-+    srcFormat    = AV_PIX_FMT_UYVY422;
-     src[0]       = im->plane[0];
-     srcStride[0] = im->stride[0];
-   }
-@@ -2965,8 +2965,8 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
- 
-   m_context = sws_getCachedContext(m_context,
-                                                  im->width, im->height, (AVPixelFormat)srcFormat,
--                                                 im->width, im->height, (AVPixelFormat)PIX_FMT_BGRA,
--                                                 SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+                                                 im->width, im->height, (AVPixelFormat)AV_PIX_FMT_BGRA,
-+                                                 SWS_FAST_BILINEAR, NULL, NULL, NULL);
- 
-   uint8_t *dst[]       = { m_rgbBuffer, 0, 0, 0 };
-   int      dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
-@@ -2995,7 +2995,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
- 
-   if (m_format == RENDER_FMT_YUV420P)
-   {
--    srcFormat = PIX_FMT_YUV420P;
-+    srcFormat = AV_PIX_FMT_YUV420P;
-     for (int i = 0; i < 3; i++)
-     {
-       srcTop[i]       = im->plane[i];
-@@ -3006,7 +3006,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
-   }
-   else if (m_format == RENDER_FMT_NV12)
-   {
--    srcFormat = PIX_FMT_NV12;
-+    srcFormat = AV_PIX_FMT_NV12;
-     for (int i = 0; i < 2; i++)
-     {
-       srcTop[i]       = im->plane[i];
-@@ -3017,7 +3017,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
-   }
-   else if (m_format == RENDER_FMT_YUYV422)
-   {
--    srcFormat       = PIX_FMT_YUYV422;
-+    srcFormat       = AV_PIX_FMT_YUYV422;
-     srcTop[0]       = im->plane[0];
-     srcStrideTop[0] = im->stride[0] * 2;
-     srcBot[0]       = im->plane[0] + im->stride[0];
-@@ -3025,7 +3025,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
-   }
-   else if (m_format == RENDER_FMT_UYVY422)
-   {
--    srcFormat       = PIX_FMT_UYVY422;
-+    srcFormat       = AV_PIX_FMT_UYVY422;
-     srcTop[0]       = im->plane[0];
-     srcStrideTop[0] = im->stride[0] * 2;
-     srcBot[0]       = im->plane[0] + im->stride[0];
-@@ -3045,8 +3045,8 @@ void CLinuxRendererGL::ToRGBFields(YV12I
- 
-   m_context = sws_getCachedContext(m_context,
-                                                  im->width, im->height >> 1, (AVPixelFormat)srcFormat,
--                                                 im->width, im->height >> 1, (AVPixelFormat)PIX_FMT_BGRA,
--                                                 SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+                                                 im->width, im->height >> 1, (AVPixelFormat)AV_PIX_FMT_BGRA,
-+                                                 SWS_FAST_BILINEAR, NULL, NULL, NULL);
-   uint8_t *dstTop[]    = { m_rgbBuffer, 0, 0, 0 };
-   uint8_t *dstBot[]    = { m_rgbBuffer + m_sourceWidth * m_sourceHeight * 2, 0, 0, 0 };
-   int      dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
-Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
-@@ -2006,8 +2006,8 @@ void CLinuxRendererGLES::UploadYV12Textu
- #endif
-     {
-       m_sw_context = sws_getCachedContext(m_sw_context,
--        im->width, im->height, PIX_FMT_YUV420P,
--        im->width, im->height, PIX_FMT_RGBA,
-+        im->width, im->height, AV_PIX_FMT_YUV420P,
-+        im->width, im->height, AV_PIX_FMT_RGBA,
-         SWS_FAST_BILINEAR, NULL, NULL, NULL);
- 
-       uint8_t *src[]  = { im->plane[0], im->plane[1], im->plane[2], 0 };
-Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/WinRenderer.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp
-@@ -94,16 +94,16 @@ CWinRenderer::~CWinRenderer()
-   UnInit();
- }
- 
--static enum PixelFormat PixelFormatFromFormat(ERenderFormat format)
-+static enum AVPixelFormat PixelFormatFromFormat(ERenderFormat format)
- {
--  if (format == RENDER_FMT_DXVA)      return PIX_FMT_NV12;
--  if (format == RENDER_FMT_YUV420P)   return PIX_FMT_YUV420P;
--  if (format == RENDER_FMT_YUV420P10) return PIX_FMT_YUV420P10;
--  if (format == RENDER_FMT_YUV420P16) return PIX_FMT_YUV420P16;
--  if (format == RENDER_FMT_NV12)      return PIX_FMT_NV12;
--  if (format == RENDER_FMT_UYVY422)   return PIX_FMT_UYVY422;
--  if (format == RENDER_FMT_YUYV422)   return PIX_FMT_YUYV422;
--  return PIX_FMT_NONE;
-+  if (format == RENDER_FMT_DXVA)      return AV_PIX_FMT_NV12;
-+  if (format == RENDER_FMT_YUV420P)   return AV_PIX_FMT_YUV420P;
-+  if (format == RENDER_FMT_YUV420P10) return AV_PIX_FMT_YUV420P10;
-+  if (format == RENDER_FMT_YUV420P16) return AV_PIX_FMT_YUV420P16;
-+  if (format == RENDER_FMT_NV12)      return AV_PIX_FMT_NV12;
-+  if (format == RENDER_FMT_UYVY422)   return AV_PIX_FMT_UYVY422;
-+  if (format == RENDER_FMT_YUYV422)   return AV_PIX_FMT_YUYV422;
-+  return AV_PIX_FMT_NONE;
- }
- 
- void CWinRenderer::ManageTextures()
-@@ -719,13 +719,13 @@ void CWinRenderer::Render(DWORD flags)
- 
- void CWinRenderer::RenderSW()
- {
--  enum PixelFormat format = PixelFormatFromFormat(m_format);
-+  enum AVPixelFormat format = PixelFormatFromFormat(m_format);
- 
-   // 1. convert yuv to rgb
-   m_sw_scale_ctx = sws_getCachedContext(m_sw_scale_ctx,
-                                         m_sourceWidth, m_sourceHeight, format,
--                                        m_sourceWidth, m_sourceHeight, PIX_FMT_BGRA,
--                                        SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+                                        m_sourceWidth, m_sourceHeight, AV_PIX_FMT_BGRA,
-+                                        SWS_FAST_BILINEAR, NULL, NULL, NULL);
- 
-   YUVBuffer* buf = (YUVBuffer*)m_VideoBuffers[m_iYV12RenderBuffer];
- 
-Index: xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/pictures/Picture.cpp
-+++ xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp
-@@ -342,9 +342,9 @@ bool CPicture::ScaleImage(uint8_t *in_pi
-                           uint8_t *out_pixels, unsigned int out_width, unsigned int out_height, unsigned int out_pitch,
-                           CPictureScalingAlgorithm::Algorithm scalingAlgorithm /* = CPictureScalingAlgorithm::NoAlgorithm */)
- {
--  struct SwsContext *context = sws_getContext(in_width, in_height, PIX_FMT_BGRA,
--                                                         out_width, out_height, PIX_FMT_BGRA,
--                                                         CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm) | SwScaleCPUFlags(), NULL, NULL, NULL);
-+  struct SwsContext *context = sws_getContext(in_width, in_height, AV_PIX_FMT_BGRA,
-+                                                         out_width, out_height, AV_PIX_FMT_BGRA,
-+                                                         CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm), NULL, NULL, NULL);
- 
-   uint8_t *src[] = { in_pixels, 0, 0, 0 };
-   int     srcStride[] = { (int)in_pitch, 0, 0, 0 };
-Index: xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/video/FFmpegVideoDecoder.cpp
-+++ xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp
-@@ -252,7 +252,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas
-       return false;
- 
-     // Due to a bug in swsscale we need to allocate one extra line of data
--    if ( avpicture_alloc( m_pFrameRGB, PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 )
-+    if ( avpicture_alloc( m_pFrameRGB, AV_PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 )
-       return false;
-   }
- 
-@@ -287,7 +287,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas
- 
-   // We got the video frame, render it into the picture buffer
-   struct SwsContext * context = sws_getContext( m_pCodecCtx->width, m_pCodecCtx->height, m_pCodecCtx->pix_fmt,
--                           m_frameRGBwidth, m_frameRGBheight, PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
-+                           m_frameRGBwidth, m_frameRGBheight, AV_PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
- 
-   sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0, m_pCodecCtx->height,
-                                                                      m_pFrameRGB->data, m_pFrameRGB->linesize );
diff --git a/package/kodi/0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch b/package/kodi/0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch
deleted file mode 100644
index 9b0e47d074..0000000000
--- a/package/kodi/0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f63563615e357b7d794a38e1d37276c325d1466f Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Sat, 7 May 2016 13:47:42 +0100
-Subject: [PATCH] [exif] Fix for out-of-memory errors with large numbers
- of jpegs
-
-This reverts part of https://github.com/xbmc/xbmc/pull/7472
-
-Basically the commit made the 4 comments in the exif block increase
-from 2K to 64K each, so you now need 256K per photo.
-
-When opening a folder exif information for all photos is extracted.
-So, for a folder of 5000 jpegs, 1.2GB of RAM is needed just for
-the comments.
-
-As a 64K comment string is of no use to kodi, just truncate them to 2K
-like we used to.
-
-See:
-http://trac.kodi.tv/ticket/16193
-http://forum.kodi.tv/showthread.php?tid=251908
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(backported from upstream commit in master branch:
- https://github.com/xbmc/xbmc/commit/f63563615e357b7d794a38e1d37276c325d1466f)
----
- lib/libexif/libexif.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/libexif/libexif.h b/lib/libexif/libexif.h
-index aa8da07..519ac30 100644
---- a/lib/libexif/libexif.h
-+++ b/lib/libexif/libexif.h
-@@ -81,7 +81,7 @@ typedef struct {
- #define EXIF_COMMENT_CHARSET_UNICODE    3 // Exif: Unicode (UTF-16)
- #define EXIF_COMMENT_CHARSET_JIS        4 // Exif: JIS X208-1990
- 
--#define MAX_COMMENT 65533 // 2 bytes - 2 for the length param
-+#define MAX_COMMENT 2000
- #define MAX_DATE_COPIES 10
- 
- typedef struct {
--- 
-2.8.1
-
diff --git a/package/kodi/0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch b/package/kodi/0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch
deleted file mode 100644
index dc428d6ced..0000000000
--- a/package/kodi/0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 78571ed421e3fd3d5244cd76670e4e1bab69132f Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Fri, 27 May 2016 17:30:28 +0200
-Subject: [PATCH 1/1] Fix nullpadding issue when reading certain id3v1 tags
-
-backported from upstream commit to master branch:
-
-https://github.com/xbmc/xbmc/commit/cdabf9dd9e82f4b2d639fb769db08227a7c52046
-
-to fix problems with taglib-1.11:
-
-http://trac.kodi.tv/ticket/16454
-https://github.com/taglib/taglib/issues/741#issuecomment-218059031
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- xbmc/music/tags/TagLoaderTagLib.cpp | 21 ---------------------
- xbmc/music/tags/TagLoaderTagLib.h   |  3 +++
- 2 files changed, 3 insertions(+), 21 deletions(-)
-
-diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp
-index b78a591..0fc346a 100644
---- a/xbmc/music/tags/TagLoaderTagLib.cpp
-+++ b/xbmc/music/tags/TagLoaderTagLib.cpp
-@@ -46,31 +46,12 @@
- #include "utils/URIUtils.h"
- #include "utils/log.h"
- #include "utils/StringUtils.h"
--#include "utils/CharsetConverter.h"
- #include "utils/Base64.h"
- #include "settings/AdvancedSettings.h"
- 
- using namespace TagLib;
- using namespace MUSIC_INFO;
- 
--template<class T>
--class TagStringHandler : public T
--{
--public:
--  TagStringHandler() {}
--  virtual ~TagStringHandler() {}
--  virtual String parse(const ByteVector &data) const
--  {
--    std::string strSource(data.data(), data.size());
--    std::string strUTF8;
--    g_charsetConverter.unknownToUTF8(strSource, strUTF8);
--    return String(strUTF8, String::UTF8);
--  }
--};
--
--static const TagStringHandler<ID3v1::StringHandler> ID3v1StringHandler;
--static const TagStringHandler<ID3v2::Latin1StringHandler> ID3v2StringHandler;
--
- CTagLoaderTagLib::CTagLoaderTagLib()
- {
- }
-@@ -824,8 +805,6 @@ bool CTagLoaderTagLib::Load(const std::string& strFileName, CMusicInfoTag& tag,
-     return false;
-   }
- 
--  ID3v1::Tag::setStringHandler(&ID3v1StringHandler);
--  ID3v2::Tag::setLatin1StringHandler(&ID3v2StringHandler);
-   TagLib::File*              file = NULL;
-   TagLib::APE::File*         apeFile = NULL;
-   TagLib::ASF::File*         asfFile = NULL;
-diff --git a/xbmc/music/tags/TagLoaderTagLib.h b/xbmc/music/tags/TagLoaderTagLib.h
-index f83ea4f..0edb84f 100644
---- a/xbmc/music/tags/TagLoaderTagLib.h
-+++ b/xbmc/music/tags/TagLoaderTagLib.h
-@@ -44,6 +44,9 @@
- #include <taglib/mp4tag.h>
- #include "ImusicInfoTagLoader.h"
- 
-+#include <string>
-+#include <vector>
-+
- namespace MUSIC_INFO
- {
-   class CMusicInfoTag;
--- 
-2.8.1
-
diff --git a/package/kodi/0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch b/package/kodi/0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch
deleted file mode 100644
index a8de36c78b..0000000000
--- a/package/kodi/0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch
+++ /dev/null
@@ -1,1438 +0,0 @@
-From 8f82e51563f0e1bc9b7a8adf669ad2b66e7ce3e5 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Thu, 28 Apr 2016 17:17:40 +0200
-Subject: [PATCH] lib/cximage-6.0: fix compilation with gcc6
-
-For a quick fix I renamed min() to cxmin() and max() to cxmax() to
-prevent the conflict with the gcc definition.
-
-Forum thread for reference:
-http://forum.kodi.tv/showthread.php?tid=263884
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(Patch sent upstream: https://github.com/xbmc/xbmc/pull/9703)
----
- lib/cximage-6.0/CxImage/ximabmp.cpp  |   6 +-
- lib/cximage-6.0/CxImage/ximadef.h    |   8 +-
- lib/cximage-6.0/CxImage/ximadsp.cpp  | 182 +++++++++++++++++------------------
- lib/cximage-6.0/CxImage/ximage.cpp   |   4 +-
- lib/cximage-6.0/CxImage/ximagif.cpp  |   6 +-
- lib/cximage-6.0/CxImage/ximahist.cpp |  12 +--
- lib/cximage-6.0/CxImage/ximaint.cpp  |   8 +-
- lib/cximage-6.0/CxImage/ximaiter.h   |   4 +-
- lib/cximage-6.0/CxImage/ximajbg.cpp  |   2 +-
- lib/cximage-6.0/CxImage/ximapal.cpp  |  14 +--
- lib/cximage-6.0/CxImage/ximapng.cpp  |  12 +--
- lib/cximage-6.0/CxImage/ximaraw.cpp  |   4 +-
- lib/cximage-6.0/CxImage/ximasel.cpp  |  50 +++++-----
- lib/cximage-6.0/CxImage/ximath.cpp   |   8 +-
- lib/cximage-6.0/CxImage/ximatif.cpp  |   6 +-
- lib/cximage-6.0/CxImage/ximatran.cpp | 138 +++++++++++++-------------
- lib/cximage-6.0/CxImage/ximawnd.cpp  |  16 +--
- 17 files changed, 236 insertions(+), 244 deletions(-)
-
-diff --git a/lib/cximage-6.0/CxImage/ximabmp.cpp b/lib/cximage-6.0/CxImage/ximabmp.cpp
-index 726ff91..55842b1 100644
---- a/lib/cximage-6.0/CxImage/ximabmp.cpp
-+++ b/lib/cximage-6.0/CxImage/ximabmp.cpp
-@@ -46,7 +46,7 @@ bool CxImageBMP::Encode(CxFile * hFile)
- 		bihtoh(&infohdr);
- 
- 		// Write the file header
--		hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1);
-+		hFile->Write(&hdr,cxmin(14,sizeof(BITMAPFILEHEADER)),1);
- 		hFile->Write(&infohdr,sizeof(BITMAPINFOHEADER),1);
- 		 //and DIB+ALPHA interlaced
- 		BYTE *srcalpha = AlphaGetPointer();
-@@ -64,7 +64,7 @@ bool CxImageBMP::Encode(CxFile * hFile)
- #endif //CXIMAGE_SUPPORT_ALPHA
- 	{
- 		// Write the file header
--		hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1);
-+		hFile->Write(&hdr,cxmin(14,sizeof(BITMAPFILEHEADER)),1);
- 		//copy attributes
- 		memcpy(pDib,&head,sizeof(BITMAPINFOHEADER));
- 		bihtoh((BITMAPINFOHEADER*)pDib);
-@@ -86,7 +86,7 @@ bool CxImageBMP::Decode(CxFile * hFile)
- 	BITMAPFILEHEADER   bf;
- 	DWORD off = hFile->Tell(); //<CSC>
-   cx_try {
--	if (hFile->Read(&bf,min(14,sizeof(bf)),1)==0) cx_throw("Not a BMP");
-+	if (hFile->Read(&bf,cxmin(14,sizeof(bf)),1)==0) cx_throw("Not a BMP");
- 
- 	bf.bfSize = my_ntohl(bf.bfSize); 
- 	bf.bfOffBits = my_ntohl(bf.bfOffBits); 
-diff --git a/lib/cximage-6.0/CxImage/ximadef.h b/lib/cximage-6.0/CxImage/ximadef.h
-index fe383bf..53ea452 100644
---- a/lib/cximage-6.0/CxImage/ximadef.h
-+++ b/lib/cximage-6.0/CxImage/ximadef.h
-@@ -53,12 +53,8 @@
-  #define CXIMAGE_SUPPORT_WINDOWS 0
- #endif
- 
--#ifndef min
--#define min(a,b) (((a)<(b))?(a):(b))
--#endif
--#ifndef max
--#define max(a,b) (((a)>(b))?(a):(b))
--#endif
-+#define cxmin(a,b) (((a)<(b))?(a):(b))
-+#define cxmax(a,b) (((a)>(b))?(a):(b))
- 
- #ifndef PI
-  #define PI 3.141592653589793f
-diff --git a/lib/cximage-6.0/CxImage/ximadsp.cpp b/lib/cximage-6.0/CxImage/ximadsp.cpp
-index 8425bb2..813253b 100644
---- a/lib/cximage-6.0/CxImage/ximadsp.cpp
-+++ b/lib/cximage-6.0/CxImage/ximadsp.cpp
-@@ -389,8 +389,8 @@ RGBQUAD CxImage::RGBtoHSL(RGBQUAD lRGBColor)
- 	G = lRGBColor.rgbGreen;
- 	B = lRGBColor.rgbBlue;
- 
--	cMax = max( max(R,G), B);	/* calculate lightness */
--	cMin = min( min(R,G), B);
-+	cMax = cxmax( cxmax(R,G), B);	/* calculate lightness */
-+	cMin = cxmin( cxmin(R,G), B);
- 	L = (BYTE)((((cMax+cMin)*HSLMAX)+RGBMAX)/(2*RGBMAX));
- 
- 	if (cMax==cMin){			/* r=g=b --> achromatic case */
-@@ -489,9 +489,9 @@ RGBQUAD CxImage::YUVtoRGB(RGBQUAD lYUVColor)
- 	G = (int)( Y - 0.344f * U - 0.714f * V);
- 	B = (int)( Y + 1.770f * U);
- 
--	R= min(255,max(0,R));
--	G= min(255,max(0,G));
--	B= min(255,max(0,B));
-+	R= cxmin(255,cxmax(0,R));
-+	G= cxmin(255,cxmax(0,G));
-+	B= cxmin(255,cxmax(0,B));
- 	RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
- 	return rgb;
- }
-@@ -510,9 +510,9 @@ RGBQUAD CxImage::RGBtoYUV(RGBQUAD lRGBColor)
- 	U = (int)((B-Y) * 0.565f + 128);
- 	V = (int)((R-Y) * 0.713f + 128);
- 
--	Y= min(255,max(0,Y));
--	U= min(255,max(0,U));
--	V= min(255,max(0,V));
-+	Y= cxmin(255,cxmax(0,Y));
-+	U= cxmin(255,cxmax(0,U));
-+	V= cxmin(255,cxmax(0,V));
- 	RGBQUAD yuv={(BYTE)V,(BYTE)U,(BYTE)Y,0};
- 	return yuv;
- }
-@@ -528,9 +528,9 @@ RGBQUAD CxImage::YIQtoRGB(RGBQUAD lYIQColor)
- 	G = (int)( Y - 0.273f * I - 0.647f * Q);
- 	B = (int)( Y - 1.104f * I + 1.701f * Q);
- 
--	R= min(255,max(0,R));
--	G= min(255,max(0,G));
--	B= min(255,max(0,B));
-+	R= cxmin(255,cxmax(0,R));
-+	G= cxmin(255,cxmax(0,G));
-+	B= cxmin(255,cxmax(0,B));
- 	RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
- 	return rgb;
- }
-@@ -546,9 +546,9 @@ RGBQUAD CxImage::RGBtoYIQ(RGBQUAD lRGBColor)
- 	I = (int)( 0.5960f * R - 0.2742f * G - 0.3219f * B + 128);
- 	Q = (int)( 0.2109f * R - 0.5229f * G + 0.3120f * B + 128);
- 
--	Y= min(255,max(0,Y));
--	I= min(255,max(0,I));
--	Q= min(255,max(0,Q));
-+	Y= cxmin(255,cxmax(0,Y));
-+	I= cxmin(255,cxmax(0,I));
-+	Q= cxmin(255,cxmax(0,Q));
- 	RGBQUAD yiq={(BYTE)Q,(BYTE)I,(BYTE)Y,0};
- 	return yiq;
- }
-@@ -565,9 +565,9 @@ RGBQUAD CxImage::XYZtoRGB(RGBQUAD lXYZColor)
- 	G = (int)( -0.969256f * X + 1.875992f * Y + 0.041556f * Z * k);
- 	B = (int)(  0.055648f * X - 0.204043f * Y + 1.057311f * Z * k);
- 
--	R= min(255,max(0,R));
--	G= min(255,max(0,G));
--	B= min(255,max(0,B));
-+	R= cxmin(255,cxmax(0,R));
-+	G= cxmin(255,cxmax(0,G));
-+	B= cxmin(255,cxmax(0,B));
- 	RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
- 	return rgb;
- }
-@@ -583,9 +583,9 @@ RGBQUAD CxImage::RGBtoXYZ(RGBQUAD lRGBColor)
- 	Y = (int)( 0.212671f * R + 0.715160f * G + 0.072169f * B);
- 	Z = (int)((0.019334f * R + 0.119193f * G + 0.950227f * B)*0.918483657f);
- 
--	//X= min(255,max(0,X));
--	//Y= min(255,max(0,Y));
--	//Z= min(255,max(0,Z));
-+	//X= cxmin(255,cxmax(0,X));
-+	//Y= cxmin(255,cxmax(0,Y));
-+	//Z= cxmin(255,cxmax(0,Z));
- 	RGBQUAD xyz={(BYTE)Z,(BYTE)Y,(BYTE)X,0};
- 	return xyz;
- }
-@@ -707,7 +707,7 @@ bool CxImage::Light(long brightness, long contrast)
- 
- 	BYTE cTable[256]; //<nipper>
- 	for (int i=0;i<256;i++)	{
--		cTable[i] = (BYTE)max(0,min(255,(int)((i-128)*c + brightness + 0.5f)));
-+		cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)((i-128)*c + brightness + 0.5f)));
- 	}
- 
- 	return Lut(cTable);
-@@ -830,11 +830,11 @@ bool CxImage::Filter(long* kernel, long Ksize, long Kfactor, long Koffset)
- 						}
- 					}
- 					if (Kfactor==0 || ksumcur==0){
--						cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b + Koffset)));
-+						cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)(b + Koffset)));
- 					} else if (ksumtot == ksumcur) {
--						cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset)));
-+						cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)(b/Kfactor + Koffset)));
- 					} else {
--						cPtr2[iY1] = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
-+						cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
- 					}
- 				}
- 			}
-@@ -863,17 +863,17 @@ bool CxImage::Filter(long* kernel, long Ksize, long Kfactor, long Koffset)
- 						}
- 					}
- 					if (Kfactor==0 || ksumcur==0){
--						c.rgbRed   = (BYTE)min(255, max(0,(int)(r + Koffset)));
--						c.rgbGreen = (BYTE)min(255, max(0,(int)(g + Koffset)));
--						c.rgbBlue  = (BYTE)min(255, max(0,(int)(b + Koffset)));
-+						c.rgbRed   = (BYTE)cxmin(255, cxmax(0,(int)(r + Koffset)));
-+						c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(g + Koffset)));
-+						c.rgbBlue  = (BYTE)cxmin(255, cxmax(0,(int)(b + Koffset)));
- 					} else if (ksumtot == ksumcur) {
--						c.rgbRed   = (BYTE)min(255, max(0,(int)(r/Kfactor + Koffset)));
--						c.rgbGreen = (BYTE)min(255, max(0,(int)(g/Kfactor + Koffset)));
--						c.rgbBlue  = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset)));
-+						c.rgbRed   = (BYTE)cxmin(255, cxmax(0,(int)(r/Kfactor + Koffset)));
-+						c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(g/Kfactor + Koffset)));
-+						c.rgbBlue  = (BYTE)cxmin(255, cxmax(0,(int)(b/Kfactor + Koffset)));
- 					} else {
--						c.rgbRed   = (BYTE)min(255, max(0,(int)((r*ksumtot)/(ksumcur*Kfactor) + Koffset)));
--						c.rgbGreen = (BYTE)min(255, max(0,(int)((g*ksumtot)/(ksumcur*Kfactor) + Koffset)));
--						c.rgbBlue  = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
-+						c.rgbRed   = (BYTE)cxmin(255, cxmax(0,(int)((r*ksumtot)/(ksumcur*Kfactor) + Koffset)));
-+						c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)((g*ksumtot)/(ksumcur*Kfactor) + Koffset)));
-+						c.rgbBlue  = (BYTE)cxmin(255, cxmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
- 					}
- 					tmp.BlindSetPixelColor(x,y,c);
- 				}
-@@ -1078,8 +1078,8 @@ bool CxImage::Edge(long Ksize)
- // 
- void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffset, bool bMixAlpha)
- {
--    long lWide = min(GetWidth(),imgsrc2.GetWidth()-lXOffset);
--    long lHeight = min(GetHeight(),imgsrc2.GetHeight()-lYOffset);
-+    long lWide = cxmin(GetWidth(),imgsrc2.GetWidth()-lXOffset);
-+    long lHeight = cxmin(GetHeight(),imgsrc2.GetHeight()-lYOffset);
- 
- 	bool bEditAlpha = imgsrc2.AlphaIsValid() & bMixAlpha;
- 
-@@ -1112,16 +1112,16 @@ void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffse
- 						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)((rgb1.rgbReserved+rgb2.rgbReserved)/2);
- 					break;
- 					case OpAdd:
--						rgbDest.rgbBlue = (BYTE)max(0,min(255,rgb1.rgbBlue+rgb2.rgbBlue));
--						rgbDest.rgbGreen = (BYTE)max(0,min(255,rgb1.rgbGreen+rgb2.rgbGreen));
--						rgbDest.rgbRed = (BYTE)max(0,min(255,rgb1.rgbRed+rgb2.rgbRed));
--						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)max(0,min(255,rgb1.rgbReserved+rgb2.rgbReserved));
-+						rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,rgb1.rgbBlue+rgb2.rgbBlue));
-+						rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,rgb1.rgbGreen+rgb2.rgbGreen));
-+						rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,rgb1.rgbRed+rgb2.rgbRed));
-+						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)cxmax(0,cxmin(255,rgb1.rgbReserved+rgb2.rgbReserved));
- 					break;
- 					case OpSub:
--						rgbDest.rgbBlue = (BYTE)max(0,min(255,rgb1.rgbBlue-rgb2.rgbBlue));
--						rgbDest.rgbGreen = (BYTE)max(0,min(255,rgb1.rgbGreen-rgb2.rgbGreen));
--						rgbDest.rgbRed = (BYTE)max(0,min(255,rgb1.rgbRed-rgb2.rgbRed));
--						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)max(0,min(255,rgb1.rgbReserved-rgb2.rgbReserved));
-+						rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,rgb1.rgbBlue-rgb2.rgbBlue));
-+						rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,rgb1.rgbGreen-rgb2.rgbGreen));
-+						rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,rgb1.rgbRed-rgb2.rgbRed));
-+						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)cxmax(0,cxmin(255,rgb1.rgbReserved-rgb2.rgbReserved));
- 					break;
- 					case OpAnd:
- 						rgbDest.rgbBlue = (BYTE)(rgb1.rgbBlue&rgb2.rgbBlue);
-@@ -1202,11 +1202,11 @@ void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffse
- 							double dSmallAmt = dSmall*((double)rgb2.rgbBlue);
- 
- 							if( lAverage < lThresh+1){
--								rgbDest.rgbBlue = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbBlue) +
-+								rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbBlue) +
- 												dSmallAmt)));
--								rgbDest.rgbGreen = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbGreen) +
-+								rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbGreen) +
- 												dSmallAmt)));
--								rgbDest.rgbRed = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbRed) +
-+								rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbRed) +
- 												dSmallAmt)));
- 							}
- 							else
-@@ -1274,9 +1274,9 @@ bool CxImage::ShiftRGB(long r, long g, long b)
- #endif //CXIMAGE_SUPPORT_SELECTION
- 				{
- 					color = BlindGetPixelColor(x,y);
--					color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + r)));
--					color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + g)));
--					color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + b)));
-+					color.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbRed + r)));
-+					color.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbGreen + g)));
-+					color.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbBlue + b)));
- 					BlindSetPixelColor(x,y,color);
- 				}
- 			}
-@@ -1284,9 +1284,9 @@ bool CxImage::ShiftRGB(long r, long g, long b)
- 	} else {
- 		for(DWORD j=0; j<head.biClrUsed; j++){
- 			color = GetPaletteColor((BYTE)j);
--			color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + r)));
--			color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + g)));
--			color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + b)));
-+			color.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbRed + r)));
-+			color.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbGreen + g)));
-+			color.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbBlue + b)));
- 			SetPaletteColor((BYTE)j,color);
- 		}
- 	}
-@@ -1310,7 +1310,7 @@ bool CxImage::Gamma(float gamma)
- 
- 	BYTE cTable[256]; //<nipper>
- 	for (int i=0;i<256;i++)	{
--		cTable[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
-+		cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
- 	}
- 
- 	return Lut(cTable);
-@@ -1337,21 +1337,21 @@ bool CxImage::GammaRGB(float gammaR, float gammaG, float gammaB)
- 	dMax = pow(255.0, dinvgamma) / 255.0;
- 	BYTE cTableR[256];
- 	for (i=0;i<256;i++)	{
--		cTableR[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
-+		cTableR[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
- 	}
- 
- 	dinvgamma = 1/gammaG;
- 	dMax = pow(255.0, dinvgamma) / 255.0;
- 	BYTE cTableG[256];
- 	for (i=0;i<256;i++)	{
--		cTableG[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
-+		cTableG[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
- 	}
- 
- 	dinvgamma = 1/gammaB;
- 	dMax = pow(255.0, dinvgamma) / 255.0;
- 	BYTE cTableB[256];
- 	for (i=0;i<256;i++)	{
--		cTableB[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
-+		cTableB[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
- 	}
- 
- 	return Lut(cTableR, cTableG, cTableB);
-@@ -1442,11 +1442,11 @@ bool CxImage::Noise(long level)
- 			{
- 				color = BlindGetPixelColor(x,y);
- 				n=(long)((rand()/(float)RAND_MAX - 0.5)*level);
--				color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + n)));
-+				color.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbRed + n)));
- 				n=(long)((rand()/(float)RAND_MAX - 0.5)*level);
--				color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + n)));
-+				color.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbGreen + n)));
- 				n=(long)((rand()/(float)RAND_MAX - 0.5)*level);
--				color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + n)));
-+				color.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbBlue + n)));
- 				BlindSetPixelColor(x,y,color);
- 			}
- 		}
-@@ -1561,8 +1561,8 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage
- 
- 	//DFT buffers
- 	double *real2,*imag2;
--	real2 = (double*)malloc(max(w,h) * sizeof(double));
--	imag2 = (double*)malloc(max(w,h) * sizeof(double));
-+	real2 = (double*)malloc(cxmax(w,h) * sizeof(double));
-+	imag2 = (double*)malloc(cxmax(w,h) * sizeof(double));
- 
- 	/* Transform the rows */
- 	real = (double *)malloc(w * sizeof(double));
-@@ -1617,7 +1617,7 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage
- 
- 	/* converting from double to byte, there is a HUGE loss in the dynamics
- 	  "nn" tries to keep an acceptable SNR, but 8bit=48dB: don't ask more */
--	double nn=pow((double)2,(double)log((double)max(w,h))/(double)log((double)2)-4);
-+	double nn=pow((double)2,(double)log((double)cxmax(w,h))/(double)log((double)2)-4);
- 	//reversed gain for reversed transform
- 	if (direction==-1) nn=1/nn;
- 	//bMagnitude : just to see it on the screen
-@@ -1626,15 +1626,15 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage
- 	for (j=0;j<h;j++) {
- 		for (k=0;k<w;k++) {
- 			if (bMagnitude){
--				tmpReal->SetPixelIndex(k,j,(BYTE)max(0,min(255,(nn*(3+log(_cabs(grid[k][j])))))));
-+				tmpReal->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(nn*(3+log(_cabs(grid[k][j])))))));
- 				if (grid[k][j].x==0){
--					tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128+(atan(grid[k][j].y/0.0000000001)*nn)))));
-+					tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128+(atan(grid[k][j].y/0.0000000001)*nn)))));
- 				} else {
--					tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128+(atan(grid[k][j].y/grid[k][j].x)*nn)))));
-+					tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128+(atan(grid[k][j].y/grid[k][j].x)*nn)))));
- 				}
- 			} else {
--				tmpReal->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128 + grid[k][j].x*nn))));
--				tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128 + grid[k][j].y*nn))));
-+				tmpReal->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128 + grid[k][j].x*nn))));
-+				tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128 + grid[k][j].y*nn))));
- 			}
- 		}
- 	}
-@@ -1922,7 +1922,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius)
- 
- 			correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy);
- 
--			tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5))));
-+			tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5))));
- 		}
- 	}
- 
-@@ -1943,7 +1943,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius)
- 
- 			correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy);
- 
--			tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5))));
-+			tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5))));
- 		}
- 	}
- 	for (x=0;x<=w;x+=w){
-@@ -1963,7 +1963,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius)
- 
- 			correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy);
- 
--			tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5))));
-+			tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5))));
- 		}
- 	}
- 
-@@ -2621,8 +2621,8 @@ bool CxImage::SelectiveBlur(float radius, BYTE threshold, CxImage* iDst)
- 	}
- 
- 	//build the difference mask
--	BYTE thresh_dw = (BYTE)max( 0 ,(int)(128 - threshold));
--	BYTE thresh_up = (BYTE)min(255,(int)(128 + threshold));
-+	BYTE thresh_dw = (BYTE)cxmax( 0 ,(int)(128 - threshold));
-+	BYTE thresh_up = (BYTE)cxmin(255,(int)(128 + threshold));
- 	long kernel[]={-100,-100,-100,-100,801,-100,-100,-100,-100};
- 	if (!Tmp.Filter(kernel,3,800,128)){
- 		delete [] pPalette;
-@@ -2755,7 +2755,7 @@ bool CxImage::UnsharpMask(float radius /*= 5.0*/, float amount /*= 0.5*/, int th
- 					if (abs(diff) < threshold){
- 						dest_row[z] = cur_row[z];
- 					} else {
--						dest_row[z] = (BYTE)min(255, max(0,(int)(cur_row[z] + amount * diff)));
-+						dest_row[z] = (BYTE)cxmin(255, cxmax(0,(int)(cur_row[z] + amount * diff)));
- 					}
- 				}
- 			}
-@@ -2952,7 +2952,7 @@ bool CxImage::RedEyeRemove(float strength)
- 				float a = 1.0f-5.0f*((float)((x-0.5f*(xmax+xmin))*(x-0.5f*(xmax+xmin))+(y-0.5f*(ymax+ymin))*(y-0.5f*(ymax+ymin))))/((float)((xmax-xmin)*(ymax-ymin)));
- 				if (a<0) a=0;
- 				color = BlindGetPixelColor(x,y);
--				color.rgbRed = (BYTE)(a*min(color.rgbGreen,color.rgbBlue)+(1.0f-a)*color.rgbRed);
-+				color.rgbRed = (BYTE)(a*cxmin(color.rgbGreen,color.rgbBlue)+(1.0f-a)*color.rgbRed);
- 				BlindSetPixelColor(x,y,color);
- 			}
- 		}
-@@ -2990,7 +2990,7 @@ bool CxImage::Saturate(const long saturation, const long colorspace)
- 	case 1:
- 		{
- 			for (int i=0;i<256;i++)	{
--				cTable[i] = (BYTE)max(0,min(255,(int)(i + saturation)));
-+				cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)(i + saturation)));
- 			}
- 			for(long y=ymin; y<ymax; y++){
- 				info.nProgress = (long)(100*(y-ymin)/(ymax-ymin));
-@@ -3012,7 +3012,7 @@ bool CxImage::Saturate(const long saturation, const long colorspace)
- 	case 2:
- 		{
- 			for (int i=0;i<256;i++)	{
--				cTable[i] = (BYTE)max(0,min(255,(int)((i-128)*(100 + saturation)/100.0f + 128.5f)));
-+				cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)((i-128)*(100 + saturation)/100.0f + 128.5f)));
- 			}
- 			for(long y=ymin; y<ymax; y++){
- 				info.nProgress = (long)(100*(y-ymin)/(ymax-ymin));
-@@ -3242,10 +3242,10 @@ int  CxImage::OptimalThreshold(long method, RECT * pBox, CxImage* pContrastMask)
- 
- 	long xmin,xmax,ymin,ymax;
- 	if (pBox){
--		xmin = max(pBox->left,0);
--		xmax = min(pBox->right,head.biWidth);
--		ymin = max(pBox->bottom,0);
--		ymax = min(pBox->top,head.biHeight);
-+		xmin = cxmax(pBox->left,0);
-+		xmax = cxmin(pBox->right,head.biWidth);
-+		ymin = cxmax(pBox->bottom,0);
-+		ymax = cxmin(pBox->top,head.biHeight);
- 	} else {
- 		xmin = ymin = 0;
- 		xmax = head.biWidth; ymax=head.biHeight;
-@@ -3463,7 +3463,7 @@ bool CxImage::AdaptiveThreshold(long method, long nBoxSize, CxImage* pContrastMa
- 			r.top = r.bottom + nBoxSize;
- 			int threshold = OptimalThreshold(method, &r, pContrastMask);
- 			if (threshold <0) return false;
--			mask.SetPixelIndex(x,y,(BYTE)max(0,min(255,nBias+((1.0f-fGlobalLocalBalance)*threshold + fGlobalLocalBalance*globalthreshold))));
-+			mask.SetPixelIndex(x,y,(BYTE)cxmax(0,cxmin(255,nBias+((1.0f-fGlobalLocalBalance)*threshold + fGlobalLocalBalance*globalthreshold))));
- 		}
- 	}
- 
-@@ -3490,10 +3490,6 @@ bool CxImage::AdaptiveThreshold(long method, long nBoxSize, CxImage* pContrastMa
-  * Note: nOpacity=0 && bSelectFilledArea=true act as a "magic wand"
-  * \return true if everything is ok
-  */
--#if defined(XBMC) && !defined(_WIN32)
--int max(int a, int b) { return a > b ? a : b; }
--int min(int a, int b) { return a < b ? a : b; }
--#endif
- 
- bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFillColor, const BYTE nTolerance,
- 						BYTE nOpacity, const bool bSelectFilledArea, const BYTE nSelectionLevel)
-@@ -3538,8 +3534,8 @@ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFil
- 	if (IsIndexed()){ //--- Generic indexed image, no tolerance OR Grayscale image with tolerance
- 		BYTE idxRef = GetPixelIndex(xStart,yStart);
- 		BYTE idxFill = GetNearestIndex(cFillColor);
--		BYTE idxMin = (BYTE)min(255, max(0,(int)(idxRef - nTolerance)));
--		BYTE idxMax = (BYTE)min(255, max(0,(int)(idxRef + nTolerance)));
-+		BYTE idxMin = (BYTE)cxmin(255, cxmax(0,(int)(idxRef - nTolerance)));
-+		BYTE idxMax = (BYTE)cxmin(255, cxmax(0,(int)(idxRef + nTolerance)));
- 
- 		while(!q.empty())
- 		{
-@@ -3575,12 +3571,12 @@ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFil
- 	} else { //--- RGB image
- 		RGBQUAD cRef = GetPixelColor(xStart,yStart);
- 		RGBQUAD cRefMin, cRefMax;
--		cRefMin.rgbRed   = (BYTE)min(255, max(0,(int)(cRef.rgbRed   - nTolerance)));
--		cRefMin.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen - nTolerance)));
--		cRefMin.rgbBlue  = (BYTE)min(255, max(0,(int)(cRef.rgbBlue  - nTolerance)));
--		cRefMax.rgbRed   = (BYTE)min(255, max(0,(int)(cRef.rgbRed   + nTolerance)));
--		cRefMax.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen + nTolerance)));
--		cRefMax.rgbBlue  = (BYTE)min(255, max(0,(int)(cRef.rgbBlue  + nTolerance)));
-+		cRefMin.rgbRed   = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbRed   - nTolerance)));
-+		cRefMin.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbGreen - nTolerance)));
-+		cRefMin.rgbBlue  = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbBlue  - nTolerance)));
-+		cRefMax.rgbRed   = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbRed   + nTolerance)));
-+		cRefMax.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbGreen + nTolerance)));
-+		cRefMax.rgbBlue  = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbBlue  + nTolerance)));
- 
- 		while(!q.empty())
- 		{
-diff --git a/lib/cximage-6.0/CxImage/ximage.cpp b/lib/cximage-6.0/CxImage/ximage.cpp
-index e81d3c6..26c6993 100644
---- a/lib/cximage-6.0/CxImage/ximage.cpp
-+++ b/lib/cximage-6.0/CxImage/ximage.cpp
-@@ -460,7 +460,7 @@ bool CxImage::CreateFromArray(BYTE* pArray,DWORD dwWidth,DWORD dwHeight,DWORD dw
- 				src+=4;
- 			}
- 		} else {
--			memcpy(dst,src,min(info.dwEffWidth,dwBytesperline));
-+			memcpy(dst,src,cxmin(info.dwEffWidth,dwBytesperline));
- 		}
- 	}
- 	return true;
-@@ -500,7 +500,7 @@ bool CxImage::CreateFromMatrix(BYTE** ppMatrix,DWORD dwWidth,DWORD dwHeight,DWOR
- 					src+=4;
- 				}
- 			} else {
--				memcpy(dst,src,min(info.dwEffWidth,dwBytesperline));
-+				memcpy(dst,src,cxmin(info.dwEffWidth,dwBytesperline));
- 			}
- 		}
- 	}
-diff --git a/lib/cximage-6.0/CxImage/ximagif.cpp b/lib/cximage-6.0/CxImage/ximagif.cpp
-index b89e061..64b1ccc 100644
---- a/lib/cximage-6.0/CxImage/ximagif.cpp
-+++ b/lib/cximage-6.0/CxImage/ximagif.cpp
-@@ -478,7 +478,7 @@ bool CxImageGIF::Encode(CxFile * fp, CxImage ** pImages, int pagecount, bool bLo
- 	ghost.EncodeHeader(fp);
- 
- 	if (m_loops!=1){
--		ghost.SetLoops(max(0,m_loops-1));
-+		ghost.SetLoops(cxmax(0,m_loops-1));
- 		ghost.EncodeLoopExtension(fp);
- 	}
- 
-@@ -1340,10 +1340,10 @@ void CxImageGIF::GetComment(char* sz_comment_out)
- ////////////////////////////////////////////////////////////////////////////////
- void CxImageGIF::GifMix(CxImage & imgsrc2, struct_image & imgdesc)
- {
--	long ymin = max(0,(long)(GetHeight()-imgdesc.t - imgdesc.h));
-+	long ymin = cxmax(0,(long)(GetHeight()-imgdesc.t - imgdesc.h));
- 	long ymax = GetHeight()-imgdesc.t;
- 	long xmin = imgdesc.l;
--	long xmax = min(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w));
-+	long xmax = cxmin(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w));
- 
- 	long ibg2= imgsrc2.GetTransIndex();
-     BYTE i2;
-diff --git a/lib/cximage-6.0/CxImage/ximahist.cpp b/lib/cximage-6.0/CxImage/ximahist.cpp
-index a2aed03..5391107 100644
---- a/lib/cximage-6.0/CxImage/ximahist.cpp
-+++ b/lib/cximage-6.0/CxImage/ximahist.cpp
-@@ -110,7 +110,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 	// calculate LUT
- 	BYTE lut[256];
- 	for (x = 0; x <256; x++){
--		lut[x] = (BYTE)max(0,min(255,(255 * (x - minc) / (maxc - minc))));
-+		lut[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minc) / (maxc - minc))));
- 	}
- 
- 	for (y=0; y<head.biHeight; y++)	{
-@@ -152,7 +152,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 		// calculate LUT
- 		BYTE lut[256];
- 		for (x = 0; x <256; x++){
--			lut[x] = (BYTE)max(0,min(255,(255 * (x - minc) / (maxc - minc))));
-+			lut[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minc) / (maxc - minc))));
- 		}
- 
- 		// normalize image
-@@ -225,7 +225,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 		BYTE range = maxR - minR;
- 		if (range != 0)	{
- 			for (x = 0; x <256; x++){
--				lutR[x] = (BYTE)max(0,min(255,(255 * (x - minR) / range)));
-+				lutR[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minR) / range)));
- 			}
- 		} else lutR[minR] = minR;
- 
-@@ -233,7 +233,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 		range = maxG - minG;
- 		if (range != 0)	{
- 			for (x = 0; x <256; x++){
--				lutG[x] = (BYTE)max(0,min(255,(255 * (x - minG) / range)));
-+				lutG[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minG) / range)));
- 			}
- 		} else lutG[minG] = minG;
- 			
-@@ -241,7 +241,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 		range = maxB - minB;
- 		if (range != 0)	{
- 			for (x = 0; x <256; x++){
--				lutB[x] = (BYTE)max(0,min(255,(255 * (x - minB) / range)));
-+				lutB[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minB) / range)));
- 			}
- 		} else lutB[minB] = minB;
- 
-@@ -292,7 +292,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 		// calculate LUT
- 		BYTE lut[256];
- 		for (x = 0; x <256; x++){
--			lut[x] = (BYTE)max(0,min(255,(255 * (x - minc) / (maxc - minc))));
-+			lut[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minc) / (maxc - minc))));
- 		}
- 
- 		for(y=0; y<head.biHeight; y++){
-diff --git a/lib/cximage-6.0/CxImage/ximaint.cpp b/lib/cximage-6.0/CxImage/ximaint.cpp
-index 989d76c..5d49213 100644
---- a/lib/cximage-6.0/CxImage/ximaint.cpp
-+++ b/lib/cximage-6.0/CxImage/ximaint.cpp
-@@ -26,8 +26,8 @@ void CxImage::OverflowCoordinates(long &x, long &y, OverflowMethod const ofMetho
-   switch (ofMethod) {
-     case OM_REPEAT:
-       //clip coordinates
--      x=max(x,0); x=min(x, head.biWidth-1);
--      y=max(y,0); y=min(y, head.biHeight-1);
-+      x=cxmax(x,0); x=cxmin(x, head.biWidth-1);
-+      y=cxmax(y,0); y=cxmin(y, head.biHeight-1);
-       break;
-     case OM_WRAP:
-       //wrap coordinates
-@@ -59,8 +59,8 @@ void CxImage::OverflowCoordinates(float &x, float &y, OverflowMethod const ofMet
-   switch (ofMethod) {
-     case OM_REPEAT:
-       //clip coordinates
--      x=max(x,0); x=min(x, head.biWidth-1);
--      y=max(y,0); y=min(y, head.biHeight-1);
-+      x=cxmax(x,0); x=cxmin(x, head.biWidth-1);
-+      y=cxmax(y,0); y=cxmin(y, head.biHeight-1);
-       break;
-     case OM_WRAP:
-       //wrap coordinates
-diff --git a/lib/cximage-6.0/CxImage/ximaiter.h b/lib/cximage-6.0/CxImage/ximaiter.h
-index 9788919..01a720b 100644
---- a/lib/cximage-6.0/CxImage/ximaiter.h
-+++ b/lib/cximage-6.0/CxImage/ximaiter.h
-@@ -140,7 +140,7 @@ inline void CImageIterator::SetY(int y)
- inline void CImageIterator::SetRow(BYTE *buf, int n)
- {
- 	if (n<0) n = (int)ima->GetEffWidth();
--	else n = min(n,(int)ima->GetEffWidth());
-+	else n = cxmin(n,(int)ima->GetEffWidth());
- 
- 	if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0)) memcpy(IterImage,buf,n);
- }
-@@ -148,7 +148,7 @@ inline void CImageIterator::SetRow(BYTE *buf, int n)
- inline void CImageIterator::GetRow(BYTE *buf, int n)
- {
- 	if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0))
--		memcpy(buf,IterImage,min(n,(int)ima->GetEffWidth()));
-+		memcpy(buf,IterImage,cxmin(n,(int)ima->GetEffWidth()));
- }
- /////////////////////////////////////////////////////////////////////
- inline BYTE* CImageIterator::GetRow()
-diff --git a/lib/cximage-6.0/CxImage/ximajbg.cpp b/lib/cximage-6.0/CxImage/ximajbg.cpp
-index 06fb9bf..8a01e28 100644
---- a/lib/cximage-6.0/CxImage/ximajbg.cpp
-+++ b/lib/cximage-6.0/CxImage/ximajbg.cpp
-@@ -145,7 +145,7 @@ bool CxImageJBG::Encode(CxFile * hFile)
- 	jbg_enc_init(&jbig_state, w, h, planes, &buffer, jbig_data_out, hFile);
- 
-     //jbg_enc_layers(&jbig_state, 2);
--    //jbg_enc_lrlmax(&jbig_state, 800, 600);
-+    //jbg_enc_lrlcxmax(&jbig_state, 800, 600);
- 
- 	// Specify a few other options (each is ignored if negative)
- 	int dl = -1, dh = -1, d = -1, l0 = -1, mx = -1;
-diff --git a/lib/cximage-6.0/CxImage/ximapal.cpp b/lib/cximage-6.0/CxImage/ximapal.cpp
-index b3bd3da..3788c98 100644
---- a/lib/cximage-6.0/CxImage/ximapal.cpp
-+++ b/lib/cximage-6.0/CxImage/ximapal.cpp
-@@ -398,8 +398,8 @@ void CxImage::RGBtoBGR(BYTE *buffer, int length)
- {
- 	if (buffer && (head.biClrUsed==0)){
- 		BYTE temp;
--		length = min(length,(int)info.dwEffWidth);
--		length = min(length,(int)(3*head.biWidth));
-+		length = cxmin(length,(int)info.dwEffWidth);
-+		length = cxmin(length,(int)(3*head.biWidth));
- 		for (int i=0;i<length;i+=3){
- 			temp = buffer[i]; buffer[i] = buffer[i+2]; buffer[i+2] = temp;
- 		}
-@@ -444,7 +444,7 @@ void CxImage::SetPalette(DWORD n, BYTE *r, BYTE *g, BYTE *b)
- 	if (!g) g = r;
- 	if (!b) b = g;
- 	RGBQUAD* ppal=GetPalette();
--	DWORD m=min(n,head.biClrUsed);
-+	DWORD m=cxmin(n,head.biClrUsed);
- 	for (DWORD i=0; i<m;i++){
- 		ppal[i].rgbRed=r[i];
- 		ppal[i].rgbGreen=g[i];
-@@ -457,7 +457,7 @@ void CxImage::SetPalette(rgb_color *rgb,DWORD nColors)
- {
- 	if ((!rgb)||(pDib==NULL)||(head.biClrUsed==0)) return;
- 	RGBQUAD* ppal=GetPalette();
--	DWORD m=min(nColors,head.biClrUsed);
-+	DWORD m=cxmin(nColors,head.biClrUsed);
- 	for (DWORD i=0; i<m;i++){
- 		ppal[i].rgbRed=rgb[i].r;
- 		ppal[i].rgbGreen=rgb[i].g;
-@@ -469,7 +469,7 @@ void CxImage::SetPalette(rgb_color *rgb,DWORD nColors)
- void CxImage::SetPalette(RGBQUAD* pPal,DWORD nColors)
- {
- 	if ((pPal==NULL)||(pDib==NULL)||(head.biClrUsed==0)) return;
--	memcpy(GetPalette(),pPal,min(GetPaletteSize(),nColors*sizeof(RGBQUAD)));
-+	memcpy(GetPalette(),pPal,cxmin(GetPaletteSize(),nColors*sizeof(RGBQUAD)));
- 	info.last_c_isvalid = false;
- }
- ////////////////////////////////////////////////////////////////////////////////
-@@ -654,10 +654,10 @@ void CxImage::SetClrImportant(DWORD ncolors)
- 
- 	switch(head.biBitCount){
- 	case 1:
--		head.biClrImportant = min(ncolors,2);
-+		head.biClrImportant = cxmin(ncolors,2);
- 		break;
- 	case 4:
--		head.biClrImportant = min(ncolors,16);
-+		head.biClrImportant = cxmin(ncolors,16);
- 		break;
- 	case 8:
- 		head.biClrImportant = ncolors;
-diff --git a/lib/cximage-6.0/CxImage/ximapng.cpp b/lib/cximage-6.0/CxImage/ximapng.cpp
-index a58441c..4b5cc50 100644
---- a/lib/cximage-6.0/CxImage/ximapng.cpp
-+++ b/lib/cximage-6.0/CxImage/ximapng.cpp
-@@ -206,9 +206,9 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
- 	
- #ifdef USE_NEW_LIBPNG_API
--	int nshift = max(0,(_bit_depth>>3)-1)<<3;
-+	int nshift = cxmax(0,(_bit_depth>>3)-1)<<3;
- #else
--	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
-+	int nshift = cxmax(0,(info_ptr->bit_depth>>3)-1)<<3;
- #endif
- 
- #ifdef USE_NEW_LIBPNG_API
-@@ -255,10 +255,10 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 			if (pal){
- 				DWORD ip;
- #ifdef USE_NEW_LIBPNG_API
--				for (ip=0;ip<min(head.biClrUsed,(unsigned long)_num_trans);ip++)
-+				for (ip=0;ip<cxmin(head.biClrUsed,(unsigned long)_num_trans);ip++)
- 					pal[ip].rgbReserved=_trans_alpha[ip];
- #else
--				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
-+				for (ip=0;ip<cxmin(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
- #if PNG_LIBPNG_VER > 10399
- 					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
- #else
-@@ -737,9 +737,9 @@ bool CxImagePNG::Encode(CxFile *hFile)
- #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
- 
- #ifdef USE_NEW_LIBPNG_API
--	int row_size = max(info.dwEffWidth, (_width * _channels * _bit_depth / 8));
-+	int row_size = cxmax(info.dwEffWidth, (_width * _channels * _bit_depth / 8));
- #else
--	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
-+	int row_size = cxmax(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
- 	info_ptr->rowbytes = row_size;
- #endif
- 	BYTE *row_pointers = new BYTE[row_size];
-diff --git a/lib/cximage-6.0/CxImage/ximaraw.cpp b/lib/cximage-6.0/CxImage/ximaraw.cpp
-index fd86f96..52d964d 100644
---- a/lib/cximage-6.0/CxImage/ximaraw.cpp
-+++ b/lib/cximage-6.0/CxImage/ximaraw.cpp
-@@ -216,7 +216,7 @@ bool CxImageRAW::Decode(CxFile *hFile)
- 
- 		DWORD size = dcr.width * (dcr.colors*dcr.opt.output_bps/8);
- 		RGBtoBGR(ppm,size);
--		memcpy(GetBits(dcr.height - 1 - row), ppm, min(size,GetEffWidth()));
-+		memcpy(GetBits(dcr.height - 1 - row), ppm, cxmin(size,GetEffWidth()));
- 	}
- 	free (ppm);
- 
-@@ -298,7 +298,7 @@ bool CxImageRAW::GetExifThumbnail(const char *filename, const char *outname, int
- 			// Resizing.
-       		if (image.GetWidth() > 256 || image.GetHeight() > 256)
- 		    {
--				float amount = 256.0f / max(image.GetWidth(), image.GetHeight());
-+				float amount = 256.0f / cxmax(image.GetWidth(), image.GetHeight());
- 				image.Resample((long)(image.GetWidth() * amount), (long)(image.GetHeight() * amount), 0);
- 		    }
- 	      	
-diff --git a/lib/cximage-6.0/CxImage/ximasel.cpp b/lib/cximage-6.0/CxImage/ximasel.cpp
-index 3a7c9a1..37cd10f 100644
---- a/lib/cximage-6.0/CxImage/ximasel.cpp
-+++ b/lib/cximage-6.0/CxImage/ximasel.cpp
-@@ -113,15 +113,15 @@ bool CxImage::SelectionAddRect(RECT r, BYTE level)
- 	if (r.left<r.right) {r2.left=r.left; r2.right=r.right; } else {r2.left=r.right ; r2.right=r.left; }
- 	if (r.bottom<r.top) {r2.bottom=r.bottom; r2.top=r.top; } else {r2.bottom=r.top ; r2.top=r.bottom; }
- 
--	if (info.rSelectionBox.top <= r2.top) info.rSelectionBox.top = max(0L,min(head.biHeight,r2.top+1));
--	if (info.rSelectionBox.left > r2.left) info.rSelectionBox.left = max(0L,min(head.biWidth,r2.left));
--	if (info.rSelectionBox.right <= r2.right) info.rSelectionBox.right = max(0L,min(head.biWidth,r2.right+1));
--	if (info.rSelectionBox.bottom > r2.bottom) info.rSelectionBox.bottom = max(0L,min(head.biHeight,r2.bottom));
-+	if (info.rSelectionBox.top <= r2.top) info.rSelectionBox.top = cxmax(0L,cxmin(head.biHeight,r2.top+1));
-+	if (info.rSelectionBox.left > r2.left) info.rSelectionBox.left = cxmax(0L,cxmin(head.biWidth,r2.left));
-+	if (info.rSelectionBox.right <= r2.right) info.rSelectionBox.right = cxmax(0L,cxmin(head.biWidth,r2.right+1));
-+	if (info.rSelectionBox.bottom > r2.bottom) info.rSelectionBox.bottom = cxmax(0L,cxmin(head.biHeight,r2.bottom));
- 
--	long ymin = max(0L,min(head.biHeight,r2.bottom));
--	long ymax = max(0L,min(head.biHeight,r2.top+1));
--	long xmin = max(0L,min(head.biWidth,r2.left));
--	long xmax = max(0L,min(head.biWidth,r2.right+1));
-+	long ymin = cxmax(0L,cxmin(head.biHeight,r2.bottom));
-+	long ymax = cxmax(0L,cxmin(head.biHeight,r2.top+1));
-+	long xmin = cxmax(0L,cxmin(head.biWidth,r2.left));
-+	long xmax = cxmax(0L,cxmin(head.biWidth,r2.right+1));
- 
- 	for (long y=ymin; y<ymax; y++)
- 		memset(pSelection + xmin + y * head.biWidth, level, xmax-xmin);
-@@ -144,18 +144,18 @@ bool CxImage::SelectionAddEllipse(RECT r, BYTE level)
- 	long xcenter = (r.right + r.left)/2;
- 	long ycenter = (r.top + r.bottom)/2;
- 
--	if (info.rSelectionBox.left > (xcenter - xradius)) info.rSelectionBox.left = max(0L,min(head.biWidth,(xcenter - xradius)));
--	if (info.rSelectionBox.right <= (xcenter + xradius)) info.rSelectionBox.right = max(0L,min(head.biWidth,(xcenter + xradius + 1)));
--	if (info.rSelectionBox.bottom > (ycenter - yradius)) info.rSelectionBox.bottom = max(0L,min(head.biHeight,(ycenter - yradius)));
--	if (info.rSelectionBox.top <= (ycenter + yradius)) info.rSelectionBox.top = max(0L,min(head.biHeight,(ycenter + yradius + 1)));
-+	if (info.rSelectionBox.left > (xcenter - xradius)) info.rSelectionBox.left = cxmax(0L,cxmin(head.biWidth,(xcenter - xradius)));
-+	if (info.rSelectionBox.right <= (xcenter + xradius)) info.rSelectionBox.right = cxmax(0L,cxmin(head.biWidth,(xcenter + xradius + 1)));
-+	if (info.rSelectionBox.bottom > (ycenter - yradius)) info.rSelectionBox.bottom = cxmax(0L,cxmin(head.biHeight,(ycenter - yradius)));
-+	if (info.rSelectionBox.top <= (ycenter + yradius)) info.rSelectionBox.top = cxmax(0L,cxmin(head.biHeight,(ycenter + yradius + 1)));
- 
--	long xmin = max(0L,min(head.biWidth,xcenter - xradius));
--	long xmax = max(0L,min(head.biWidth,xcenter + xradius + 1));
--	long ymin = max(0L,min(head.biHeight,ycenter - yradius));
--	long ymax = max(0L,min(head.biHeight,ycenter + yradius + 1));
-+	long xmin = cxmax(0L,cxmin(head.biWidth,xcenter - xradius));
-+	long xmax = cxmax(0L,cxmin(head.biWidth,xcenter + xradius + 1));
-+	long ymin = cxmax(0L,cxmin(head.biHeight,ycenter - yradius));
-+	long ymax = cxmax(0L,cxmin(head.biHeight,ycenter + yradius + 1));
- 
- 	long y,yo;
--	for (y=ymin; y<min(ycenter,ymax); y++){
-+	for (y=ymin; y<cxmin(ycenter,ymax); y++){
- 		for (long x=xmin; x<xmax; x++){
- 			yo = (long)(ycenter - yradius * sqrt(1-pow((float)(x - xcenter)/(float)xradius,2)));
- 			if (yo<y) pSelection[x + y * head.biWidth] = level;
-@@ -268,10 +268,10 @@ bool CxImage::SelectionAddPolygon(POINT *points, long npoints, BYTE level)
- 		RECT r2;
- 		if (current->x < next->x) {r2.left=current->x; r2.right=next->x; } else {r2.left=next->x ; r2.right=current->x; }
- 		if (current->y < next->y) {r2.bottom=current->y; r2.top=next->y; } else {r2.bottom=next->y ; r2.top=current->y; }
--		if (localbox.top < r2.top) localbox.top = max(0L,min(head.biHeight-1,r2.top+1));
--		if (localbox.left > r2.left) localbox.left = max(0L,min(head.biWidth-1,r2.left-1));
--		if (localbox.right < r2.right) localbox.right = max(0L,min(head.biWidth-1,r2.right+1));
--		if (localbox.bottom > r2.bottom) localbox.bottom = max(0L,min(head.biHeight-1,r2.bottom-1));
-+		if (localbox.top < r2.top) localbox.top = cxmax(0L,cxmin(head.biHeight-1,r2.top+1));
-+		if (localbox.left > r2.left) localbox.left = cxmax(0L,cxmin(head.biWidth-1,r2.left-1));
-+		if (localbox.right < r2.right) localbox.right = cxmax(0L,cxmin(head.biWidth-1,r2.right+1));
-+		if (localbox.bottom > r2.bottom) localbox.bottom = cxmax(0L,cxmin(head.biHeight-1,r2.bottom-1));
- 
- 		i++;
- 	}
-@@ -385,10 +385,10 @@ bool CxImage::SelectionAddPolygon(POINT *points, long npoints, BYTE level)
- 		for (x=localbox.left; x<=localbox.right; x++)
- 			if (plocal[x + yoffset]!=1) pSelection[x + yoffset]=level;
- 	}
--	if (info.rSelectionBox.top <= localbox.top) info.rSelectionBox.top = min(head.biHeight,localbox.top + 1);
--	if (info.rSelectionBox.left > localbox.left) info.rSelectionBox.left = min(head.biWidth,localbox.left);
--	if (info.rSelectionBox.right <= localbox.right) info.rSelectionBox.right = min(head.biWidth,localbox.right + 1);
--	if (info.rSelectionBox.bottom > localbox.bottom) info.rSelectionBox.bottom = min(head.biHeight,localbox.bottom);
-+	if (info.rSelectionBox.top <= localbox.top) info.rSelectionBox.top = cxmin(head.biHeight,localbox.top + 1);
-+	if (info.rSelectionBox.left > localbox.left) info.rSelectionBox.left = cxmin(head.biWidth,localbox.left);
-+	if (info.rSelectionBox.right <= localbox.right) info.rSelectionBox.right = cxmin(head.biWidth,localbox.right + 1);
-+	if (info.rSelectionBox.bottom > localbox.bottom) info.rSelectionBox.bottom = cxmin(head.biHeight,localbox.bottom);
- 
- 	free(plocal);
- 	free(pix);
-diff --git a/lib/cximage-6.0/CxImage/ximath.cpp b/lib/cximage-6.0/CxImage/ximath.cpp
-index 37533e2..f84eb72 100644
---- a/lib/cximage-6.0/CxImage/ximath.cpp
-+++ b/lib/cximage-6.0/CxImage/ximath.cpp
-@@ -64,10 +64,10 @@ CxRect2 CxRect2::CrossSection(CxRect2 const &r2) const
-  */
- {
-   CxRect2 cs;
--  cs.botLeft.x=max(botLeft.x, r2.botLeft.x);
--  cs.botLeft.y=max(botLeft.y, r2.botLeft.y);
--  cs.topRight.x=min(topRight.x, r2.topRight.x);
--  cs.topRight.y=min(topRight.y, r2.topRight.y);
-+  cs.botLeft.x=cxmax(botLeft.x, r2.botLeft.x);
-+  cs.botLeft.y=cxmax(botLeft.y, r2.botLeft.y);
-+  cs.topRight.x=cxmin(topRight.x, r2.topRight.x);
-+  cs.topRight.y=cxmin(topRight.y, r2.topRight.y);
-   if (cs.botLeft.x<=cs.topRight.x && cs.botLeft.y<=cs.topRight.y) {
-     return cs;
-   } else {
-diff --git a/lib/cximage-6.0/CxImage/ximatif.cpp b/lib/cximage-6.0/CxImage/ximatif.cpp
-index 658392a..002766c 100644
---- a/lib/cximage-6.0/CxImage/ximatif.cpp
-+++ b/lib/cximage-6.0/CxImage/ximatif.cpp
-@@ -470,9 +470,9 @@ bool CxImageTIF::Decode(CxFile * hFile)
- 						if ( cb > 0.00304 ) cb = 1.055 * pow(cb,0.41667) - 0.055;
- 							else            cb = 12.92 * cb;
- 
--						c.rgbRed  =(BYTE)max(0,min(255,(int)(cr*255)));
--						c.rgbGreen=(BYTE)max(0,min(255,(int)(cg*255)));
--						c.rgbBlue =(BYTE)max(0,min(255,(int)(cb*255)));
-+						c.rgbRed  =(BYTE)cxmax(0,cxmin(255,(int)(cr*255)));
-+						c.rgbGreen=(BYTE)cxmax(0,cxmin(255,(int)(cg*255)));
-+						c.rgbBlue =(BYTE)cxmax(0,cxmin(255,(int)(cb*255)));
- 
- 						SetPixelColor(xi,yi,c);
- #if CXIMAGE_SUPPORT_ALPHA
-diff --git a/lib/cximage-6.0/CxImage/ximatran.cpp b/lib/cximage-6.0/CxImage/ximatran.cpp
-index 64a71e7..84d5e03 100644
---- a/lib/cximage-6.0/CxImage/ximatran.cpp
-+++ b/lib/cximage-6.0/CxImage/ximatran.cpp
-@@ -302,12 +302,12 @@ bool CxImage::RotateLeft(CxImage* iDst)
- 			for (ys = 0; ys < newHeight; ys+=RBLOCK) {
- 				if (head.biBitCount==24) {
- 					//RGB24 optimized pixel access:
--					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){    //do rotation
-+					for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){    //do rotation
- 						info.nProgress = (long)(100*x/newWidth);
- 						x2=newWidth-x-1;
- 						dstPtr = (BYTE*) imgDest.BlindGetPixelPointer(x,ys);
- 						srcPtr = (BYTE*) BlindGetPixelPointer(ys, x2);
--						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+						for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 							//imgDest.SetPixelColor(x, y, GetPixelColor(y, x2));
- 							*(dstPtr) = *(srcPtr);
- 							*(dstPtr+1) = *(srcPtr+1);
-@@ -318,19 +318,19 @@ bool CxImage::RotateLeft(CxImage* iDst)
- 					}//for x
- 				} else {
- 					//anything else than 24bpp (and 1bpp): palette
--					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+					for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 						info.nProgress = (long)(100*x/newWidth); //<Anatoly Ivasyuk>
- 						x2=newWidth-x-1;
--						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+						for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 							imgDest.SetPixelIndex(x, y, BlindGetPixelIndex(y, x2));
- 						}//for y
- 					}//for x
- 				}//if (version selection)
- #if CXIMAGE_SUPPORT_ALPHA
- 				if (AlphaIsValid()) {
--					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+					for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 						x2=newWidth-x-1;
--						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+						for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 							imgDest.AlphaSet(x,y,BlindAlphaGet(y, x2));
- 						}//for y
- 					}//for x
-@@ -343,9 +343,9 @@ bool CxImage::RotateLeft(CxImage* iDst)
- 					imgDest.info.rSelectionBox.right = newWidth-info.rSelectionBox.bottom;
- 					imgDest.info.rSelectionBox.bottom = info.rSelectionBox.left;
- 					imgDest.info.rSelectionBox.top = info.rSelectionBox.right;
--					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+					for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 						x2=newWidth-x-1;
--						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+						for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 							imgDest.SelectionSet(x,y,BlindSelectionGet(y, x2));
- 						}//for y
- 					}//for x
-@@ -447,12 +447,12 @@ bool CxImage::RotateRight(CxImage* iDst)
- 			for (ys = 0; ys < newHeight; ys+=RBLOCK) {
- 				if (head.biBitCount==24) {
- 					//RGB24 optimized pixel access:
--					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+					for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 						info.nProgress = (long)(100*y/newHeight); //<Anatoly Ivasyuk>
- 						y2=newHeight-y-1;
- 						dstPtr = (BYTE*) imgDest.BlindGetPixelPointer(xs,y);
- 						srcPtr = (BYTE*) BlindGetPixelPointer(y2, xs);
--						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+						for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 							//imgDest.SetPixelColor(x, y, GetPixelColor(y2, x));
- 							*(dstPtr) = *(srcPtr);
- 							*(dstPtr+1) = *(srcPtr+1);
-@@ -463,19 +463,19 @@ bool CxImage::RotateRight(CxImage* iDst)
- 					}//for y
- 				} else {
- 					//anything else than BW & RGB24: palette
--					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+					for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 						info.nProgress = (long)(100*y/newHeight); //<Anatoly Ivasyuk>
- 						y2=newHeight-y-1;
--						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+						for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 							imgDest.SetPixelIndex(x, y, BlindGetPixelIndex(y2, x));
- 						}//for x
- 					}//for y
- 				}//if
- #if CXIMAGE_SUPPORT_ALPHA
- 				if (AlphaIsValid()){
--					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+					for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 						y2=newHeight-y-1;
--						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+						for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 							imgDest.AlphaSet(x,y,BlindAlphaGet(y2, x));
- 						}//for x
- 					}//for y
-@@ -488,9 +488,9 @@ bool CxImage::RotateRight(CxImage* iDst)
- 					imgDest.info.rSelectionBox.right = info.rSelectionBox.top;
- 					imgDest.info.rSelectionBox.bottom = newHeight-info.rSelectionBox.right;
- 					imgDest.info.rSelectionBox.top = newHeight-info.rSelectionBox.left;
--					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+					for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 						y2=newHeight-y-1;
--						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+						for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 							imgDest.SelectionSet(x,y,BlindSelectionGet(y2, x));
- 						}//for x
- 					}//for y
-@@ -608,10 +608,10 @@ bool CxImage::Rotate(float angle, CxImage* iDst)
- 	newP4.x = (float)(p4.x*cos_angle - p4.y*sin_angle);
- 	newP4.y = (float)(p4.x*sin_angle + p4.y*cos_angle);
- 
--	leftTop.x = min(min(newP1.x,newP2.x),min(newP3.x,newP4.x));
--	leftTop.y = min(min(newP1.y,newP2.y),min(newP3.y,newP4.y));
--	rightBottom.x = max(max(newP1.x,newP2.x),max(newP3.x,newP4.x));
--	rightBottom.y = max(max(newP1.y,newP2.y),max(newP3.y,newP4.y));
-+	leftTop.x = cxmin(cxmin(newP1.x,newP2.x),cxmin(newP3.x,newP4.x));
-+	leftTop.y = cxmin(cxmin(newP1.y,newP2.y),cxmin(newP3.y,newP4.y));
-+	rightBottom.x = cxmax(cxmax(newP1.x,newP2.x),cxmax(newP3.x,newP4.x));
-+	rightBottom.y = cxmax(cxmax(newP1.y,newP2.y),cxmax(newP3.y,newP4.y));
- 	leftBottom.x = leftTop.x;
- 	leftBottom.y = rightBottom.y;
- 	rightTop.x = rightBottom.x;
-@@ -740,10 +740,10 @@ bool CxImage::Rotate2(float angle,
- 	}//if
- 
- 	//(read new dimensions from location of corners)
--	float minx = (float) min(min(newp[0].x,newp[1].x),min(newp[2].x,newp[3].x));
--	float miny = (float) min(min(newp[0].y,newp[1].y),min(newp[2].y,newp[3].y));
--	float maxx = (float) max(max(newp[0].x,newp[1].x),max(newp[2].x,newp[3].x));
--	float maxy = (float) max(max(newp[0].y,newp[1].y),max(newp[2].y,newp[3].y));
-+	float minx = (float) cxmin(cxmin(newp[0].x,newp[1].x),cxmin(newp[2].x,newp[3].x));
-+	float miny = (float) cxmin(cxmin(newp[0].y,newp[1].y),cxmin(newp[2].y,newp[3].y));
-+	float maxx = (float) cxmax(cxmax(newp[0].x,newp[1].x),cxmax(newp[2].x,newp[3].x));
-+	float maxy = (float) cxmax(cxmax(newp[0].y,newp[1].y),cxmax(newp[2].y,newp[3].y));
- 	int newWidth = (int) floor(maxx-minx+0.5f);
- 	int newHeight= (int) floor(maxy-miny+0.5f);
- 	float ssx=((maxx+minx)- ((float) newWidth-1))/2.0f;   //start for x
-@@ -1003,12 +1003,12 @@ bool CxImage::Resample(long newx, long newy, int mode, CxImage* iDst)
- 				if (info.nEscape) break;
- 				fY = y * yScale;
- 				ifY = (int)fY;
--				ifY1 = min(ymax, ifY+1);
-+				ifY1 = cxmin(ymax, ifY+1);
- 				dy = fY - ifY;
- 				for(long x=0; x<newx; x++){
- 					fX = x * xScale;
- 					ifX = (int)fX;
--					ifX1 = min(xmax, ifX+1);
-+					ifX1 = cxmin(xmax, ifX+1);
- 					dx = fX - ifX;
- 					// Interpolate using the four nearest pixels in the source
- 					if (head.biClrUsed){
-@@ -1328,9 +1328,9 @@ bool CxImage::DecreaseBpp(DWORD nbit, bool errordiffusion, RGBQUAD* ppal, DWORD
- 				eb=(long)c.rgbBlue - (long)ce.rgbBlue;
- 
- 				c = GetPixelColor(x+1,y);
--				c.rgbRed = (BYTE)min(255L,max(0L,(long)c.rgbRed + ((er*7)/16)));
--				c.rgbGreen = (BYTE)min(255L,max(0L,(long)c.rgbGreen + ((eg*7)/16)));
--				c.rgbBlue = (BYTE)min(255L,max(0L,(long)c.rgbBlue + ((eb*7)/16)));
-+				c.rgbRed = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbRed + ((er*7)/16)));
-+				c.rgbGreen = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbGreen + ((eg*7)/16)));
-+				c.rgbBlue = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbBlue + ((eb*7)/16)));
- 				SetPixelColor(x+1,y,c);
- 				int coeff=1;
- 				for(int i=-1; i<2; i++){
-@@ -1343,9 +1343,9 @@ bool CxImage::DecreaseBpp(DWORD nbit, bool errordiffusion, RGBQUAD* ppal, DWORD
- 						coeff=1; break;
- 					}
- 					c = GetPixelColor(x+i,y+1);
--					c.rgbRed = (BYTE)min(255L,max(0L,(long)c.rgbRed + ((er * coeff)/16)));
--					c.rgbGreen = (BYTE)min(255L,max(0L,(long)c.rgbGreen + ((eg * coeff)/16)));
--					c.rgbBlue = (BYTE)min(255L,max(0L,(long)c.rgbBlue + ((eb * coeff)/16)));
-+					c.rgbRed = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbRed + ((er * coeff)/16)));
-+					c.rgbGreen = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbGreen + ((eg * coeff)/16)));
-+					c.rgbBlue = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbBlue + ((eb * coeff)/16)));
- 					SetPixelColor(x+i,y+1,c);
- 				}
- 			}
-@@ -1566,10 +1566,10 @@ bool CxImage::Dither(long method)
- 				}
- 
- 				nlevel = GetPixelIndex(x + 1, y) + (error * 8) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 1, y, level);
- 				nlevel = GetPixelIndex(x + 2, y) + (error * 4) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 2, y, level);
- 				int i;
- 				for (i = -2; i < 3; i++) {
-@@ -1591,7 +1591,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 1, level);
- 				}
- 			}
-@@ -1620,10 +1620,10 @@ bool CxImage::Dither(long method)
- 				}
- 
- 				nlevel = GetPixelIndex(x + 1, y) + (error * 8) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 1, y, level);
- 				nlevel = GetPixelIndex(x + 2, y) + (error * 4) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 2, y, level);
- 				int i;
- 				for (i = -2; i < 3; i++) {
-@@ -1645,7 +1645,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 1, level);
- 				}
- 				for (i = -2; i < 3; i++) {
-@@ -1667,7 +1667,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 2) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 2, level);
- 				}
- 			}
-@@ -1696,10 +1696,10 @@ bool CxImage::Dither(long method)
- 				}
- 
- 				nlevel = GetPixelIndex(x + 1, y) + (error * 7) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 1, y, level);
- 				nlevel = GetPixelIndex(x + 2, y) + (error * 5) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 2, y, level);
- 				int i;
- 				for (i = -2; i < 3; i++) {
-@@ -1721,7 +1721,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 1, level);
- 				}
- 				for (i = -2; i < 3; i++) {
-@@ -1743,7 +1743,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 2) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 2, level);
- 				}
- 			}
-@@ -1772,10 +1772,10 @@ bool CxImage::Dither(long method)
- 				}
- 
- 				nlevel = GetPixelIndex(x + 1, y) + (error * 5) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 1, y, level);
- 				nlevel = GetPixelIndex(x + 2, y) + (error * 3) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 2, y, level);
- 				int i;
- 				for (i = -2; i < 3; i++) {
-@@ -1797,7 +1797,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 1, level);
- 				}
- 				for (i = -1; i < 2; i++) {
-@@ -1813,7 +1813,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 2) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 2, level);
- 				}
- 			}
-@@ -1845,76 +1845,76 @@ bool CxImage::Dither(long method)
- 				int tmp_index_y = y;
- 				int tmp_coeff = 32;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x - 3;
- 				tmp_index_y = y + 1;
- 				tmp_coeff = 12;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x - 1;
- 				tmp_coeff = 26;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x + 1;
- 				tmp_coeff = 30;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x + 3;
- 				tmp_coeff = 16;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x - 2;
- 				tmp_index_y = y + 2;
- 				tmp_coeff = 12;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x;
- 				tmp_coeff = 26;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x + 2;
- 				tmp_coeff = 12;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x - 3;
- 				tmp_index_y = y + 3;
- 				tmp_coeff = 5;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x - 1;
- 				tmp_coeff = 12;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x + 1;
- 				tmp_coeff = 12;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x + 3;
- 				tmp_coeff = 5;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 			}
- 		}
-@@ -1941,7 +1941,7 @@ bool CxImage::Dither(long method)
- 			Bmatrix[i] = (BYTE)(dither);
- 		}
- 
--		int scale = max(0,(8-2*order));
-+		int scale = cxmax(0,(8-2*order));
- 		int level;
- 		for (long y=0;y<head.biHeight;y++){
- 			info.nProgress = (long)(100*y/head.biHeight);
-@@ -1981,7 +1981,7 @@ bool CxImage::Dither(long method)
- 				}
- 
- 				nlevel = GetPixelIndex(x+1,y) + (error * 7)/16;
--				level = (BYTE)min(255,max(0,(int)nlevel));
-+				level = (BYTE)cxmin(255,cxmax(0,(int)nlevel));
- 				SetPixelIndex(x+1,y,level);
- 				for(int i=-1; i<2; i++){
- 					switch(i){
-@@ -1993,7 +1993,7 @@ bool CxImage::Dither(long method)
- 						coeff=1; break;
- 					}
- 					nlevel = GetPixelIndex(x+i,y+1) + (error * coeff)/16;
--					level = (BYTE)min(255,max(0,(int)nlevel));
-+					level = (BYTE)cxmin(255,cxmax(0,(int)nlevel));
- 					SetPixelIndex(x+i,y+1,level);
- 				}
- 			}
-@@ -2031,7 +2031,7 @@ bool CxImage::CropRotatedRectangle( long topx, long topy, long width, long heigh
- 	if ( fabs(angle)<0.0002 )
- 		return Crop( topx, topy, topx+width, topy+height, iDst);
- 
--	startx = min(topx, topx - (long)(sin_angle*(double)height));
-+	startx = cxmin(topx, topx - (long)(sin_angle*(double)height));
- 	endx   = topx + (long)(cos_angle*(double)width);
- 	endy   = topy + (long)(cos_angle*(double)height + sin_angle*(double)width);
- 	// check: corners of the rectangle must be inside
-@@ -2079,10 +2079,10 @@ bool CxImage::Crop(long left, long top, long right, long bottom, CxImage* iDst)
- {
- 	if (!pDib) return false;
- 
--	long startx = max(0L,min(left,head.biWidth));
--	long endx = max(0L,min(right,head.biWidth));
--	long starty = head.biHeight - max(0L,min(top,head.biHeight));
--	long endy = head.biHeight - max(0L,min(bottom,head.biHeight));
-+	long startx = cxmax(0L,cxmin(left,head.biWidth));
-+	long endx = cxmax(0L,cxmin(right,head.biWidth));
-+	long starty = head.biHeight - cxmax(0L,cxmin(top,head.biHeight));
-+	long endy = head.biHeight - cxmax(0L,cxmin(bottom,head.biHeight));
- 
- 	if (startx==endx || starty==endy) return false;
- 
-@@ -2443,8 +2443,8 @@ bool CxImage::CircleTransform(int type,long rmax,float Koeff)
- 						nx=x+(x%32)-16;
- 						ny=y;
- 					}
--//					nx=max(xmin,min(nx,xmax));
--//					ny=max(ymin,min(ny,ymax));
-+//					nx=cxmax(xmin,cxmin(nx,xmax));
-+//					ny=cxmax(ymin,cxmin(ny,ymax));
- 				}
- 				else { nx=-1;ny=-1;}
- 				if (head.biClrUsed==0){
-diff --git a/lib/cximage-6.0/CxImage/ximawnd.cpp b/lib/cximage-6.0/CxImage/ximawnd.cpp
-index 2ae2f93..7029cc7 100644
---- a/lib/cximage-6.0/CxImage/ximawnd.cpp
-+++ b/lib/cximage-6.0/CxImage/ximawnd.cpp
-@@ -682,10 +682,10 @@ long CxImage::Draw(HDC hdc, long x, long y, long cx, long cy, RECT* pClipRect, b
- 	RECT clipbox,paintbox;
- 	GetClipBox(hdc,&clipbox);
- 
--	paintbox.top = min(clipbox.bottom,max(clipbox.top,y));
--	paintbox.left = min(clipbox.right,max(clipbox.left,x));
--	paintbox.right = max(clipbox.left,min(clipbox.right,x+cx));
--	paintbox.bottom = max(clipbox.top,min(clipbox.bottom,y+cy));
-+	paintbox.top = cxmin(clipbox.bottom,cxmax(clipbox.top,y));
-+	paintbox.left = cxmin(clipbox.right,cxmax(clipbox.left,x));
-+	paintbox.right = cxmax(clipbox.left,cxmin(clipbox.right,x+cx));
-+	paintbox.bottom = cxmax(clipbox.top,cxmin(clipbox.bottom,y+cy));
- 
- 	long destw = paintbox.right - paintbox.left;
- 	long desth = paintbox.bottom - paintbox.top;
-@@ -730,12 +730,12 @@ long CxImage::Draw(HDC hdc, long x, long y, long cx, long cy, RECT* pClipRect, b
- 
- 				for(yy=0;yy<desth;yy++){
- 					dy = head.biHeight-(ymax-yy-y)*fy;
--					sy = max(0L,(long)floor(dy));
-+					sy = cxmax(0L,(long)floor(dy));
- 					psrc = info.pImage+sy*info.dwEffWidth;
- 					pdst = pbase+yy*ew;
- 					for(xx=0;xx<destw;xx++){
- 						dx = (xx+xmin-x)*fx;
--						sx = max(0L,(long)floor(dx));
-+						sx = cxmax(0L,(long)floor(dx));
- #if CXIMAGE_SUPPORT_INTERPOLATION
- 						if (bSmooth){
- 							if (fx > 1 && fy > 1) { 
-@@ -813,7 +813,7 @@ long CxImage::Draw(HDC hdc, long x, long y, long cx, long cy, RECT* pClipRect, b
- 				
- 				for(yy=0;yy<desth;yy++){
- 					dy = head.biHeight-(ymax-yy-y)*fy;
--					sy = max(0L,(long)floor(dy));
-+					sy = cxmax(0L,(long)floor(dy));
- 
- 					alphaoffset = sy*head.biWidth;
- 					pdst = pbase + yy*ew;
-@@ -821,7 +821,7 @@ long CxImage::Draw(HDC hdc, long x, long y, long cx, long cy, RECT* pClipRect, b
- 
- 					for(xx=0;xx<destw;xx++){
- 						dx = (xx+xmin-x)*fx;
--						sx = max(0L,(long)floor(dx));
-+						sx = cxmax(0L,(long)floor(dx));
- 
- 						if (bAlpha) a=pAlpha[alphaoffset+sx]; else a=255;
- 						a =(BYTE)((a*(1+info.nAlphaMax))>>8);
--- 
-2.8.0.rc3
-
diff --git a/package/kodi/0010-curl-support-version-7.5.0-and-upwards.patch b/package/kodi/0010-curl-support-version-7.5.0-and-upwards.patch
deleted file mode 100644
index b6743ae532..0000000000
--- a/package/kodi/0010-curl-support-version-7.5.0-and-upwards.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7d3c70b163bc67aeb1fdef8fd2347b39f311c584 Mon Sep 17 00:00:00 2001
-From: fritsch <peter.fruehberger@gmail.com>
-Date: Sun, 24 Jul 2016 20:24:07 +0200
-Subject: [PATCH] Curl: Adjust multi_cleanup method which returns CURLMcode
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(backported from upstream commit:
- https://github.com/xbmc/xbmc/commit/2a8d3e7f6cffea52740b8392a3be8ec251d5ff70)
----
- xbmc/filesystem/DllLibCurl.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/filesystem/DllLibCurl.h b/xbmc/filesystem/DllLibCurl.h
-index db97f92..9e78a91 100644
---- a/xbmc/filesystem/DllLibCurl.h
-+++ b/xbmc/filesystem/DllLibCurl.h
-@@ -52,7 +52,7 @@ namespace XCURL
-     virtual CURLMcode multi_fdset(CURLM *multi_handle, fd_set *read_fd_set, fd_set *write_fd_set, fd_set *exc_fd_set, int *max_fd)=0;
-     virtual CURLMcode multi_timeout(CURLM *multi_handle, long *timeout)=0;
-     virtual CURLMsg*  multi_info_read(CURLM *multi_handle, int *msgs_in_queue)=0;
--    virtual void multi_cleanup(CURL_HANDLE * handle )=0;
-+    virtual CURLMcode multi_cleanup(CURLM * handle )=0;
-     virtual struct curl_slist* slist_append(struct curl_slist *, const char *)=0;
-     virtual void  slist_free_all(struct curl_slist *)=0;
-   };
-@@ -77,7 +77,7 @@ namespace XCURL
-     DEFINE_METHOD5(CURLMcode, multi_fdset, (CURLM *p1, fd_set *p2, fd_set *p3, fd_set *p4, int *p5))
-     DEFINE_METHOD2(CURLMcode, multi_timeout, (CURLM *p1, long *p2))
-     DEFINE_METHOD2(CURLMsg*,  multi_info_read, (CURLM *p1, int *p2))
--    DEFINE_METHOD1(void, multi_cleanup, (CURLM *p1))
-+    DEFINE_METHOD1(CURLMcode, multi_cleanup, (CURLM *p1))
-     DEFINE_METHOD2(struct curl_slist*, slist_append, (struct curl_slist * p1, const char * p2))
-     DEFINE_METHOD1(void, slist_free_all, (struct curl_slist * p1))
-     DEFINE_METHOD1(const char *, easy_strerror, (CURLcode p1))
diff --git a/package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch b/package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch
deleted file mode 100644
index a3a9d50ed1..0000000000
--- a/package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a17e8d39cf01e26955574acd236b4ef5b54b8c3b Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Mon, 5 Sep 2016 12:34:20 +0200
-Subject: [PATCH 2/2] xbmc_pvr_types.h: Fix compilation with gcc6
-
-Backport of upstream commit from master branch:
-https://github.com/xbmc/xbmc/commit/c8a346109926fa03bf6882c0b6e3885af0e0f8ed
-
-This patch can be removed when Kodi is bumped to 17.0-Krypton.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- xbmc/addons/include/xbmc_pvr_types.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xbmc/addons/include/xbmc_pvr_types.h b/xbmc/addons/include/xbmc_pvr_types.h
-index c5ab20b..e518de1 100644
---- a/xbmc/addons/include/xbmc_pvr_types.h
-+++ b/xbmc/addons/include/xbmc_pvr_types.h
-@@ -34,6 +34,7 @@
- #endif
- #include <string.h>
- #include <stdint.h>
-+#include <stdio.h>
- 
- #include "xbmc_addon_types.h"
- #include "xbmc_epg_types.h"
--- 
-2.9.3
-
diff --git a/package/kodi/0012-Fix_includes_in_amcodec.patch b/package/kodi/0012-Fix_includes_in_amcodec.patch
deleted file mode 100644
index 4a6d44f686..0000000000
--- a/package/kodi/0012-Fix_includes_in_amcodec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 4bbb21aa5cee6b2f40759aa8b1bd65246a237f79
-Author: Alex Deryskyba <alex@codesnake.com>
-Date:   Wed May 4 01:38:27 2016 +0200
-
-    [aml] Fix includes in amcodec/codec.h to make them relative
-
-[Taken from upstream commit
-https://github.com/xbmc/xbmc/commit/4bbb21aa5cee6b2f40759aa8b1bd65246a237f79.]
-Signed-off-by: Dagg Stompler <daggs@gmx.com>
-
-diff --git a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
-index 187d4d5..632c24e 100644
---- a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
-+++ b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
-@@ -12,8 +12,8 @@
- #ifndef CODEC_CTRL_H_
- #define CODEC_CTRL_H_
- 
--#include <codec_type.h>
--#include <codec_error.h>
-+#include "codec_type.h"
-+#include "codec_error.h"
- 
- 
- int codec_init(codec_para_t *);
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
-index a1a3447..1bf5a89 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
-@@ -24,8 +24,6 @@ endif
- ifeq (@USE_LIBAMCODEC@,1)
- SRCS += AMLCodec.cpp
- SRCS += DVDVideoCodecAmlogic.cpp
--INCLUDES += -I$(prefix)/include/amcodec
--INCLUDES += -I$(prefix)/include/amplayer
- endif
- 
- ifeq (@USE_ANDROID@,1)
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index f94e2c7c20..7e1140291e 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -5,12 +5,13 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS
 		&& BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \
 		&& BR2_TOOLCHAIN_HAS_SYNC_8
 
-comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7, host gcc >= 4.6"
+comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, locale, threads, wchar, dynamic library, gcc >= 4.8, host gcc >= 4.6"
 	depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
 		|| !BR2_USE_WCHAR || BR2_STATIC_LIBS \
+		|| !BR2_ENABLE_LOCALE \
 		|| !BR2_HOST_GCC_AT_LEAST_4_6 \
-		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
 		|| BR2_TOOLCHAIN_USES_MUSL \
 		|| !BR2_PACKAGE_PYTHON \
 		|| BR2_PACKAGE_PYTHON_PYC_ONLY
@@ -20,38 +21,33 @@ config BR2_PACKAGE_KODI_EGL_GLES
 	default y
 	depends on BR2_PACKAGE_HAS_LIBEGL
 	depends on BR2_PACKAGE_HAS_LIBGLES
-	depends on !BR2_PACKAGE_KODI_GL # prefer GL if available
+	depends on !BR2_PACKAGE_KODI_GL_EGL # prefer GL if available
 
-config BR2_PACKAGE_KODI_GL
+config BR2_PACKAGE_KODI_GL_EGL
 	bool
 	default y
+	depends on BR2_PACKAGE_HAS_LIBEGL
 	depends on BR2_PACKAGE_HAS_LIBGL
-	depends on !BR2_arm # kodi needs egl/gles on arm
-
-comment "kodi needs an OpenGL or an openGL ES and EGL backend"
-	depends on BR2_i386 || BR2_x86_64
-	depends on !BR2_PACKAGE_KODI_GL && !BR2_PACKAGE_KODI_EGL_GLES
+	depends on !BR2_PACKAGE_RPI_USERLAND # rpi depends on gles
 
-comment "kodi requires an OpenGL ES and EGL backend"
-	depends on BR2_arm
-	depends on !BR2_PACKAGE_KODI_EGL_GLES
+comment "kodi needs an OpenGL EGL with either an openGL or an OpenGL ES backend"
+	depends on !BR2_PACKAGE_KODI_GL_EGL && !BR2_PACKAGE_KODI_EGL_GLES
 
 menuconfig BR2_PACKAGE_KODI
 	bool "kodi"
+	depends on BR2_ENABLE_LOCALE
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_HOST_GCC_AT_LEAST_4_6
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_TOOLCHAIN_USES_MUSL
-	depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL
+	depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL_EGL
 	depends on BR2_USE_WCHAR
-	depends on !BR2_STATIC_LIBS # libsquish, and others
+	depends on !BR2_STATIC_LIBS # python and others
 	depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_PYTHON
 	depends on !BR2_PACKAGE_PYTHON_PYC_ONLY
 	select BR2_NEEDS_HOST_JAVA
-	select BR2_PACKAGE_BOOST
-	select BR2_PACKAGE_BOOST_THREAD
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_FFMPEG
@@ -60,25 +56,14 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_FFMPEG_SWSCALE
 	select BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_FREETYPE
-	select BR2_PACKAGE_GIFLIB
-	select BR2_PACKAGE_JASPER
-	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBASS
 	select BR2_PACKAGE_LIBCDIO
 	select BR2_PACKAGE_LIBCROSSGUID
 	select BR2_PACKAGE_LIBCURL
-	select BR2_PACKAGE_LIBDCADEC
 	select BR2_PACKAGE_LIBFRIBIDI
-	select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_KODI_GL
-	select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL
-	select BR2_PACKAGE_LIBGCRYPT
-	select BR2_PACKAGE_LIBMPEG2
-	select BR2_PACKAGE_LIBOGG
+	select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL_EGL
 	select BR2_PACKAGE_LIBPLIST
-	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_LIBSAMPLERATE
-	select BR2_PACKAGE_LIBSQUISH
-	select BR2_PACKAGE_LIBVORBIS
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBXSLT
 	select BR2_PACKAGE_LZO
@@ -98,10 +83,9 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_TAGLIB
-	select BR2_PACKAGE_TIFF
 	select BR2_PACKAGE_TINYXML
-	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL
-	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_KODI_GL
+	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL_EGL
+	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_KODI_GL_EGL
 	select BR2_PACKAGE_YAJL
 	select BR2_PACKAGE_ZLIB
 	select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support
@@ -188,13 +172,6 @@ config BR2_PACKAGE_KODI_NONFREE
 	  Enable components with non-free licenses. This option
 	  currently only controls support for RAR archives.
 
-config BR2_PACKAGE_KODI_RTMPDUMP
-	bool "rtmp"
-	select BR2_PACKAGE_RTMPDUMP
-	help
-	  Enable RTMP input support.
-	  Select this if you want to play back rtmp stream.
-
 config BR2_PACKAGE_KODI_LIBSHAIRPLAY
 	bool "shairport"
 	select BR2_PACKAGE_LIBSHAIRPLAY
@@ -233,19 +210,25 @@ config BR2_PACKAGE_KODI_LIBUSB
 
 config BR2_PACKAGE_KODI_LIBVA
 	bool "va"
+	depends on !BR2_PACKAGE_KODI_EGL_GLES
+	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBVA
 	help
 	  Enable libva support.
 
+comment "libva support needs X.org with an openGL backend"
+	depends on !BR2_PACKAGE_XORG7 || BR2_PACKAGE_KODI_EGL_GLES
+
 config BR2_PACKAGE_KODI_LIBVDPAU
 	bool "vdpau"
+	depends on !BR2_PACKAGE_KODI_EGL_GLES
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBVDPAU
 	help
 	  Enable libvdpau support.
 
-comment "libvdpau support needs X.org"
-	depends on !BR2_PACKAGE_XORG7
+comment "libvdpau support needs X.org with an openGL backend"
+	depends on !BR2_PACKAGE_XORG7 || BR2_PACKAGE_KODI_EGL_GLES
 
 config BR2_PACKAGE_KODI_UPNP
 	bool "upnp"
diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash
index 6f1ab40430..5e76fc50c4 100644
--- a/package/kodi/kodi.hash
+++ b/package/kodi/kodi.hash
@@ -1,3 +1,8 @@
 # Locally computed
-sha256	7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10	kodi-16.1-Jarvis.tar.gz
 sha256 303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee  kodi-17.1-Krypton.tar.gz
+# Locally computed - libdvdcss
+sha256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34  2f12236.tar.gz
+# Locally computed - libdvdnav
+sha256 312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d  981488f.tar.gz
+# Locally computed - libdvdread
+sha256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b  17d99db.tar.gz
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index ed0cec8759..b0df3a0546 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -4,46 +4,35 @@
 #
 ################################################################################
 
-KODI_VERSION = 16.1-Jarvis
+# When updating the version, please also update kodi-jsonschemabuilder
+# and kodi-texturepacker
+KODI_VERSION = 17.1-Krypton
 KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
 KODI_LICENSE = GPL-2.0
 KODI_LICENSE_FILES = LICENSE.GPL
 # needed for binary addons
 KODI_INSTALL_STAGING = YES
 KODI_DEPENDENCIES = \
-	boost \
 	bzip2 \
 	expat \
 	ffmpeg \
 	fontconfig \
 	freetype \
-	giflib \
 	host-gawk \
-	host-gettext \
-	host-giflib \
 	host-gperf \
-	host-libjpeg \
-	host-libpng \
-	host-lzo \
+	host-kodi-jsonschemabuilder \
+	host-kodi-texturepacker \
 	host-nasm \
 	host-swig \
+	host-xmlstarlet \
 	host-zip \
-	jasper \
-	jpeg \
 	libass \
 	libcdio \
 	libcrossguid \
 	libcurl \
-	libdcadec \
 	libfribidi \
-	libgcrypt \
-	libmpeg2 \
-	libogg \
 	libplist \
-	libpng \
 	libsamplerate \
-	libsquish \
-	libvorbis \
 	libxml2 \
 	libxslt \
 	lzo \
@@ -54,191 +43,238 @@ KODI_DEPENDENCIES = \
 	readline \
 	sqlite \
 	taglib \
-	tiff \
 	tinyxml \
 	yajl \
 	zlib
 
-KODI_CONF_ENV = \
-	PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \
-	PYTHON_LDFLAGS="-lpython$(PYTHON_VERSION_MAJOR) -lpthread -ldl -lutil -lm" \
-	PYTHON_CPPFLAGS="-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)" \
-	PYTHON_SITE_PKG="$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
-	PYTHON_NOVERSIONCHECK="no-check" \
-	use_texturepacker_native=yes \
-	USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" \
-	TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
+KODI_SUBDIR = project/cmake
+
+KODI_LIBDVDCSS_VERSION = 2f12236
+KODI_LIBDVDNAV_VERSION = 981488f
+KODI_LIBDVDREAD_VERSION = 17d99db
+
+KODI_EXTRA_DOWNLOADS = \
+	https://github.com/xbmc/libdvdcss/archive/$(KODI_LIBDVDCSS_VERSION).tar.gz \
+	https://github.com/xbmc/libdvdnav/archive/$(KODI_LIBDVDNAV_VERSION).tar.gz \
+	https://github.com/xbmc/libdvdread/archive/$(KODI_LIBDVDREAD_VERSION).tar.gz
+
+KODI_CONF_OPTS += \
+	-DLIBDVDCSS_URL=$(BR2_DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \
+	-DLIBDVDNAV_URL=$(BR2_DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \
+	-DLIBDVDREAD_URL=$(BR2_DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz
 
 KODI_CONF_OPTS += \
-	--with-ffmpeg=shared \
-	--disable-joystick \
-	--disable-openmax \
-	--disable-pulse \
-	--disable-vtbdecoder \
-	--enable-optimizations
+	-DENABLE_CCACHE=OFF \
+	-DENABLE_DVDCSS=ON \
+	-DENABLE_INTERNAL_CROSSGUID=OFF \
+	-DENABLE_INTERNAL_FFMPEG=OFF \
+	-DKODI_DEPENDSBUILD=OFF \
+	-DENABLE_OPENSSL=ON \
+	-DNATIVEPREFIX=$(HOST_DIR)/usr \
+	-DDEPENDS_PATH=$(@D) \
+	-DWITH_TEXTUREPACKER=$(HOST_DIR)/usr/bin/TexturePacker
+
+ifeq ($(BR2_arm),y)
+KODI_CONF_OPTS += -DWITH_ARCH=arm -DWITH_CPU=arm
+else ifeq ($(BR2_mips),y)
+KODI_CONF_OPTS += -DWITH_ARCH=mips -DWITH_CPU=mips
+else ifeq ($(BR2_i386),y)
+KODI_CONF_OPTS += -DWITH_ARCH=i486-linux -DWITH_CPU=$(BR2_GCC_TARGET_ARCH)
+else ifeq ($(BR2_x86_64),y)
+KODI_CONF_OPTS += -DWITH_ARCH=x86_64-linux -DWITH_CPU=x86_64
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE),y)
+KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSE_OK=OFF -D_SSE_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
+KODI_CONF_OPTS += -D_SSE2_OK=ON -D_SSE2_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSE2_OK=OFF -D_SSE2_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
+KODI_CONF_OPTS += -D_SSE3_OK=ON -D_SSE3_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSE3_OK=OFF -D_SSE3_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
+KODI_CONF_OPTS += -D_SSSE3_OK=ON -D_SSSE3_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSSE3_OK=OFF -D_SSSE3_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE4),y)
+KODI_CONF_OPTS += -D_SSE41_OK=ON -D_SSE41_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSE41_OK=OFF -D_SSE41_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE42),y)
+KODI_CONF_OPTS += -D_SSE42_OK=ON -D_SSE42_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSE42_OK=OFF -D_SSE42_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_AVX),y)
+KODI_CONF_OPTS += -D_AVX_OK=ON -D_AVX_TRUE=ON
+else
+KODI_CONF_OPTS += -D_AVX_OK=OFF -D_AVX_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_AVX2),y)
+KODI_CONF_OPTS += -D_AVX2_OK=ON -D_AVX2_TRUE=ON
+else
+KODI_CONF_OPTS += -D_AVX2_OK=OFF -D_AVX2_TRUE=OFF
+endif
 
 ifeq ($(BR2_PACKAGE_KODI_MYSQL),y)
-KODI_CONF_OPTS += --enable-mysql
-KODI_CONF_ENV += ac_cv_path_MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config"
+KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=ON
 KODI_DEPENDENCIES += mysql
 else
-KODI_CONF_OPTS += --disable-mysql
+KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_NONFREE),y)
-KODI_CONF_OPTS += --enable-non-free
+KODI_CONF_OPTS += -DENABLE_NONFREE=ON
 KODI_LICENSE := $(KODI_LICENSE), unrar
 KODI_LICENSE_FILES += lib/UnrarXLib/license.txt
 else
-KODI_CONF_OPTS += --disable-non-free
+KODI_CONF_OPTS += -DENABLE_NONFREE=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi
 KODI_DEPENDENCIES += rpi-userland
-KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer
-KODI_INCLUDES += \
-	-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
-	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux
-KODI_LIBS = -lvcos -lvchostif
-endif
-
-ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-KODI_DEPENDENCIES += udev
-KODI_CONF_OPTS += --enable-udev
 else
-KODI_CONF_OPTS += --disable-udev
+# these options only exist on non-rbpi systems
+KODI_CONF_OPTS += -DENABLE_LDGOLD=OFF
+ifeq ($(BR2_PACKAGE_LIBAMCODEC),y)
+KODI_CONF_OPTS += -DENABLE_AML=ON
+KODI_DEPENDENCIES += libamcodec
+else
+KODI_CONF_OPTS += -DENABLE_AML=OFF
 endif
-
 ifeq ($(BR2_PACKAGE_IMX_VPUWRAP),y)
+KODI_CONF_OPTS += -DENABLE_IMX=ON
 KODI_DEPENDENCIES += imx-vpuwrap
-KODI_CONF_OPTS += --enable-codec=imxvpu
+else
+KODI_CONF_OPTS += -DENABLE_IMX=OFF
 endif
-
-ifeq ($(BR2_PACKAGE_LIBAMCODEC),y)
-KODI_DEPENDENCIES += libamcodec
-KODI_CONF_OPTS += --enable-codec=amcodec
-KODI_INCLUDES += -I$(STAGING_DIR)/usr/include/amcodec
 endif
 
-KODI_CONF_ENV += \
-	INCLUDES="$(KODI_INCLUDES)" \
-	LIBS="$(KODI_LIBS)"
+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+KODI_CONF_OPTS += -DENABLE_UDEV=ON
+KODI_DEPENDENCIES += udev
+else
+KODI_CONF_OPTS += -DENABLE_UDEV=OFF
+ifeq ($(BR2_PACKAGE_KODI_LIBUSB),y)
+KODI_CONF_OPTS += -DENABLE_LIBUSB=ON
+KODI_DEPENDENCIES += libusb-compat
+endif
+endif
 
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
-KODI_CONF_OPTS += --enable-libcap
+KODI_CONF_OPTS += -DENABLE_CAP=ON
 KODI_DEPENDENCIES += libcap
 else
-KODI_CONF_OPTS += --disable-libcap
+KODI_CONF_OPTS += -DENABLE_CAP=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_DBUS),y)
 KODI_DEPENDENCIES += dbus
-KODI_CONF_OPTS += --enable-dbus
+KODI_CONF_OPTS += -DENABLE_DBUS=ON
 else
-KODI_CONF_OPTS += --disable-dbus
+KODI_CONF_OPTS += -DENABLE_DBUS=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_ALSA_LIB),y)
+KODI_CONF_OPTS += -DENABLE_ALSA=ON
 KODI_DEPENDENCIES += alsa-lib
-KODI_CONF_OPTS += --enable-alsa
 else
-KODI_CONF_OPTS += --disable-alsa
+KODI_CONF_OPTS += -DENABLE_ALSA=OFF
 endif
 
-# quote from kodi/configure.in: "GLES overwrites GL if both set to yes."
-# we choose the opposite because opengl offers more features, like libva support
-# GL means X11, and under X11, Kodi needs libdrm; libdrm is forcefully selected
-# by a modular Xorg server, which Kodi already depends on.
-ifeq ($(BR2_PACKAGE_KODI_GL),y)
-KODI_DEPENDENCIES += libglew libglu libgl xlib_libX11 xlib_libXext \
-	xlib_libXmu xlib_libXrandr xlib_libXt libdrm
-KODI_CONF_OPTS += --enable-gl --enable-x11 --disable-gles
+ifeq ($(BR2_PACKAGE_KODI_GL_EGL),y)
+KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \
+	xlib_libXrandr libdrm
+KODI_CONF_OPTS += -DENABLE_OPENGL=ON -DENABLE_X11=ON -DENABLE_OPENGLES=OFF
 else
-KODI_CONF_OPTS += --disable-gl --disable-x11
+KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF
 ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y)
 KODI_DEPENDENCIES += libegl libgles
-KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
-KODI_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
-KODI_CONF_OPTS += --enable-gles
+KODI_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
+KODI_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
+KODI_CONF_OPTS += -DENABLE_OPENGLES=ON
 else
-KODI_CONF_OPTS += --disable-gles
-endif
+KODI_CONF_OPTS += -DENABLE_OPENGLES=OFF
 endif
-
-ifeq ($(BR2_PACKAGE_KODI_LIBUSB),y)
-KODI_DEPENDENCIES += libusb-compat
-KODI_CONF_OPTS += --enable-libusb
-else
-KODI_CONF_OPTS += --disable-libusb
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBMICROHTTPD),y)
+KODI_CONF_OPTS += -DENABLE_MICROHTTPD=ON
 KODI_DEPENDENCIES += libmicrohttpd
-KODI_CONF_OPTS += --enable-webserver
 else
-KODI_CONF_OPTS += --disable-webserver
+KODI_CONF_OPTS += -DENABLE_MICROHTTPD=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBSMBCLIENT),y)
 KODI_DEPENDENCIES += samba4
-KODI_CONF_OPTS += --enable-samba
+KODI_CONF_OPTS += -DENABLE_SMBCLIENT=ON
 else
-KODI_CONF_OPTS += --disable-samba
+KODI_CONF_OPTS += -DENABLE_SMBCLIENT=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBNFS),y)
 KODI_DEPENDENCIES += libnfs
-KODI_CONF_OPTS += --enable-nfs
+KODI_CONF_OPTS += -DENABLE_NFS=ON
 else
-KODI_CONF_OPTS += --disable-nfs
-endif
-
-ifeq ($(BR2_PACKAGE_KODI_RTMPDUMP),y)
-KODI_DEPENDENCIES += rtmpdump
-KODI_CONF_OPTS += --enable-rtmp
-else
-KODI_CONF_OPTS += --disable-rtmp
+KODI_CONF_OPTS += -DENABLE_NFS=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBBLURAY),y)
 KODI_DEPENDENCIES += libbluray
-KODI_CONF_OPTS += --enable-libbluray
+KODI_CONF_OPTS += -DENABLE_BLURAY=ON
 else
-KODI_CONF_OPTS += --disable-libbluray
+KODI_CONF_OPTS += -DENABLE_BLURAY=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBSHAIRPLAY),y)
 KODI_DEPENDENCIES += libshairplay
-KODI_CONF_OPTS += --enable-airplay
+KODI_CONF_OPTS += -DENABLE_AIRTUNES=ON
 else
-KODI_CONF_OPTS += --disable-airplay
+KODI_CONF_OPTS += -DENABLE_AIRTUNES=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBSSH),y)
 KODI_DEPENDENCIES += libssh
-KODI_CONF_OPTS += --enable-ssh
+KODI_CONF_OPTS += -DENABLE_SSH=ON
 else
-KODI_CONF_OPTS += --disable-ssh
+KODI_CONF_OPTS += -DENABLE_SSH=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_AVAHI),y)
 KODI_DEPENDENCIES += avahi
-KODI_CONF_OPTS += --enable-avahi
+KODI_CONF_OPTS += -DENABLE_AVAHI=ON
 else
-KODI_CONF_OPTS += --disable-avahi
+KODI_CONF_OPTS += -DENABLE_AVAHI=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBCEC),y)
 KODI_DEPENDENCIES += libcec
-KODI_CONF_OPTS += --enable-libcec
+KODI_CONF_OPTS += -DENABLE_CEC=ON
 else
-KODI_CONF_OPTS += --disable-libcec
+KODI_CONF_OPTS += -DENABLE_CEC=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIRC),y)
-KODI_CONF_OPTS += --enable-lirc
+KODI_CONF_OPTS += -DENABLE_LIRC=ON
 else
-KODI_CONF_OPTS += --disable-lirc
+KODI_CONF_OPTS += -DENABLE_LIRC=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBTHEORA),y)
@@ -248,51 +284,41 @@ endif
 # kodi needs libva & libva-glx
 ifeq ($(BR2_PACKAGE_KODI_LIBVA)$(BR2_PACKAGE_MESA3D_DRI_DRIVER),yy)
 KODI_DEPENDENCIES += mesa3d libva
-KODI_CONF_OPTS += --enable-vaapi
+KODI_CONF_OPTS += -DENABLE_VAAPI=ON
 else
-KODI_CONF_OPTS += --disable-vaapi
+KODI_CONF_OPTS += -DENABLE_VAAPI=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBVDPAU),y)
 KODI_DEPENDENCIES += libvdpau
-KODI_CONF_OPTS += --enable-vdpau
+KODI_CONF_OPTS += -DENABLE_VDPAU=ON
 else
-KODI_CONF_OPTS += --disable-vdpau
+KODI_CONF_OPTS += -DENABLE_VDPAU=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_UPNP),y)
-KODI_CONF_OPTS += --enable-upnp
+KODI_CONF_OPTS += -DENABLE_UPNP=ON
 else
-KODI_CONF_OPTS += --disable-upnp
+KODI_CONF_OPTS += -DENABLE_UPNP=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_OPTICALDRIVE),y)
-KODI_CONF_OPTS += --enable-optical-drive --enable-dvdcss
+KODI_CONF_OPTS += -DENABLE_OPTICAL=ON
 else
-KODI_CONF_OPTS += --disable-optical-drive --disable-dvdcss
+KODI_CONF_OPTS += -DENABLE_OPTICAL=OFF
 endif
 
-# Add HOST_DIR to PATH for codegenerator.mk to find swig
-define KODI_BOOTSTRAP
-	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/depends/native/JsonSchemaBuilder
-	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/depends/native/TexturePacker
-	cd $(@D) && PATH=$(BR_PATH) ./bootstrap
-endef
-KODI_PRE_CONFIGURE_HOOKS += KODI_BOOTSTRAP
-
+# Remove versioncheck addon, updating Kodi is done by building a new
+# buildroot image.
+KODI_ADDON_MANIFEST = $(TARGET_DIR)/usr/share/kodi/system/addon-manifest.xml
 define KODI_CLEAN_UNUSED_ADDONS
-	rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.milkdrop
-	rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.projectm
-	rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.itunes
+	rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/service.xbmc.versioncheck
+	$(HOST_DIR)/usr/bin/xml ed -L \
+		-d "/addons/addon[text()='service.xbmc.versioncheck']" \
+		$(KODI_ADDON_MANIFEST)
 endef
 KODI_POST_INSTALL_TARGET_HOOKS += KODI_CLEAN_UNUSED_ADDONS
 
-define KODI_CLEAN_CONFLUENCE_SKIN
-	find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.png -delete
-	find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.jpg -delete
-endef
-KODI_POST_INSTALL_TARGET_HOOKS += KODI_CLEAN_CONFLUENCE_SKIN
-
 define KODI_INSTALL_BR_WRAPPER
 	$(INSTALL) -D -m 0755 package/kodi/br-kodi \
 		$(TARGET_DIR)/usr/bin/br-kodi
@@ -327,4 +353,4 @@ define KODI_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/kodi.service
 endef
 
-$(eval $(autotools-package))
+$(eval $(cmake-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton Bernd Kuhls
@ 2017-04-29  9:56   ` Thomas Petazzoni
  2017-04-29 12:29     ` Bernd Kuhls
  0 siblings, 1 reply; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:56 UTC (permalink / raw)
  To: buildroot

Hello,

I've applied, after doing a number of minor tweaks. Also, there are a
few things that don't look completely good, and that I believe should be
addressed as follow-up patches.

On Sat, 29 Apr 2017 10:37:28 +0200, Bernd Kuhls wrote:

> +config BR2_PACKAGE_KODI_RTMPDUMP
> +	bool "kodi rtmp"

This prompt was quite useless, so I've changed it to "kodi rtmp support
removed".

> -comment "kodi needs an OpenGL or an openGL ES and EGL backend"
> -	depends on BR2_i386 || BR2_x86_64
> -	depends on !BR2_PACKAGE_KODI_GL && !BR2_PACKAGE_KODI_EGL_GLES
> +	depends on !BR2_PACKAGE_RPI_USERLAND # rpi depends on gles

I don't understand why you have this !BR2_PACKAGE_RPI_USERLAND
dependency here. Can you explain?

>  config BR2_PACKAGE_KODI_LIBVA
>  	bool "va"
> +	depends on !BR2_PACKAGE_KODI_EGL_GLES

What about using

	depends on BR2_PACKAGE_KODI_EGL_GL

here ?

> +	depends on BR2_PACKAGE_XORG7
>  	select BR2_PACKAGE_LIBVA
>  	help
>  	  Enable libva support.
>  
> +comment "libva support needs X.org with an openGL backend"
> +	depends on !BR2_PACKAGE_XORG7 || BR2_PACKAGE_KODI_EGL_GLES

And ... || !BR2_PACKAGE_KODI_EGL_GL here ?

>  config BR2_PACKAGE_KODI_LIBVDPAU
>  	bool "vdpau"
> +	depends on !BR2_PACKAGE_KODI_EGL_GLES

Same suggestion.

> +KODI_SUBDIR = project/cmake
> +
> +KODI_LIBDVDCSS_VERSION = 2f12236
> +KODI_LIBDVDNAV_VERSION = 981488f
> +KODI_LIBDVDREAD_VERSION = 17d99db
> +
> +KODI_EXTRA_DOWNLOADS = \
> +	https://github.com/xbmc/libdvdcss/archive/$(KODI_LIBDVDCSS_VERSION).tar.gz \
> +	https://github.com/xbmc/libdvdnav/archive/$(KODI_LIBDVDNAV_VERSION).tar.gz \
> +	https://github.com/xbmc/libdvdread/archive/$(KODI_LIBDVDREAD_VERSION).tar.gz

Can I say again how much I hate this stuff?

> +KODI_CONF_OPTS += \
> +	-DLIBDVDCSS_URL=$(BR2_DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \
> +	-DLIBDVDNAV_URL=$(BR2_DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \
> +	-DLIBDVDREAD_URL=$(BR2_DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz

I've moved these below, with the other unconditional CONF_OPTS.

> +ifeq ($(BR2_X86_CPU_HAS_SSE),y)
> +KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON

This looks a bit fishy. Why each option has a _OK option and a _TRUE
option? Is setting both really needed?

>  ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
> +KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi
>  KODI_DEPENDENCIES += rpi-userland
> -KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer
> -KODI_INCLUDES += \
> -	-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
> -	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux
> -KODI_LIBS = -lvcos -lvchostif
> -endif
> -
> -ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
> -KODI_DEPENDENCIES += udev
> -KODI_CONF_OPTS += --enable-udev
>  else
> -KODI_CONF_OPTS += --disable-udev
> +# these options only exist on non-rbpi systems

This looks very very weird. Why is LDGOLD related to RPi ?

> +KODI_CONF_OPTS += -DENABLE_LDGOLD=OFF
> +ifeq ($(BR2_PACKAGE_LIBAMCODEC),y)

Why should these options be under a "else" of the RPi stuff ?

> -ifeq ($(BR2_PACKAGE_KODI_GL),y)
> -KODI_DEPENDENCIES += libglew libglu libgl xlib_libX11 xlib_libXext \
> -	xlib_libXmu xlib_libXrandr xlib_libXt libdrm
> -KODI_CONF_OPTS += --enable-gl --enable-x11 --disable-gles
> +ifeq ($(BR2_PACKAGE_KODI_GL_EGL),y)
> +KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \
> +	xlib_libXrandr libdrm
> +KODI_CONF_OPTS += -DENABLE_OPENGL=ON -DENABLE_X11=ON -DENABLE_OPENGLES=OFF
>  else
> -KODI_CONF_OPTS += --disable-gl --disable-x11
> +KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF
>  ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y)

No reason for this being in the "else" of the ifeq
($(BR2_PACKAGE_KODI_GL_EGL), so I've re-organized this way:

ifeq ( ... opengl + egl ...)
 enable Opengl stuff
else
 disable Opengl stuff
endif

ifeq ( ... opengles + egl ...)
 enable OpenglES stuff
else
 disable OpenglES stuff
endif

> +KODI_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
> +KODI_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
> +KODI_CONF_OPTS += -DENABLE_OPENGLES=ON

Reorganized as one assignment to KODI_CONF_OPTS, i.e:

KODI_CONF_OPTS += \
	... \
	... \
	...

> +	$(HOST_DIR)/usr/bin/xml ed -L \
> +		-d "/addons/addon[text()='service.xbmc.versioncheck']" \
> +		$(KODI_ADDON_MANIFEST)

So this thing is the only reason why we need xmlstarlet built for the
host system?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton
  2017-04-29  9:56   ` Thomas Petazzoni
@ 2017-04-29 12:29     ` Bernd Kuhls
  0 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29 12:29 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

thanks for the commit!

Am Sat, 29 Apr 2017 11:56:08 +0200 schrieb Thomas Petazzoni:

> Hello,
> 
> I've applied, after doing a number of minor tweaks. Also, there are a
> few things that don't look completely good, and that I believe should be
> addressed as follow-up patches.
> 
> On Sat, 29 Apr 2017 10:37:28 +0200, Bernd Kuhls wrote:
> 
>> +config BR2_PACKAGE_KODI_RTMPDUMP
>> +	bool "kodi rtmp"
> 
> This prompt was quite useless, so I've changed it to "kodi rtmp support
> removed".

Ok.

>> -comment "kodi needs an OpenGL or an openGL ES and EGL backend"
>> -	depends on BR2_i386 || BR2_x86_64
>> -	depends on !BR2_PACKAGE_KODI_GL && !BR2_PACKAGE_KODI_EGL_GLES
>> +	depends on !BR2_PACKAGE_RPI_USERLAND # rpi depends on gles
> 
> I don't understand why you have this !BR2_PACKAGE_RPI_USERLAND
> dependency here. Can you explain?

We need to rule out that a rbpi build is done with opengl/egl, otherwise 
the build will fail like this:
http://forum.kodi.tv/showthread.php?tid=305752&pid=2569701#pid2569701

>>  config BR2_PACKAGE_KODI_LIBVA
>>  	bool "va"
>> +	depends on !BR2_PACKAGE_KODI_EGL_GLES
> 
> What about using
> 
> 	depends on BR2_PACKAGE_KODI_EGL_GL
> 
> here ?
> 
>> +	depends on BR2_PACKAGE_XORG7
>>  	select BR2_PACKAGE_LIBVA
>>  	help
>>  	  Enable libva support.
>>  
>> +comment "libva support needs X.org with an openGL backend"
>> +	depends on !BR2_PACKAGE_XORG7 || BR2_PACKAGE_KODI_EGL_GLES
> 
> And ... || !BR2_PACKAGE_KODI_EGL_GL here ?
> 
>>  config BR2_PACKAGE_KODI_LIBVDPAU
>>  	bool "vdpau"
>> +	depends on !BR2_PACKAGE_KODI_EGL_GLES
> 
> Same suggestion.

Ok, sent patch: http://patchwork.ozlabs.org/patch/756733/

>> +KODI_SUBDIR = project/cmake
>> +
>> +KODI_LIBDVDCSS_VERSION = 2f12236
>> +KODI_LIBDVDNAV_VERSION = 981488f
>> +KODI_LIBDVDREAD_VERSION = 17d99db
>> +
>> +KODI_EXTRA_DOWNLOADS = \
>> +	https://github.com/xbmc/libdvdcss/archive/
$(KODI_LIBDVDCSS_VERSION).tar.gz \
>> +	https://github.com/xbmc/libdvdnav/archive/
$(KODI_LIBDVDNAV_VERSION).tar.gz \
>> +	https://github.com/xbmc/libdvdread/archive/
$(KODI_LIBDVDREAD_VERSION).tar.gz
> 
> Can I say again how much I hate this stuff?
> 
>> +KODI_CONF_OPTS += \
>> +	-DLIBDVDCSS_URL=$(BR2_DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \
>> +	-DLIBDVDNAV_URL=$(BR2_DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \
>> +	-DLIBDVDREAD_URL=$(BR2_DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz
> 
> I've moved these below, with the other unconditional CONF_OPTS.

Ok.

> 
>> +ifeq ($(BR2_X86_CPU_HAS_SSE),y)
>> +KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON
> 
> This looks a bit fishy. Why each option has a _OK option and a _TRUE
> option? Is setting both really needed?

Yes, otherwise host CPU features sneak into the build parameters,
upstream does something similar:
https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/modules/
FindSSE.cmake#L81

>>  ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
>> +KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi
>>  KODI_DEPENDENCIES += rpi-userland
>> -KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-
player=omxplayer
>> -KODI_INCLUDES += \
>> -	-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
>> -	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux
>> -KODI_LIBS = -lvcos -lvchostif
>> -endif
>> -
>> -ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
>> -KODI_DEPENDENCIES += udev
>> -KODI_CONF_OPTS += --enable-udev
>>  else
>> -KODI_CONF_OPTS += --disable-udev
>> +# these options only exist on non-rbpi systems
> 
> This looks very very weird. Why is LDGOLD related to RPi ?

RPi and Linux are considered different platforms, both have their own 
ArchSetup.cmake:

https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/linux/
ArchSetup.cmake
https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/
ArchSetup.cmake

LDGOLD is only used for the linux platform:
https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/linux/
ArchSetup.cmake#L34

If you think that treating Linux and RPi as separate platforms is weird 
then you are not alone, but it may change in Kodi 18:
https://github.com/xbmc/xbmc/pull/12021 ;)

>> +KODI_CONF_OPTS += -DENABLE_LDGOLD=OFF
>> +ifeq ($(BR2_PACKAGE_LIBAMCODEC),y)
> 
> Why should these options be under a "else" of the RPi stuff ?

Because all these options do not exist in https://github.com/xbmc/xbmc/
blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake

>> -ifeq ($(BR2_PACKAGE_KODI_GL),y)
>> -KODI_DEPENDENCIES += libglew libglu libgl xlib_libX11 xlib_libXext \
>> -	xlib_libXmu xlib_libXrandr xlib_libXt libdrm
>> -KODI_CONF_OPTS += --enable-gl --enable-x11 --disable-gles
>> +ifeq ($(BR2_PACKAGE_KODI_GL_EGL),y)
>> +KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \
>> +	xlib_libXrandr libdrm
>> +KODI_CONF_OPTS += -DENABLE_OPENGL=ON -DENABLE_X11=ON -
DENABLE_OPENGLES=OFF
>>  else
>> -KODI_CONF_OPTS += --disable-gl --disable-x11
>> +KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF
>>  ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y)
> 
> No reason for this being in the "else" of the ifeq
> ($(BR2_PACKAGE_KODI_GL_EGL), so I've re-organized this way:
> 
> ifeq ( ... opengl + egl ...)
>  enable Opengl stuff
> else
>  disable Opengl stuff
> endif
> 
> ifeq ( ... opengles + egl ...)
>  enable OpenglES stuff
> else
>  disable OpenglES stuff
> endif

Ok.

>> +KODI_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) `
$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
>> +KODI_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) `
$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
>> +KODI_CONF_OPTS += -DENABLE_OPENGLES=ON
> 
> Reorganized as one assignment to KODI_CONF_OPTS, i.e:
> 
> KODI_CONF_OPTS += \
> 	... \
> 	... \
> 	...

Ok.

>> +	$(HOST_DIR)/usr/bin/xml ed -L \
>> +		-d "/addons/addon[text()='service.xbmc.versioncheck']" \
>> +		$(KODI_ADDON_MANIFEST)
> 
> So this thing is the only reason why we need xmlstarlet built for the
> host system?

No, I plan to add more patches to control the skin addon(s) being used, 
also the default skin addon can then be changed using xmlstarlet:
http://lists.busybox.net/pipermail/buildroot/2017-April/189753.html

I removed these patches from v6+ because Yann had problems with them:
http://lists.busybox.net/pipermail/buildroot/2017-April/190190.html
and, as feature patches, they should not block the version bump.

Regards, Bernd

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 09/31] package/kodi-pvr-*: mass version bump
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (7 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:57   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 10/31] package/kodi-pvr-mythtv: bump version to 4.15.0 Bernd Kuhls
                   ` (24 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-pvr-argustv/kodi-pvr-argustv.hash                        | 2 +-
 package/kodi-pvr-argustv/kodi-pvr-argustv.mk                          | 4 ++--
 package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash                        | 2 +-
 package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk                          | 4 ++--
 package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash                    | 2 +-
 package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk                      | 4 ++--
 package/kodi-pvr-filmon/kodi-pvr-filmon.hash                          | 2 +-
 package/kodi-pvr-filmon/kodi-pvr-filmon.mk                            | 4 ++--
 package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash                    | 2 +-
 package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk                      | 4 ++--
 package/kodi-pvr-hts/kodi-pvr-hts.hash                                | 2 +-
 package/kodi-pvr-hts/kodi-pvr-hts.mk                                  | 4 ++--
 package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash                  | 2 +-
 package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk                    | 4 ++--
 .../kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash  | 2 +-
 .../kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk    | 4 ++--
 package/kodi-pvr-njoy/kodi-pvr-njoy.hash                              | 2 +-
 package/kodi-pvr-njoy/kodi-pvr-njoy.mk                                | 4 ++--
 package/kodi-pvr-pctv/kodi-pvr-pctv.hash                              | 2 +-
 package/kodi-pvr-pctv/kodi-pvr-pctv.mk                                | 4 ++--
 package/kodi-pvr-stalker/kodi-pvr-stalker.hash                        | 2 +-
 package/kodi-pvr-stalker/kodi-pvr-stalker.mk                          | 4 ++--
 package/kodi-pvr-vbox/kodi-pvr-vbox.hash                              | 2 +-
 package/kodi-pvr-vbox/kodi-pvr-vbox.mk                                | 4 ++--
 package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash                      | 2 +-
 package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk                        | 4 ++--
 package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash                          | 2 +-
 package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk                            | 4 ++--
 package/kodi-pvr-wmc/kodi-pvr-wmc.hash                                | 2 +-
 package/kodi-pvr-wmc/kodi-pvr-wmc.mk                                  | 4 ++--
 30 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
index ef6438797e..d5db668a64 100644
--- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
+++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 68fab94cabbeb0fbf6fac0fcb66e8362505ee736ae3b72c4e29867cfc44b595b kodi-pvr-argustv-2aca01c6db28fe3145b57eb5bf5841895c618507.tar.gz
+sha256 4fa8280c023805e2104b9331632daa2c6493d6b11ec0611110b1e12eadb70794  kodi-pvr-argustv-2.5.4-Krypton.tar.gz
diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
index 2250511955..06bdba98d3 100644
--- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
+++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_ARGUSTV_VERSION = 2aca01c6db28fe3145b57eb5bf5841895c618507
+KODI_PVR_ARGUSTV_VERSION = 2.5.4-Krypton
 KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION))
 KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+
 KODI_PVR_ARGUSTV_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
index 713aae0ec6..1d377b32d6 100644
--- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
+++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 1c359c1a59c50f98910ec1d4bc332cd9360447e05d63f0d90b07a7ba22bc7ab6 kodi-pvr-dvblink-06c4e5603e4db0bda3f35e80344a308f486ae0f9.tar.gz
+sha256 d31c00a8b3b09fa0f552de732fee4ff46e90673e03551bed67b3e3a1e2815281  kodi-pvr-dvblink-3.4.3-Krypton.tar.gz
diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
index 59c89264d4..7d9826783a 100644
--- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
+++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_DVBLINK_VERSION = 06c4e5603e4db0bda3f35e80344a308f486ae0f9
+KODI_PVR_DVBLINK_VERSION = 3.4.3-Krypton
 KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION))
 KODI_PVR_DVBLINK_LICENSE = GPL-2.0+
 KODI_PVR_DVBLINK_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
index 785fd6c2a7..8ec0e60675 100644
--- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
+++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 a6a6d63e4b88df0d8b5166efdc09f6410cae736e610b328aaea49c8688bfce82 kodi-pvr-dvbviewer-26286604635a170eeea68df9b7eb52fea0056cfe.tar.gz
+sha256 91479e7c0201563f83c5cf75b520b2ef4405dc80fb7c3f4c81fa72be6a64169d  kodi-pvr-dvbviewer-2.4.7.tar.gz
diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
index 66a7496e31..020398736b 100644
--- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
+++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_DVBVIEWER_VERSION = 26286604635a170eeea68df9b7eb52fea0056cfe
+KODI_PVR_DVBVIEWER_VERSION = 2.4.7
 KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION))
 KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+
 KODI_PVR_DVBVIEWER_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
index b60df98235..1d4c73f033 100644
--- a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
+++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 4a51ba62239c96c16c569ca47bc7aac4a2e9e9ef4ae09dfc23d10be15afdee34 kodi-pvr-filmon-4b34b41999b86e675f794ec8e5a63c85b78c001e.tar.gz
+sha256 87ad3adc22ec64be15b9408c51388bb7d12b0089dd466aae73ae082d0576320c  kodi-pvr-filmon-1.4.7-Krypton.tar.gz
diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
index fcf8a2810e..af0fe64cdc 100644
--- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
+++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_FILMON_VERSION = 4b34b41999b86e675f794ec8e5a63c85b78c001e
+KODI_PVR_FILMON_VERSION = 1.4.7-Krypton
 KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION))
 KODI_PVR_FILMON_LICENSE = GPL-2.0+
 KODI_PVR_FILMON_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
index fcf0468885..b9ef293d0f 100644
--- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
+++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 84c7dd60db6e0d0c40cc83a70ad860127d0e5c8e77c6091014055372cad5fe1f kodi-pvr-hdhomerun-aa4324eaa5f738394f21d3f54667e346eb65038e.tar.gz
+sha256 df6be23cb370bce2a6b2a8944358d27e11a8edc665deb976cbd4d2e7e1eba1c0  kodi-pvr-hdhomerun-2.4.6-Krypton.tar.gz
diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
index 821ab365a6..aaecc7f320 100644
--- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
+++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_HDHOMERUN_VERSION = aa4324eaa5f738394f21d3f54667e346eb65038e
+KODI_PVR_HDHOMERUN_VERSION = 2.4.6-Krypton
 KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION))
 KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+
 KODI_PVR_HDHOMERUN_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash
index 369e6c0232..13f250acfc 100644
--- a/package/kodi-pvr-hts/kodi-pvr-hts.hash
+++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 004dee4455d5d539b5e42d663659d4886d9a8650847ad614fa2179bbaace3783 kodi-pvr-hts-3c673b5b29fc26c203c79f7df58680af50a1afa7.tar.gz
+sha256 c66d8a6b2499d31947aa532629ccabf82cec94bff866ef30f64ec0a752b77407  kodi-pvr-hts-3.4.17.tar.gz
diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk
index 5a6a36cc29..90f05fb091 100644
--- a/package/kodi-pvr-hts/kodi-pvr-hts.mk
+++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_HTS_VERSION = 3c673b5b29fc26c203c79f7df58680af50a1afa7
+KODI_PVR_HTS_VERSION = 3.4.17
 KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION))
 KODI_PVR_HTS_LICENSE = GPL-2.0+
 KODI_PVR_HTS_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
index cdf94fdb9f..47eae669ba 100644
--- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
+++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 5b5c67f70f47c52ccda673c3a98b5a81827835fb74289754bebf840133a84d56 kodi-pvr-iptvsimple-ae9bc1d94e97c5381b2fa59adac70a57146016cd.tar.gz
+sha256 58be5ff8a2f97bb4a49e473be9385ff188582b5ed2cbf8ffc5d55ba0c1fc0ffb  kodi-pvr-iptvsimple-8f725faf6b31151f91f52e8ce336ff57a905046d.tar.gz
diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
index fd1e0531d2..99045a1521 100644
--- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
+++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_IPTVSIMPLE_VERSION = ae9bc1d94e97c5381b2fa59adac70a57146016cd
+KODI_PVR_IPTVSIMPLE_VERSION = 8f725faf6b31151f91f52e8ce336ff57a905046d
 KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION))
 KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+
 KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
index 74770fd3d9..02d59df892 100644
--- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
+++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 45590c1b8dc57f2b5921641c864e68671c32db33f55db82ca62411557e9278b9 kodi-pvr-mediaportal-tvserver-a3dd464379a56131bae61b94275c14a3abcf2869.tar.gz
+sha256 59264354c79eaf1658755cb5bc05efc8bca581ed8fb762e82665ec128453e648  kodi-pvr-mediaportal-tvserver-2.4.16-Krypton.tar.gz
diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
index 36b52274b2..02ef48cd02 100644
--- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
+++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = a3dd464379a56131bae61b94275c14a3abcf2869
+KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 2.4.16-Krypton
 KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION))
 KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+
 KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
index c6006d2a33..29fc6e6a87 100644
--- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
+++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 aa5e8b471993326be3622056a26ebf7387ac4758348e8f64632c1fc6979d993e kodi-pvr-njoy-480c1591d486c6166746fb8b5efc68a7aca3d0f0.tar.gz
+sha256 4315b5f87986c17e668d0d89093059b96315b8a7908fc060e2660e5bf8216057  kodi-pvr-njoy-2.4.2-Krypton.tar.gz
diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
index 9e4a7831b1..0106585bbf 100644
--- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
+++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_NJOY_VERSION = 480c1591d486c6166746fb8b5efc68a7aca3d0f0
+KODI_PVR_NJOY_VERSION = 2.4.2-Krypton
 KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION))
 KODI_PVR_NJOY_LICENSE = GPL-2.0+
 KODI_PVR_NJOY_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
index 0ff481a3e5..62d9965cb9 100644
--- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
+++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 4c045722c326dfe152ffadb8d966e8db4caa6128a7c53b2a852fce85f803bcbc kodi-pvr-pctv-0096770e96f84c46f444e159b9b737ac8b4238dc.tar.gz
+sha256 0e5a0fcbdbda0200ebde50552bd68eddd8644010bd39d1cf0038ba28182ca8bb  kodi-pvr-pctv-1.4.5-Krypton.tar.gz
diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
index fabfee9bb0..881dbe08ce 100644
--- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
+++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_PCTV_VERSION = 0096770e96f84c46f444e159b9b737ac8b4238dc
+KODI_PVR_PCTV_VERSION = 1.4.5-Krypton
 KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION))
 KODI_PVR_PCTV_LICENSE = GPL-2.0+
 KODI_PVR_PCTV_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
index 7af1bcb28a..914ef48b85 100644
--- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
+++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 e16cb12bd7a78b8849f370bedb8093d3cb1deb3a766a66efe4b838fc569ab50c kodi-pvr-stalker-5e588330c453141ae0a2f4fd9c02d909ac9d199e.tar.gz
+sha256 3bdd6debd8e8085e54d665f4b870bc77a18800c08d517d837d2ac703b0984622  kodi-pvr-stalker-2.8.3-Krypton.tar.gz
diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
index ba39152906..eeadc03bd3 100644
--- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
+++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_STALKER_VERSION = 5e588330c453141ae0a2f4fd9c02d909ac9d199e
+KODI_PVR_STALKER_VERSION = 2.8.3-Krypton
 KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION))
 KODI_PVR_STALKER_LICENSE = GPL-2.0+
 KODI_PVR_STALKER_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
index 705c0cb3e1..a3d3c21dc4 100644
--- a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
+++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 8eb43fb6e2a3132324bf24787bc0545c610832648aa17c12e93676502f7fc565 kodi-pvr-vbox-15e864d160da5a051e18aef06f3a53e49808be02.tar.gz
+sha256 b04f1e3fc50d1cf230a2950349d69abdc15ccc36d08c2a7aba471cdd9f56b114  kodi-pvr-vbox-3.6.7.tar.gz
diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
index 8da35a4642..40d6dc1f18 100644
--- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
+++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_VBOX_VERSION = 15e864d160da5a051e18aef06f3a53e49808be02
+KODI_PVR_VBOX_VERSION = 3.6.7
 KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION))
 KODI_PVR_VBOX_LICENSE = GPL-2.0+
 KODI_PVR_VBOX_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
index ecce639d71..a21b9c61cb 100644
--- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
+++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 1d9e70030b73f44786d54e42e46c6bfa7810af3e4c71ba0dca95c2aa1751ef9b kodi-pvr-vdr-vnsi-7e11b853637ec436e30e4ac826de6ee87c303482.tar.gz
+sha256 25753e89b86f4a91e389adecb285b7c835c139b12c41437f6b89291c092763b6  kodi-pvr-vdr-vnsi-2a90c2f9a1f3e5889336a8df5426ff99b0318b0f.tar.gz
diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
index 36bba66358..87ca850fbb 100644
--- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
+++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_VDR_VNSI_VERSION = 7e11b853637ec436e30e4ac826de6ee87c303482
+KODI_PVR_VDR_VNSI_VERSION = 2a90c2f9a1f3e5889336a8df5426ff99b0318b0f
 KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION))
 KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+
 KODI_PVR_VDR_VNSI_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
index efdb12539d..e14a2cfbb2 100644
--- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
+++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 9684775c296dfd9b925d73ed1c21bee45afba4785d1bfb226f98b09ed235a8ee kodi-pvr-vuplus-815ea2f303dbe7dd19f87c53965dfdf2358fcdc8.tar.gz
+sha256 d3bccae1740ef24d43d30008e4c767169f1cb3d18b0dc8042679226c024267c9  kodi-pvr-vuplus-2.4.6-Krypton.tar.gz
diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
index 7ac2a13860..f5c15b0499 100644
--- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
+++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_VUPLUS_VERSION = 815ea2f303dbe7dd19f87c53965dfdf2358fcdc8
+KODI_PVR_VUPLUS_VERSION = 2.4.6-Krypton
 KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION))
 KODI_PVR_VUPLUS_LICENSE = GPL-2.0+
 KODI_PVR_VUPLUS_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
index 6cbdede3fa..0aa996dbf2 100644
--- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
+++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 25963d8acbce397b6ec940d5ee1d7a69481d295ae31876daf57d3d3537b14543 kodi-pvr-wmc-949fcd162206b569af15942180e6c133ad61e336.tar.gz
+sha256 b88e7a185f2f88ce8fa683a263702e2621efef14abd343414fedf900d163baa5  kodi-pvr-wmc-1.4.7-Krypton.tar.gz
diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
index 031df6a6a7..1339adb413 100644
--- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
+++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_WMC_VERSION = 949fcd162206b569af15942180e6c133ad61e336
+KODI_PVR_WMC_VERSION = 1.4.7-Krypton
 KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION))
 KODI_PVR_WMC_LICENSE = GPL-2.0+
 KODI_PVR_WMC_LICENSE_FILES = src/client.h
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 09/31] package/kodi-pvr-*: mass version bump
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 09/31] package/kodi-pvr-*: mass version bump Bernd Kuhls
@ 2017-04-29  9:57   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:57 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:29 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/kodi-pvr-argustv/kodi-pvr-argustv.hash                        | 2 +-
>  package/kodi-pvr-argustv/kodi-pvr-argustv.mk                          | 4 ++--
>  package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash                        | 2 +-
>  package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk                          | 4 ++--
>  package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash                    | 2 +-
>  package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk                      | 4 ++--
>  package/kodi-pvr-filmon/kodi-pvr-filmon.hash                          | 2 +-
>  package/kodi-pvr-filmon/kodi-pvr-filmon.mk                            | 4 ++--
>  package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash                    | 2 +-
>  package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk                      | 4 ++--
>  package/kodi-pvr-hts/kodi-pvr-hts.hash                                | 2 +-
>  package/kodi-pvr-hts/kodi-pvr-hts.mk                                  | 4 ++--
>  package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash                  | 2 +-
>  package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk                    | 4 ++--
>  .../kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash  | 2 +-
>  .../kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk    | 4 ++--
>  package/kodi-pvr-njoy/kodi-pvr-njoy.hash                              | 2 +-
>  package/kodi-pvr-njoy/kodi-pvr-njoy.mk                                | 4 ++--
>  package/kodi-pvr-pctv/kodi-pvr-pctv.hash                              | 2 +-
>  package/kodi-pvr-pctv/kodi-pvr-pctv.mk                                | 4 ++--
>  package/kodi-pvr-stalker/kodi-pvr-stalker.hash                        | 2 +-
>  package/kodi-pvr-stalker/kodi-pvr-stalker.mk                          | 4 ++--
>  package/kodi-pvr-vbox/kodi-pvr-vbox.hash                              | 2 +-
>  package/kodi-pvr-vbox/kodi-pvr-vbox.mk                                | 4 ++--
>  package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash                      | 2 +-
>  package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk                        | 4 ++--
>  package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash                          | 2 +-
>  package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk                            | 4 ++--
>  package/kodi-pvr-wmc/kodi-pvr-wmc.hash                                | 2 +-
>  package/kodi-pvr-wmc/kodi-pvr-wmc.mk                                  | 4 ++--
>  30 files changed, 45 insertions(+), 45 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 10/31] package/kodi-pvr-mythtv: bump version to 4.15.0
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (8 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 09/31] package/kodi-pvr-*: mass version bump Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:57   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 11/31] package/kodi-pvr-nextpvr: bump version to 2.4.11 Bernd Kuhls
                   ` (23 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Upstream repo was changed:
https://github.com/xbmc/repo-binary-addons/commit/cf93c8be639a3122db3ecb11c0b42d76e2e1da98

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +-
 package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
index 0e9eba87e2..57725a0ed7 100644
--- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
+++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 f6d61b134a96a25820b616e60e43ac1ed33bd3f8b9f7612a6f6324356b78582d kodi-pvr-mythtv-84b0b6b122ca779588de5c895ef77b6bc454e859.tar.gz
+sha256 30b6a20f846f0f0cc14c2347efbf3b72162c876daed53a3731d3f975d370765e  kodi-pvr-mythtv-4.15.0.tar.gz
diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
index 2c5d07a64b..515050b176 100644
--- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
+++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_MYTHTV_VERSION = 84b0b6b122ca779588de5c895ef77b6bc454e859
-KODI_PVR_MYTHTV_SITE = $(call github,kodi-pvr,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION))
+KODI_PVR_MYTHTV_VERSION = 4.15.0
+KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION))
 KODI_PVR_MYTHTV_LICENSE = GPL-2.0+
 KODI_PVR_MYTHTV_LICENSE_FILES = src/client.h
 KODI_PVR_MYTHTV_DEPENDENCIES = kodi-platform
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 10/31] package/kodi-pvr-mythtv: bump version to 4.15.0
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 10/31] package/kodi-pvr-mythtv: bump version to 4.15.0 Bernd Kuhls
@ 2017-04-29  9:57   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:57 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:30 +0200, Bernd Kuhls wrote:
> Upstream repo was changed:
> https://github.com/xbmc/repo-binary-addons/commit/cf93c8be639a3122db3ecb11c0b42d76e2e1da98
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +-
>  package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk   | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 11/31] package/kodi-pvr-nextpvr: bump version to 2.4.11
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (9 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 10/31] package/kodi-pvr-mythtv: bump version to 4.15.0 Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:57   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 12/31] package/kodi-adsp-basic: bump version Bernd Kuhls
                   ` (22 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Removed patch applied upstream:
https://github.com/kodi-pvr/pvr.nextpvr/commit/9e042807f1ce18df6937312cb0abded24d09bfb7

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...epresentation-of-char_class_e-in-struct-t.patch | 48 ----------------------
 package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash     |  2 +-
 package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk       |  4 +-
 3 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 package/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch

diff --git a/package/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch b/package/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch
deleted file mode 100644
index 18e59951c6..0000000000
--- a/package/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2698ac4eeca3a82967ff83386460c070ce387ead Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sun, 28 Feb 2016 01:07:52 +0100
-Subject: [PATCH] Sync enum representation of char_class_e in struct traits
- with definition
-
-Copied from
-https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/28
-https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/35
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Patch sent upstream: https://github.com/kodi-pvr/pvr.nextpvr/pull/42]
----
- src/uri.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/uri.h b/src/uri.h
-index 2757cf0..3dbca88 100644
---- a/src/uri.h
-+++ b/src/uri.h
-@@ -21,13 +21,13 @@
- namespace uri
- {
-   /// Char class.
--  enum char_class_e
-+  typedef enum char_class_e : signed char
-   {
-     CINV = -2, ///< invalid
-     CEND = -1, ///< end delimitor
-     CVAL = 0,  ///< valid any position
-     CVA2 = 1,  ///< valid anywhere but 1st position
--  };
-+  } char_class_e_type;
- 
-   /// Traits used for parsing and encoding components.
-   struct traits
-@@ -35,7 +35,7 @@ namespace uri
-     const char* begin_cstring; ///< begin cstring (or 0 if none)
-     const char begin_char;     ///< begin char (or 0 if none)
-     const char end_char;       ///< end char (or 0 if none)
--    char char_class[256];      ///< map of char to class
-+    const char_class_e_type char_class[256];      ///< map of char to class
-   };
- 
-   /**
--- 
-2.7.0
-
diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
index 64c09cfe65..4deb220817 100644
--- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
+++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 8c4a36c21dc65cc358b34e5c2db849997f0add2501c3f787f99df3ae0ea850c5 kodi-pvr-nextpvr-2055105c93e18e04e73c87578bece3edf7525e14.tar.gz
+sha256 5b0839141c9bdd1150442ef06974755bccb381b2998ddffa584eb234a83b7af5  kodi-pvr-nextpvr-2.4.11-Krypton.tar.gz
diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
index a4df90e109..8f06f320cd 100644
--- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
+++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_NEXTPVR_VERSION = 2055105c93e18e04e73c87578bece3edf7525e14
+KODI_PVR_NEXTPVR_VERSION = 2.4.11-Krypton
 KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION))
 KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+
 KODI_PVR_NEXTPVR_LICENSE_FILES = src/client.h
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 11/31] package/kodi-pvr-nextpvr: bump version to 2.4.11
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 11/31] package/kodi-pvr-nextpvr: bump version to 2.4.11 Bernd Kuhls
@ 2017-04-29  9:57   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:57 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:31 +0200, Bernd Kuhls wrote:
> Removed patch applied upstream:
> https://github.com/kodi-pvr/pvr.nextpvr/commit/9e042807f1ce18df6937312cb0abded24d09bfb7
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  ...epresentation-of-char_class_e-in-struct-t.patch | 48 ----------------------
>  package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash     |  2 +-
>  package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk       |  4 +-
>  3 files changed, 3 insertions(+), 51 deletions(-)
>  delete mode 100644 package/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 12/31] package/kodi-adsp-basic: bump version
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (10 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 11/31] package/kodi-pvr-nextpvr: bump version to 2.4.11 Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:58   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 13/31] package/kodi-adsp-freesurround: " Bernd Kuhls
                   ` (21 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-adsp-basic/kodi-adsp-basic.hash | 2 +-
 package/kodi-adsp-basic/kodi-adsp-basic.mk   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/kodi-adsp-basic/kodi-adsp-basic.hash b/package/kodi-adsp-basic/kodi-adsp-basic.hash
index e668ff2aa4..10dd773c1e 100644
--- a/package/kodi-adsp-basic/kodi-adsp-basic.hash
+++ b/package/kodi-adsp-basic/kodi-adsp-basic.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 0ae320af73085c322671d4b361248ff4341a6a04bd81c8b699847d5b04da828f kodi-adsp-basic-cb56e0eb6530fd50a286d47ef0be529001e9d556.tar.gz
+sha256 d6ef031157ceb825a6e6ba114fb20c622ef7f396ddd17ae8bf1954aab25bc2af  kodi-adsp-basic-2ae604e591346741324663260696cfa231931870.tar.gz
diff --git a/package/kodi-adsp-basic/kodi-adsp-basic.mk b/package/kodi-adsp-basic/kodi-adsp-basic.mk
index f51594e124..bb114a41ea 100644
--- a/package/kodi-adsp-basic/kodi-adsp-basic.mk
+++ b/package/kodi-adsp-basic/kodi-adsp-basic.mk
@@ -4,7 +4,9 @@
 #
 ################################################################################
 
-KODI_ADSP_BASIC_VERSION = cb56e0eb6530fd50a286d47ef0be529001e9d556
+# This cset is on the branch 'Krypton'
+# When Kodi is updated, then this should be updated to the corresponding branch
+KODI_ADSP_BASIC_VERSION = 2ae604e591346741324663260696cfa231931870
 KODI_ADSP_BASIC_SITE = $(call github,kodi-adsp,adsp.basic,$(KODI_ADSP_BASIC_VERSION))
 KODI_ADSP_BASIC_LICENSE = GPL-3.0+
 KODI_ADSP_BASIC_LICENSE_FILES = LICENSE.md
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 12/31] package/kodi-adsp-basic: bump version
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 12/31] package/kodi-adsp-basic: bump version Bernd Kuhls
@ 2017-04-29  9:58   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:58 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:32 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/kodi-adsp-basic/kodi-adsp-basic.hash | 2 +-
>  package/kodi-adsp-basic/kodi-adsp-basic.mk   | 4 +++-
>  2 files changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 13/31] package/kodi-adsp-freesurround: bump version
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (11 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 12/31] package/kodi-adsp-basic: bump version Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  9:58   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 14/31] package/kodi-audioencoder-*: mass version bump Bernd Kuhls
                   ` (20 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash | 2 +-
 package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash b/package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash
index f23717f79b..2649bbdcbf 100644
--- a/package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash
+++ b/package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 652c32d0c4b61343cbed13b6edd1ab4ad35280240a0ddb386f04adaa46986e7f kodi-adsp-freesurround-08b691d3d9a0382d2f6f789a31614fb02512036c.tar.gz
+sha256 cf6985be6839530027861b54e2146693d05e802363281ef6f8c1f352dbf94b5c  kodi-adsp-freesurround-34f50406bcba22e364711562e5b9205e57ae844b.tar.gz
diff --git a/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk b/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk
index c387d891c4..927af74da7 100644
--- a/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk
+++ b/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk
@@ -4,7 +4,9 @@
 #
 ################################################################################
 
-KODI_ADSP_FREESURROUND_VERSION = 08b691d3d9a0382d2f6f789a31614fb02512036c
+# This cset is on the branch 'Krypton'
+# When Kodi is updated, then this should be updated to the corresponding branch
+KODI_ADSP_FREESURROUND_VERSION = 34f50406bcba22e364711562e5b9205e57ae844b
 KODI_ADSP_FREESURROUND_SITE = $(call github,kodi-adsp,adsp.freesurround,$(KODI_ADSP_FREESURROUND_VERSION))
 KODI_ADSP_FREESURROUND_LICENSE = GPL-3.0+
 KODI_ADSP_FREESURROUND_LICENSE_FILES = LICENSE.md
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 13/31] package/kodi-adsp-freesurround: bump version
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 13/31] package/kodi-adsp-freesurround: " Bernd Kuhls
@ 2017-04-29  9:58   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29  9:58 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:33 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash | 2 +-
>  package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk   | 4 +++-
>  2 files changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 14/31] package/kodi-audioencoder-*: mass version bump
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (12 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 13/31] package/kodi-adsp-freesurround: " Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29 10:00   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 15/31] package/kodi-audiodecoder-*: " Bernd Kuhls
                   ` (19 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash     | 2 +-
 package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk       | 2 +-
 package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash     | 2 +-
 package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk       | 2 +-
 package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash | 2 +-
 package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk   | 2 +-
 package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash       | 2 +-
 package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
index f563f56b21..41ddeb4eea 100644
--- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
+++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 4317a01414577885ef4a0ac4f8d95714b021ad15fc668cbf36eae2fdf400bb33 kodi-audioencoder-flac-v1.0.0.tar.gz
+sha256 811dac5766dc9ef1a3447c55637edde55c5ddca1d583124e9312328152015ae5  kodi-audioencoder-flac-v1.1.0.tar.gz
diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
index 402db10b40..d1c41ca36b 100644
--- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
+++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_FLAC_VERSION = v1.0.0
+KODI_AUDIOENCODER_FLAC_VERSION = v1.1.0
 KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION))
 KODI_AUDIOENCODER_FLAC_LICENSE = GPL-2.0+
 KODI_AUDIOENCODER_FLAC_LICENSE_FILES = src/EncoderFlac.cpp
diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
index ffd38ba803..b93ae02e21 100644
--- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
+++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 7fbdc6c9111431f49498157204d19dfa94bbf9e5f807b631e84129c6c491225e kodi-audioencoder-lame-v1.0.0.tar.gz
+sha256 5118a2925bb0f7eca36b2d0f4d6822b45a8967c9fb91054bfaa8f83d21209c95  kodi-audioencoder-lame-v1.2.0.tar.gz
diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
index 1edefa438a..941604ae46 100644
--- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
+++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_LAME_VERSION = v1.0.0
+KODI_AUDIOENCODER_LAME_VERSION = v1.2.0
 KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION))
 KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+
 KODI_AUDIOENCODER_LAME_LICENSE_FILES = src/EncoderLame.cpp
diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
index 47f428c783..094b2fabc6 100644
--- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
+++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 65169e785d82f9081088df2693721f4a7e4b2d24f7e8b1e86b5f443206935303 kodi-audioencoder-vorbis-v1.0.0.tar.gz
+sha256 f00c74f010b465d43e8206bcbe155785e1f34660ca010acff3b890595ea2352c  kodi-audioencoder-vorbis-v1.1.0.tar.gz
diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
index f6db81875b..198d3b1c64 100644
--- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
+++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_VORBIS_VERSION = v1.0.0
+KODI_AUDIOENCODER_VORBIS_VERSION = v1.1.0
 KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION))
 KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+
 KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = src/EncoderVorbis.cpp
diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
index 86eb13cc55..c6bbe79e17 100644
--- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
+++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 d4e6de5786b9e2bd3fa5e09314c9a60a8daac32cf96e8aa84ab42cacf60f7094 kodi-audioencoder-wav-v1.0.0.tar.gz
+sha256 f9b0f79c8364fb7ef584137031fceb8d2ab1af28e110cfe2a31932631cb8d36e  kodi-audioencoder-wav-v1.1.0.tar.gz
diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
index 9005bf39ac..1a9a6b7bbc 100644
--- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
+++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_WAV_VERSION = v1.0.0
+KODI_AUDIOENCODER_WAV_VERSION = v1.1.0
 KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION))
 KODI_AUDIOENCODER_WAV_LICENSE = GPL-2.0+
 KODI_AUDIOENCODER_WAV_LICENSE_FILES = src/EncoderWav.cpp
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 14/31] package/kodi-audioencoder-*: mass version bump
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 14/31] package/kodi-audioencoder-*: mass version bump Bernd Kuhls
@ 2017-04-29 10:00   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 10:00 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:34 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash     | 2 +-
>  package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk       | 2 +-
>  package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash     | 2 +-
>  package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk       | 2 +-
>  package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash | 2 +-
>  package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk   | 2 +-
>  package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash       | 2 +-
>  package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk         | 2 +-
>  8 files changed, 8 insertions(+), 8 deletions(-)

Patches 14 to 21 applied (version bumps).

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 15/31] package/kodi-audiodecoder-*: mass version bump
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (13 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 14/31] package/kodi-audioencoder-*: mass version bump Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 16/31] package/kodi-audiodecoder-timidity: bump version Bernd Kuhls
                   ` (18 subsequent siblings)
  33 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash     | 2 +-
 package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk       | 2 +-
 package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash   | 2 +-
 package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk     | 2 +-
 package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash           | 2 +-
 package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk             | 2 +-
 package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash     | 2 +-
 package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk       | 2 +-
 package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash     | 2 +-
 package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk       | 2 +-
 package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash     | 2 +-
 package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk       | 2 +-
 package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash | 2 +-
 package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk   | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
index 2760b11b53..9b1c2114aa 100644
--- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
+++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 dd4610ba5fdf3f46dcd0deff785d373d3996c6585cbeb39cb4449baafe5ea3df kodi-audiodecoder-modplug-03b772da7ea44ff3c34b322989254cd1e4732443.tar.gz
+sha256 8be4f8c6324bf790069e42c963e14733c53fcdc27548f21f4822b178f47b8177  kodi-audiodecoder-modplug-v1.1.0.tar.gz
diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
index d29e07c057..c5a6f32676 100644
--- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
+++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_MODPLUG_VERSION = 03b772da7ea44ff3c34b322989254cd1e4732443
+KODI_AUDIODECODER_MODPLUG_VERSION = v1.1.0
 KODI_AUDIODECODER_MODPLUG_SITE = $(call github,notspiff,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION))
 KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = src/ModplugCodec.cpp
diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
index b4cd28fea5..df93b25c8e 100644
--- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
+++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 da65b21ed6218d65b7d382d7fdd9c848a87f6dc766864925979ea8244320db94 kodi-audiodecoder-nosefart-bfab543bae0d9855538cf03e78ea9cd5e3b9750e.tar.gz
+sha256 444cc85f4618daa5147a63633db3f300123d5e33b1b5894e7036fa9243e8a535  kodi-audiodecoder-nosefart-v1.1.0.tar.gz
diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
index 6aa268eefd..f56dc19158 100644
--- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
+++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_NOSEFART_VERSION = bfab543bae0d9855538cf03e78ea9cd5e3b9750e
+KODI_AUDIODECODER_NOSEFART_VERSION = v1.1.0
 KODI_AUDIODECODER_NOSEFART_SITE = $(call github,notspiff,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION))
 KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = src/NSFCodec.cpp
diff --git a/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash b/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash
index fa60ce5769..117e9f8337 100644
--- a/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash
+++ b/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 74b5736aa21d9cfb8fa835c1dc9cca47817cdb3867f99f5c6aee655f0df476ad kodi-audiodecoder-opus-0bd11e35e6ed8b6480e4100ac8927113cb085eda.tar.gz
+sha256 bb7037f903f0396da739005843264acd7227cf96eeeac78b0e36d82872c9acc4  kodi-audiodecoder-opus-d6eb25f0c08033f9a2b4d7402e8baf866ebc731c.tar.gz
diff --git a/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk b/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk
index 828b9f0675..d93c33ac51 100644
--- a/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk
+++ b/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_OPUS_VERSION = 0bd11e35e6ed8b6480e4100ac8927113cb085eda
+KODI_AUDIODECODER_OPUS_VERSION = d6eb25f0c08033f9a2b4d7402e8baf866ebc731c
 KODI_AUDIODECODER_OPUS_SITE = $(call github,notspiff,audiodecoder.opus,$(KODI_AUDIODECODER_OPUS_VERSION))
 KODI_AUDIODECODER_OPUS_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_OPUS_LICENSE_FILES = src/OpusCodec.cpp
diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
index f339654f74..b806956a75 100644
--- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
+++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 11855e7b0311516602eda34c5fa4917d51220a27c3053ea831da149ae4c93757 kodi-audiodecoder-sidplay-d832f050211b4e5f085a8b09bc7d26ce32098169.tar.gz
+sha256 527b188679add8043e8cd691af9735b6fe8bd6935ad8ac8312b459d6f160cdac  kodi-audiodecoder-sidplay-v1.1.0.tar.gz
diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
index 54df9a16f5..8eb425f443 100644
--- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
+++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_SIDPLAY_VERSION = d832f050211b4e5f085a8b09bc7d26ce32098169
+KODI_AUDIODECODER_SIDPLAY_VERSION = v1.1.0
 KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,notspiff,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION))
 KODI_AUDIODECODER_SIDPLAY_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = src/SIDCodec.cpp
diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
index e3da57221a..159d67ecdf 100644
--- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
+++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 6fd6e5dda0fbcdac280952e0efc0bb255ef99628c892164c26e60ee3f2ab8e4e kodi-audiodecoder-snesapu-db62e88e568994a0496d7026a10e044d70b3aa2b.tar.gz
+sha256 20d85822d0c01223903b5e5472a1d029fa4931c2a9ac4d399345c4363fa8f905  kodi-audiodecoder-snesapu-v1.1.0.tar.gz
diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
index 9ffb0045e6..6104de717f 100644
--- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
+++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_SNESAPU_VERSION = db62e88e568994a0496d7026a10e044d70b3aa2b
+KODI_AUDIODECODER_SNESAPU_VERSION = v1.1.0
 KODI_AUDIODECODER_SNESAPU_SITE = $(call github,notspiff,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION))
 KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = src/SPCCodec.cpp
diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
index 164e967634..133e645fa9 100644
--- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
+++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 2bd89d66c493ba354df5c154f313a4bd801ff019ad5c102aa54741b99dd9c608 kodi-audiodecoder-stsound-759ae7eadb94adfde8533a2a42d949c321718625.tar.gz
+sha256 c9b6e98d544712f7cec3cf18f866ccaed2fbcd20410179259ae0455ffa967ca4  kodi-audiodecoder-stsound-v1.1.0.tar.gz
diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
index 5fcfe71f42..dd5b9da3f8 100644
--- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
+++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_STSOUND_VERSION = 759ae7eadb94adfde8533a2a42d949c321718625
+KODI_AUDIODECODER_STSOUND_VERSION = v1.1.0
 KODI_AUDIODECODER_STSOUND_SITE = $(call github,notspiff,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION))
 KODI_AUDIODECODER_STSOUND_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_STSOUND_LICENSE_FILES = src/YMCodec.cpp
diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
index 5e6dfab3a3..28f4272e20 100644
--- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
+++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 7a376447e8390f01c18f22b57ea553441493625545537a023d5d896272e56369 kodi-audiodecoder-vgmstream-cb2892ac0465b0563ee45f532323198a6f722b62.tar.gz
+sha256 40cd4f7f143c9313a4437854e31c460046af47bd709364439f0e370ec464af0d  kodi-audiodecoder-vgmstream-v1.1.0.tar.gz
diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
index 68f588496e..8dc09fa7e4 100644
--- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
+++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_VGMSTREAM_VERSION = cb2892ac0465b0563ee45f532323198a6f722b62
+KODI_AUDIODECODER_VGMSTREAM_VERSION = v1.1.0
 KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,notspiff,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION))
 KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = src/VGMCodec.cpp
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 16/31] package/kodi-audiodecoder-timidity: bump version
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (14 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 15/31] package/kodi-audiodecoder-*: " Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 17/31] package/kodi-screensaver-*: mass version bump Bernd Kuhls
                   ` (17 subsequent siblings)
  33 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

kodi-platform is not a dependency anymore:
https://github.com/notspiff/audiodecoder.timidity/commit/b7ae86ad860b562f08ab02d9e87a546d99f1bb51

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-audiodecoder-timidity/Config.in                       | 1 -
 package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash | 2 +-
 package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk   | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/kodi-audiodecoder-timidity/Config.in b/package/kodi-audiodecoder-timidity/Config.in
index 8f604adf00..3372dc5c05 100644
--- a/package/kodi-audiodecoder-timidity/Config.in
+++ b/package/kodi-audiodecoder-timidity/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_KODI_AUDIODECODER_TIMIDITY
 	bool "kodi-audiodecoder-timidity"
-	select BR2_PACKAGE_KODI_PLATFORM
 	help
 	  Timidity decoder addon for Kodi
 
diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
index d4af0197b3..5711b87a6c 100644
--- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
+++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 2e220b7d279fce73ff289536cd9e94b159ae648514fb8b423977dddb99c50e85 kodi-audiodecoder-timidity-a84559da92aa67744069fc9e9dc885732588c8ce.tar.gz
+sha256 83a740010dc7fa01101da370c74e79287ebd67bd28d27125e4372abe2fb3bb47  kodi-audiodecoder-timidity-v1.1.1.tar.gz
diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
index 0d5f6ef2e4..e4a97fa7f6 100644
--- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
+++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_TIMIDITY_VERSION = a84559da92aa67744069fc9e9dc885732588c8ce
+KODI_AUDIODECODER_TIMIDITY_VERSION = v1.1.1
 KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,notspiff,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION))
 KODI_AUDIODECODER_TIMIDITY_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = src/TimidityCodec.cpp
-KODI_AUDIODECODER_TIMIDITY_DEPENDENCIES = kodi-platform
+KODI_AUDIODECODER_TIMIDITY_DEPENDENCIES = kodi
 
 $(eval $(cmake-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 17/31] package/kodi-screensaver-*: mass version bump
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (15 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 16/31] package/kodi-audiodecoder-timidity: bump version Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 18/31] package/kodi-screensaver-rsxs: bump version Bernd Kuhls
                   ` (16 subsequent siblings)
  33 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash      | 2 +-
 package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk        | 2 +-
 package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash      | 2 +-
 package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk        | 2 +-
 package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash    | 2 +-
 package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk      | 2 +-
 package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash          | 2 +-
 package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk            | 2 +-
 .../kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash    | 2 +-
 package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk  | 2 +-
 package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash      | 2 +-
 package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk        | 2 +-
 .../kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash    | 2 +-
 package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk  | 2 +-
 package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash        | 2 +-
 package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk          | 2 +-
 package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash    | 2 +-
 package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk      | 2 +-
 package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash                | 2 +-
 package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk                  | 2 +-
 package/kodi-screensaver-stars/kodi-screensaver-stars.hash              | 2 +-
 package/kodi-screensaver-stars/kodi-screensaver-stars.mk                | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
index a70f1b0a5d..7d105beebe 100644
--- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
+++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 b76b9ba122cebddc7c201b088d93e86fde8fc76e7e9f167ff3e43c3390088f3f kodi-screensaver-asteroids-c7ae05f1881b9abda6a1ac6beaca8d64a164c4fa.tar.gz
+sha256 2e072e6aad12f707dec1e70b7df26c590bb41fed8880dcfdbe6c99949b7e287a  kodi-screensaver-asteroids-v1.1.2.tar.gz
diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
index b2eac1b0a1..46df2e76a0 100644
--- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
+++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_ASTEROIDS_VERSION = c7ae05f1881b9abda6a1ac6beaca8d64a164c4fa
+KODI_SCREENSAVER_ASTEROIDS_VERSION = v1.1.2
 KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,notspiff,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION))
 KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = src/main.cpp
diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
index 5f04031af0..f8f6d7b2fb 100644
--- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
+++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 6bf9367889c4ddece7e0c3720762d41bb0b22fc9ab28d1c8759edb1f77487ecd kodi-screensaver-asterwave-0dc2c48dadb100954eef823e7e3a5f502ce65b1e.tar.gz
+sha256 48cd459b60b2407b8bae9107760a013d04ee29e00fddbce9550291896d42ef64  kodi-screensaver-asterwave-v1.1.0.tar.gz
diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
index 7c718ccd84..b8c3a2adfa 100644
--- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
+++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_ASTERWAVE_VERSION = 0dc2c48dadb100954eef823e7e3a5f502ce65b1e
+KODI_SCREENSAVER_ASTERWAVE_VERSION = v1.1.0
 KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,notspiff,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION))
 KODI_SCREENSAVER_ASTERWAVE_DEPENDENCIES = kodi libglu libsoil
 
diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
index 6fc273d184..63b9d3c93a 100644
--- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
+++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 25e497c6843a7d933d1e4736e8dcb671bc9881328d5e27349dd0b25cb9be07eb kodi-screensaver-biogenesis-39928eef56ed639085d401dd97bf18f44b1f3e8b.tar.gz
+sha256 b97dc804261b19df725e0a9f1af3be6903226ae616fcac170f7b9c1a67bf811a  kodi-screensaver-biogenesis-v1.1.0.tar.gz
diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
index 8e10a5739b..c5ebd85596 100644
--- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
+++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_BIOGENESIS_VERSION = 39928eef56ed639085d401dd97bf18f44b1f3e8b
+KODI_SCREENSAVER_BIOGENESIS_VERSION = v1.1.0
 KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,notspiff,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION))
 KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = src/Life.cpp
diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
index ebf19d9dee..21443d82bf 100644
--- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
+++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 c2d19c33aff73b99cbf51f943b62e58b2b6233dcf1d789ae8f73e92fa96f07bc kodi-screensaver-cpblobs-87a3abfbe6e4fd1089548eab77a84902d0e1af60.tar.gz
+sha256 1ca5e4de61251de7e420dc6ded3156960f9bb52ed7ff0243f305768147d470e3  kodi-screensaver-cpblobs-v1.1.0.tar.gz
diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
index 0fc5c53bfe..63a8dfa8cf 100644
--- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
+++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_CPBLOBS_VERSION = 87a3abfbe6e4fd1089548eab77a84902d0e1af60
+KODI_SCREENSAVER_CPBLOBS_VERSION = v1.1.0
 KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,notspiff,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION))
 KODI_SCREENSAVER_CPBLOBS_LICENSE = GPL-2.0
 KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE
diff --git a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
index 01183d74f0..ff9d6d0244 100644
--- a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
+++ b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 680e9354adcb7048b5c2b55b3c49cf37cea0e12e6564018cd694feeb253c90dd kodi-screensaver-crystalmorph-2e7c10e3543f5aaab6fd2f5aa9d05b976a43ba68.tar.gz
+sha256 a8400c8d8be0fe0ba616ad1d0ef5fd798980a9dd4e38ef88bee9bf74a06975d5  kodi-screensaver-crystalmorph-1dc9bf3f57cc2c5345efec64d9499c3bf8f7bd6e.tar.gz
diff --git a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
index 2e0209f68c..83629e41ca 100644
--- a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
+++ b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 2e7c10e3543f5aaab6fd2f5aa9d05b976a43ba68
+KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 1dc9bf3f57cc2c5345efec64d9499c3bf8f7bd6e
 KODI_SCREENSAVER_CRYSTALMORPH_SITE = $(call github,notspiff,screensaver.crystalmorph,$(KODI_SCREENSAVER_CRYSTALMORPH_VERSION))
 KODI_SCREENSAVER_CRYSTALMORPH_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_CRYSTALMORPH_LICENSE_FILES = src/Fractal.cpp
diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
index 93394532e6..212aee663c 100644
--- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
+++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 fc114434db18a885fda30ac6b82fe82ec1d5ed97e2ff6414b4927487da684871 kodi-screensaver-greynetic-80e850eb3cbc7ee2c937fcab666dc45d2b2ee0bb.tar.gz
+sha256 55a77487f02d282e8431e64de3cb263489037c2374a4b9cdd7aa189093e7621f  kodi-screensaver-greynetic-v1.1.0.tar.gz
diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
index 7b0001278b..66435eb270 100644
--- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
+++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_GREYNETIC_VERSION = 80e850eb3cbc7ee2c937fcab666dc45d2b2ee0bb
+KODI_SCREENSAVER_GREYNETIC_VERSION = v1.1.0
 KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,notspiff,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION))
 KODI_SCREENSAVER_GREYNETIC_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = src/GreyNetic.cpp
diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
index 5ae2459cff..55deabea1e 100644
--- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
+++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 91990a29072cf85f4b9253a16a362d83fdfcc7595de796d982a189aa8618555c  kodi-screensaver-matrixtrails-16057e7195f930109f0a4aea999296ca315700e5.tar.gz
+sha256 2b531f51b86536df2a5268547e3d1b7fabc8a1dc930808b46685afcc455bb8fa  kodi-screensaver-matrixtrails-v1.1.0.tar.gz
diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
index b67ee4a355..142e48dc76 100644
--- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
+++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 16057e7195f930109f0a4aea999296ca315700e5
+KODI_SCREENSAVER_MATRIXTRAILS_VERSION = v1.1.0
 KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,notspiff,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION))
 KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = src/matrixtrails.cpp
diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
index 79d4dd40a7..aad8314bdd 100644
--- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
+++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 59a5cdfa6387760205efabcd91bc64fdc92f103c8f213b650018160f6c1a691c kodi-screensaver-pingpong-5c7cf6fd9f9ff1468f620bb891e66bebd3a5fe17.tar.gz
+sha256 99e9cbc3815d4e3dad964b2d233dbf6acc4416121398f7fca75f3811cb04d88f  kodi-screensaver-pingpong-v1.1.0.tar.gz
diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
index db8e275fb9..8b6426dae4 100644
--- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
+++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_PINGPONG_VERSION = 5c7cf6fd9f9ff1468f620bb891e66bebd3a5fe17
+KODI_SCREENSAVER_PINGPONG_VERSION = v1.1.0
 KODI_SCREENSAVER_PINGPONG_SITE = $(call github,notspiff,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION))
 KODI_SCREENSAVER_PINGPONG_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = src/readme.txt
diff --git a/package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash b/package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash
index 9aea929257..de5f6cf5d3 100644
--- a/package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash
+++ b/package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 13ce2881f8eaf9936691cf66b9f3471a718ae87249d62ade55174201873fb496 kodi-screensaver-planestate-95b6d1ec72f37bcd16cf8e5d49806193dba883f0.tar.gz
+sha256 6059630e56bd022a27f73fe7c94fcf6a66792e7bb10f54a7893f536c23b95b99  kodi-screensaver-planestate-5341406dd05439a1a0245ab3f6d1a8964461d0e5.tar.gz
diff --git a/package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk b/package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk
index 38885c5cbc..0e90ffc5d1 100644
--- a/package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk
+++ b/package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_PLANESTATE_VERSION = 95b6d1ec72f37bcd16cf8e5d49806193dba883f0
+KODI_SCREENSAVER_PLANESTATE_VERSION = 5341406dd05439a1a0245ab3f6d1a8964461d0e5
 KODI_SCREENSAVER_PLANESTATE_SITE = $(call github,notspiff,screensaver.planestate,$(KODI_SCREENSAVER_PLANESTATE_VERSION))
 KODI_SCREENSAVER_PLANESTATE_DEPENDENCIES = kodi libsoil
 
diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
index c79e3f5f1f..a16ee8e092 100644
--- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
+++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 951bc3259407b7f21183c34556b1efc4c40bfafec61008cd543f382f67466184 kodi-screensaver-pyro-2476b77d9954980a27e07eb8eb0727e2af226351.tar.gz
+sha256 0dcaed581ffe5595878338a8c9c55bd7acc87e03d30a4d3ca4a03c3f8db66ddc  kodi-screensaver-pyro-v1.1.0.tar.gz
diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
index 25c2bbd722..bc50118302 100644
--- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
+++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_PYRO_VERSION = 2476b77d9954980a27e07eb8eb0727e2af226351
+KODI_SCREENSAVER_PYRO_VERSION = v1.1.0
 KODI_SCREENSAVER_PYRO_SITE = $(call github,notspiff,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION))
 KODI_SCREENSAVER_PYRO_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_PYRO_LICENSE_FILES = src/Pyro.cpp
diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
index 107ada4701..7f8c9aefd0 100644
--- a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
+++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 79633afcdccf5df31c98d2144bd23086d691e7749255b4295b183b535d9b7abf kodi-screensaver-stars-28bf79d4dce040e9fbdc25f51007e13950cab937.tar.gz
+sha256 525caac94fd2bd858daf9fa7719eea4181c168e5c692bb896689625bf4437d32  kodi-screensaver-stars-v1.1.0.tar.gz
diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
index da5fb5c7c2..e94670c6ff 100644
--- a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
+++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_STARS_VERSION = 28bf79d4dce040e9fbdc25f51007e13950cab937
+KODI_SCREENSAVER_STARS_VERSION = v1.1.0
 KODI_SCREENSAVER_STARS_SITE = $(call github,notspiff,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION))
 KODI_SCREENSAVER_STARS_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_STARS_LICENSE_FILES = src/StarField.cpp
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 18/31] package/kodi-screensaver-rsxs: bump version
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (16 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 17/31] package/kodi-screensaver-*: mass version bump Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 19/31] package/kodi-visualisation-*: mass version bump Bernd Kuhls
                   ` (15 subsequent siblings)
  33 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

ac_cv_type__Bool=yes is needed to fix compilation with gcc >= 5.
Added patch to fix X.org includes.
Added dependency for libpng previously provided by Kodi.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../kodi-screensaver-rsxs/0001-cross-compile.patch |  2 +-
 .../0002-fix-default-include-dir.patch             | 28 ++++++++++++++++++++++
 package/kodi-screensaver-rsxs/Config.in            |  1 +
 .../kodi-screensaver-rsxs.hash                     |  2 +-
 .../kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk |  5 ++--
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch

diff --git a/package/kodi-screensaver-rsxs/0001-cross-compile.patch b/package/kodi-screensaver-rsxs/0001-cross-compile.patch
index 56c2f4e4ba..a7b2053d76 100644
--- a/package/kodi-screensaver-rsxs/0001-cross-compile.patch
+++ b/package/kodi-screensaver-rsxs/0001-cross-compile.patch
@@ -27,7 +27,7 @@ diff -uNr screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLi
  endif()
  externalproject_add(rsxs SOURCE_DIR ${PROJECT_SOURCE_DIR}/${rsxs_dir}
 -                    CONFIGURE_COMMAND ${configure_start}
-+                    CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no
++                    CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no ac_cv_type__Bool=yes
 +                                      ac_cv_func_malloc_0_nonnull=yes
 +                                      ${configure_start}
                                        --prefix=<INSTALL_DIR>
diff --git a/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch b/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
new file mode 100644
index 0000000000..a7e7c74b0f
--- /dev/null
+++ b/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
@@ -0,0 +1,28 @@
+Fix X include path to prevent error during configure
+
+Downloaded from
+https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/patches/screensavers.rsxs-0002-fix-default-include-dir.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -Naur screensavers.rsxs-3241d29.orig/CMakeLists.txt screensavers.rsxs-3241d29/CMakeLists.txt
+--- screensavers.rsxs-3241d29.orig/CMakeLists.txt	2015-10-22 23:59:38.187280475 -0700
++++ screensavers.rsxs-3241d29/CMakeLists.txt	2015-10-23 00:00:27.228113829 -0700
+@@ -17,7 +17,7 @@
+ include_directories(${OpenGL_INCLUDE_DIR}
+                     ${PNG_INCLUDE_DIR}
+                     ${KODI_INCLUDE_DIR}
+-                    ${X_INCLUDE_DIRS}
++                    ${X_INCLUDE_DIR}
+                     ${CMAKE_BINARY_DIR}/rsxs-prefix/src/rsxs-build
+                     ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src
+                     ${PROJECT_SOURCE_DIR}/${rsxs_dir}/lib
+@@ -67,7 +67,7 @@
+                                       --disable-skyrocket
+                                       --disable-solarwinds
+                                       --disable-sound
+-                                      --x-includes=${X_INCLUDE_DIRS}
++                                      --x-includes=${X_INCLUDE_DIR}
+                                       --x-libraries=${X_LIBRARIES}
+                                       ${PNG_PATH}
+                                       ${EXTRA_FLAGS}
diff --git a/package/kodi-screensaver-rsxs/Config.in b/package/kodi-screensaver-rsxs/Config.in
index 11546ad1f8..c523ce5a1c 100644
--- a/package/kodi-screensaver-rsxs/Config.in
+++ b/package/kodi-screensaver-rsxs/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_RSXS
 	bool "kodi-screensaver-rsxs"
 	depends on BR2_PACKAGE_HAS_LIBGL # libglu
 	depends on BR2_PACKAGE_XORG7 # xlib_libXmu
+	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_XLIB_LIBXMU
 	help
 	  RSXS screensaver add-ons for Kodi
diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
index 568b44b37c..66d79a06f3 100644
--- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
+++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 0797ffb720056ea2e04ac8b7ee4fc2dca1e42611ef138b347e928d8d7f3c696f kodi-screensaver-rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.tar.gz
+sha256 8436c29d2f42bc65ff6f1abc2f1d05a613cc2ebb16d793e02b1f2bee296952a6  kodi-screensaver-rsxs-v1.3.0.tar.gz
diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
index 2cd94da860..8445bf88d8 100644
--- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
+++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
@@ -4,11 +4,10 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_RSXS_VERSION = 195e0ec3fbbcb2ee2012cd560e42d05167f0f259
+KODI_SCREENSAVER_RSXS_VERSION = v1.3.0
 KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION))
 KODI_SCREENSAVER_RSXS_LICENSE = GPL-3.0
 KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING
-
-KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi xlib_libXmu
+KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi libpng xlib_libXmu
 
 $(eval $(cmake-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 19/31] package/kodi-visualisation-*: mass version bump
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (17 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 18/31] package/kodi-screensaver-rsxs: bump version Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 20/31] package/kodi-visualisation-waveforhue: bump version Bernd Kuhls
                   ` (14 subsequent siblings)
  33 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash   | 2 +-
 package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk     | 2 +-
 package/kodi-visualisation-goom/kodi-visualisation-goom.hash         | 2 +-
 package/kodi-visualisation-goom/kodi-visualisation-goom.mk           | 2 +-
 package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash | 2 +-
 package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk   | 2 +-
 package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash | 2 +-
 package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
index 6a65a58fea..c89ca9a618 100644
--- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
+++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 7047d501942bcd5095e0f1424f003caec8eb792b59d16d16ad25f14829844e50 kodi-visualisation-fishbmc-50c38c296a62e096a2216e43b86d864ee265c506.tar.gz
+sha256 cf42a21978578cb5ecb10c20fe09791183d8ef2998ff9d956a84142a7dda8f72  kodi-visualisation-fishbmc-v4.1.0.tar.gz
diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
index 92c9190ad7..d08c215ee7 100644
--- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
+++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_FISHBMC_VERSION = 50c38c296a62e096a2216e43b86d864ee265c506
+KODI_VISUALISATION_FISHBMC_VERSION = v4.1.0
 KODI_VISUALISATION_FISHBMC_SITE = $(call github,notspiff,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION))
 KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+
 KODI_VISUALISATION_FISHBMC_LICENSE_FILES = visualization.fishbmc/LICENSE
diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
index 8507c652a5..8d4548a7dd 100644
--- a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
+++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 66a71a5c5a1c0016d7020fcc9941634ee465dab14644cdc96023ce0a28408338 kodi-visualisation-goom-16747b7dba9cbdcfdc8df44e849eaf09450fc86f.tar.gz
+sha256 62a26efb6cd5d5fd109e38accb3deb71145972ae30b914bed7620eb40465c954  kodi-visualisation-goom-v1.1.0.tar.gz
diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
index e7695052df..48e0425972 100644
--- a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
+++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_GOOM_VERSION = 16747b7dba9cbdcfdc8df44e849eaf09450fc86f
+KODI_VISUALISATION_GOOM_VERSION = v1.1.0
 KODI_VISUALISATION_GOOM_SITE = $(call github,notspiff,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION))
 KODI_VISUALISATION_GOOM_LICENSE = GPL-2.0+
 KODI_VISUALISATION_GOOM_LICENSE_FILES = src/Main.cpp
diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
index 18e38f577f..6c892ed0ba 100644
--- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
+++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 aa417d6ad3d3770029e7d8d9f7f0ca8d56a8a4f47821267b5a8604fc26993334 kodi-visualisation-spectrum-9dbe53a0db73f00ee22e9ca235c98f8137b7bb9e.tar.gz
+sha256 7ee78ff5c24e3f81b6e2a9208237f34667cb9faa5453d7bdb900ab65245973f1  kodi-visualisation-spectrum-v1.1.1.tar.gz
diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
index ebc75779b8..3ab2c9975d 100644
--- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
+++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_SPECTRUM_VERSION = 9dbe53a0db73f00ee22e9ca235c98f8137b7bb9e
+KODI_VISUALISATION_SPECTRUM_VERSION = v1.1.1
 KODI_VISUALISATION_SPECTRUM_SITE = $(call github,notspiff,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION))
 KODI_VISUALISATION_SPECTRUM_LICENSE = GPL-2.0+
 KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = COPYING
diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
index 728b857ecc..1fdecbede5 100644
--- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
+++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 439bd50fcb1c0912532d0d113f7eeadf28f72bd2cb0c234581ee1acc2a70e45b kodi-visualisation-waveform-89aec48e2975f820004df5a1a53801339a5b3064.tar.gz
+sha256 cf10d8d78cb2bde4a0a21bb7e467445617b46593c093ef05f336f95a048f2d54  kodi-visualisation-waveform-v1.1.0.tar.gz
diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
index 2263b7106f..d906c653c2 100644
--- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
+++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_WAVEFORM_VERSION = 89aec48e2975f820004df5a1a53801339a5b3064
+KODI_VISUALISATION_WAVEFORM_VERSION = v1.1.0
 KODI_VISUALISATION_WAVEFORM_SITE = $(call github,notspiff,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION))
 KODI_VISUALISATION_WAVEFORM_LICENSE = GPL-2.0+
 KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = COPYING
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 20/31] package/kodi-visualisation-waveforhue: bump version
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (18 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 19/31] package/kodi-visualisation-*: mass version bump Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 21/31] package/kodi-visualisation-shadertoy: " Bernd Kuhls
                   ` (13 subsequent siblings)
  33 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Changed upstream repo as per:
https://github.com/notspiff/visualization.waveforhue/pull/3#issuecomment-221105720

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash  | 2 +-
 .../kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash b/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash
index 5f49daae94..e7e97f1d86 100644
--- a/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash
+++ b/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 2590ce4ee1816ffdf59fe33580a36fba49fbd1f60f4c9022b3315e04debc9c73 kodi-visualisation-waveforhue-e87d5c7d7e7504036b80af8bc89f4cf6489085fe.tar.gz
+sha256 80c466c55aee97d01442892135d4785070333e39f45942da17b65239758e5ae9  kodi-visualisation-waveforhue-b1805dbdba07e5e5b62115490c703aca43e9065c.tar.gz
diff --git a/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk b/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk
index ce0fc1854c..3ff32e658e 100644
--- a/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk
+++ b/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_WAVEFORHUE_VERSION = e87d5c7d7e7504036b80af8bc89f4cf6489085fe
-KODI_VISUALISATION_WAVEFORHUE_SITE = $(call github,notspiff,visualization.waveforhue,$(KODI_VISUALISATION_WAVEFORHUE_VERSION))
+KODI_VISUALISATION_WAVEFORHUE_VERSION = b1805dbdba07e5e5b62115490c703aca43e9065c
+KODI_VISUALISATION_WAVEFORHUE_SITE = $(call github,hardyt,visualization.waveforhue,$(KODI_VISUALISATION_WAVEFORHUE_VERSION))
 KODI_VISUALISATION_WAVEFORHUE_LICENSE = GPL-2.0+
 KODI_VISUALISATION_WAVEFORHUE_LICENSE_FILES = COPYING
 KODI_VISUALISATION_WAVEFORHUE_DEPENDENCIES = kodi
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 21/31] package/kodi-visualisation-shadertoy: bump version
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (19 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 20/31] package/kodi-visualisation-waveforhue: bump version Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 22/31] package/kodi: add optional support for bluez5 Bernd Kuhls
                   ` (12 subsequent siblings)
  33 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Rebased patch 0001.

Upstream removed the optional dependency to libglew:
https://github.com/notspiff/visualization.shadertoy/commit/11371c4e85f6eebdb8717c6e08d292e0e9b1841d

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch    | 4 ++--
 package/kodi-visualisation-shadertoy/Config.in                      | 1 -
 .../kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash  | 2 +-
 .../kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk    | 6 +-----
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch b/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
index 6737296fe7..8de96a6de3 100644
--- a/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
+++ b/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
@@ -23,9 +23,9 @@ index 8b084cf..81bbe27 100644
  
 -  include_directories(${OpenGL_INCLUDE_DIR}
 +  include_directories(${OpenGL_INCLUDE_DIR} ${OpenGLES2_INCLUDE_DIRS}
-                       ${GLEW_INCLUDE_DIR}
                        ${KODI_INCLUDE_DIR}
-                       ${platform_INCLUDE_DIRS}
+                       ${p8-platform_INCLUDE_DIRS}
+                       ${PROJECT_SOURCE_DIR}/lib/kissfft
 diff --git a/FindOpenGLES2.cmake b/FindOpenGLES2.cmake
 index e1b7d21..2a9ce0d 100644
 --- a/FindOpenGLES2.cmake
diff --git a/package/kodi-visualisation-shadertoy/Config.in b/package/kodi-visualisation-shadertoy/Config.in
index ac17702709..3b981d0bf4 100644
--- a/package/kodi-visualisation-shadertoy/Config.in
+++ b/package/kodi-visualisation-shadertoy/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_KODI_VISUALISATION_SHADERTOY
 	bool "kodi-visualisation-shadertoy"
-	select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_LIBPLATFORM
 	help
 	  Shadertoy visualiser for Kodi
diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
index fdd81fd590..a0df397e8e 100644
--- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
+++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 88732c399bb7e1237e8fc375583bb3789c96a28695a3805fb374361a7e5636c5 kodi-visualisation-shadertoy-f9988007681bf37e6c03d6992bae30133b020608.tar.gz
+sha256 4456e88bc94bcb3e2481286b27926a1f6d85d6f857de31a46d50f44fead01abd  kodi-visualisation-shadertoy-v1.1.5.tar.gz
diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
index 527c5e4402..923891595b 100644
--- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
+++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
@@ -4,14 +4,10 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_SHADERTOY_VERSION = f9988007681bf37e6c03d6992bae30133b020608
+KODI_VISUALISATION_SHADERTOY_VERSION = v1.1.5
 KODI_VISUALISATION_SHADERTOY_SITE = $(call github,notspiff,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION))
 KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+
 KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = src/main.cpp
 KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = kodi libplatform
 
-ifeq ($(BR2_PACKAGE_LIBGLEW),y)
-KODI_VISUALISATION_SHADERTOY_DEPENDENCIES += libglew
-endif
-
 $(eval $(cmake-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 22/31] package/kodi: add optional support for bluez5
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (20 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 21/31] package/kodi-visualisation-shadertoy: " Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29 10:03   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 23/31] package/kodi: libxslt is an optional package Bernd Kuhls
                   ` (11 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi/Config.in | 8 ++++++++
 package/kodi/kodi.mk   | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 7e1140291e..5dd0d06bf9 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -113,6 +113,14 @@ config BR2_PACKAGE_KODI_AVAHI
 	  Enable Avahi support.
 	  Select this if you want Kodi to support Bonjour protocol.
 
+config BR2_PACKAGE_KODI_BLUEZ
+	bool "bluetooth"
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils
+	depends on !BR2_PACKAGE_BLUEZ_UTILS # bluez5_utils
+	select BR2_PACKAGE_BLUEZ5_UTILS
+	help
+	    Enable bluetooth support
+
 config BR2_PACKAGE_KODI_DBUS
 	bool "dbus"
 	select BR2_PACKAGE_DBUS
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index b0df3a0546..3a10a524e3 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -185,6 +185,13 @@ else
 KODI_CONF_OPTS += -DENABLE_CAP=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_KODI_BLUEZ),y)
+KODI_CONF_OPTS += -DENABLE_BLUETOOTH=ON
+KODI_DEPENDENCIES += bluez5_utils
+else
+KODI_CONF_OPTS += -DENABLE_BLUETOOTH=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_KODI_DBUS),y)
 KODI_DEPENDENCIES += dbus
 KODI_CONF_OPTS += -DENABLE_DBUS=ON
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 22/31] package/kodi: add optional support for bluez5
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 22/31] package/kodi: add optional support for bluez5 Bernd Kuhls
@ 2017-04-29 10:03   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 10:03 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:42 +0200, Bernd Kuhls wrote:

> +config BR2_PACKAGE_KODI_BLUEZ
> +	bool "bluetooth"
> +	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils
> +	depends on !BR2_PACKAGE_BLUEZ_UTILS # bluez5_utils

You forgot to propagate the BR2_TOOLCHAIN_HAS_SYNC_4 dependency from
bluez5_utils, so I've added that and applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 23/31] package/kodi: libxslt is an optional package
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (21 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 22/31] package/kodi: add optional support for bluez5 Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29 10:04   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 24/31] package/kodi: add optional support for pulseaudio Bernd Kuhls
                   ` (10 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

After this commit
https://github.com/xbmc/xbmc/commit/bad3902b4a2538a433f858c97b2cf91c44c7feff
libxslt, together with libxml2, are an optional package.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi/Config.in | 2 --
 package/kodi/kodi.mk   | 9 +++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 5dd0d06bf9..5dd41652a2 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -64,8 +64,6 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL_EGL
 	select BR2_PACKAGE_LIBPLIST
 	select BR2_PACKAGE_LIBSAMPLERATE
-	select BR2_PACKAGE_LIBXML2
-	select BR2_PACKAGE_LIBXSLT
 	select BR2_PACKAGE_LZO
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_OPENSSL
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 3a10a524e3..3a8f08d449 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -33,8 +33,6 @@ KODI_DEPENDENCIES = \
 	libfribidi \
 	libplist \
 	libsamplerate \
-	libxml2 \
-	libxslt \
 	lzo \
 	ncurses \
 	openssl \
@@ -185,6 +183,13 @@ else
 KODI_CONF_OPTS += -DENABLE_CAP=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_LIBXML2)$(BR2_PACKAGE_LIBXSLT),yy)
+KODI_CONF_OPTS += -DENABLE_XSLT=ON
+KODI_DEPENDENCIES += libxml2 libxslt
+else
+KODI_CONF_OPTS += -DENABLE_XSLT=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_KODI_BLUEZ),y)
 KODI_CONF_OPTS += -DENABLE_BLUETOOTH=ON
 KODI_DEPENDENCIES += bluez5_utils
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 23/31] package/kodi: libxslt is an optional package
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 23/31] package/kodi: libxslt is an optional package Bernd Kuhls
@ 2017-04-29 10:04   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 10:04 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:43 +0200, Bernd Kuhls wrote:
> After this commit
> https://github.com/xbmc/xbmc/commit/bad3902b4a2538a433f858c97b2cf91c44c7feff
> libxslt, together with libxml2, are an optional package.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/kodi/Config.in | 2 --
>  package/kodi/kodi.mk   | 9 +++++++--
>  2 files changed, 7 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 24/31] package/kodi: add optional support for pulseaudio
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (22 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 23/31] package/kodi: libxslt is an optional package Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29 10:05   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 25/31] package/kodi: add optional support for event clients Bernd Kuhls
                   ` (9 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi/Config.in | 10 ++++++++++
 package/kodi/kodi.mk   |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 5dd41652a2..6768533d0c 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -178,6 +178,16 @@ config BR2_PACKAGE_KODI_NONFREE
 	  Enable components with non-free licenses. This option
 	  currently only controls support for RAR archives.
 
+config BR2_PACKAGE_KODI_PULSEAUDIO
+	bool "pulseaudio"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
+	# Kodi meets all dependencies of libglib2, so there is no need
+	# to propagate its dependencies here.
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_PULSEAUDIO
+	help
+	  Enable Pulseaudio support.
+
 config BR2_PACKAGE_KODI_LIBSHAIRPLAY
 	bool "shairport"
 	select BR2_PACKAGE_LIBSHAIRPLAY
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 3a8f08d449..483f798b2e 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -320,6 +320,13 @@ else
 KODI_CONF_OPTS += -DENABLE_OPTICAL=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_KODI_PULSEAUDIO),y)
+KODI_CONF_OPTS += -DENABLE_PULSEAUDIO=ON
+KODI_DEPENDENCIES += pulseaudio
+else
+KODI_CONF_OPTS += -DENABLE_PULSEAUDIO=OFF
+endif
+
 # Remove versioncheck addon, updating Kodi is done by building a new
 # buildroot image.
 KODI_ADDON_MANIFEST = $(TARGET_DIR)/usr/share/kodi/system/addon-manifest.xml
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 24/31] package/kodi: add optional support for pulseaudio
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 24/31] package/kodi: add optional support for pulseaudio Bernd Kuhls
@ 2017-04-29 10:05   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 10:05 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:44 +0200, Bernd Kuhls wrote:

> +config BR2_PACKAGE_KODI_PULSEAUDIO
> +	bool "pulseaudio"
> +	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
> +	# Kodi meets all dependencies of libglib2, so there is no need
> +	# to propagate its dependencies here.
> +	select BR2_PACKAGE_LIBGLIB2

There needs to be an explanation why libglib2 is selected here, but not
in the KODI_DEPENDENCIES variable. I guess it's because you need glib2
support in pulseaudio, but that should be explained by a comment
because it's not very obvious.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 25/31] package/kodi: add optional support for event clients
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (23 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 24/31] package/kodi: add optional support for pulseaudio Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29 10:06   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 26/31] package/kodi: add optional support for lcms2 Bernd Kuhls
                   ` (8 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

For details read
https://github.com/xbmc/xbmc/blob/master/tools/EventClients/README.txt

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi/Config.in | 7 +++++++
 package/kodi/kodi.mk   | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 6768533d0c..e30a57b33d 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -125,6 +125,13 @@ config BR2_PACKAGE_KODI_DBUS
 	help
 	  Enable D-Bus support
 
+config BR2_PACKAGE_KODI_EVENTCLIENTS
+	bool "eventclients"
+	help
+	  Enable event clients support
+
+	  https://github.com/xbmc/xbmc/blob/master/tools/EventClients/README.txt
+
 config BR2_PACKAGE_KODI_LIBBLURAY
 	bool "blu-ray"
 	select BR2_PACKAGE_LIBBLURAY
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 483f798b2e..330ae43c00 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -204,6 +204,12 @@ else
 KODI_CONF_OPTS += -DENABLE_DBUS=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_KODI_EVENTCLIENTS),y)
+KODI_CONF_OPTS += -DENABLE_EVENTCLIENTS=ON
+else
+KODI_CONF_OPTS += -DENABLE_EVENTCLIENTS=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_KODI_ALSA_LIB),y)
 KODI_CONF_OPTS += -DENABLE_ALSA=ON
 KODI_DEPENDENCIES += alsa-lib
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 25/31] package/kodi: add optional support for event clients
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 25/31] package/kodi: add optional support for event clients Bernd Kuhls
@ 2017-04-29 10:06   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 10:06 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:45 +0200, Bernd Kuhls wrote:
> For details read
> https://github.com/xbmc/xbmc/blob/master/tools/EventClients/README.txt
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/kodi/Config.in | 7 +++++++
>  package/kodi/kodi.mk   | 6 ++++++
>  2 files changed, 13 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 26/31] package/kodi: add optional support for lcms2
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (24 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 25/31] package/kodi: add optional support for event clients Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29 10:06   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 27/31] package/kodi-inputstream-rtmp: new package Bernd Kuhls
                   ` (7 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Support was added by https://github.com/xbmc/xbmc/pull/11846

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi/Config.in | 6 ++++++
 package/kodi/kodi.mk   | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index e30a57b33d..2e1a2ba994 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -150,6 +150,12 @@ config BR2_PACKAGE_KODI_LIBCEC
 comment "hdmi cec support needs udev /dev management"
 	depends on !BR2_PACKAGE_HAS_UDEV
 
+config BR2_PACKAGE_KODI_LCMS2
+	bool "lcms2"
+	select BR2_PACKAGE_LCMS2
+	help
+	  Enable color management support.
+
 config BR2_PACKAGE_KODI_LIRC
 	bool "lirc"
 	help
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 330ae43c00..dea4d4c97a 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -289,6 +289,13 @@ else
 KODI_CONF_OPTS += -DENABLE_CEC=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_KODI_LCMS2),y)
+KODI_DEPENDENCIES += lcms2
+KODI_CONF_OPTS += -DENABLE_LCMS2=ON
+else
+KODI_CONF_OPTS += -DENABLE_LCMS2=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_KODI_LIRC),y)
 KODI_CONF_OPTS += -DENABLE_LIRC=ON
 else
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 26/31] package/kodi: add optional support for lcms2
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 26/31] package/kodi: add optional support for lcms2 Bernd Kuhls
@ 2017-04-29 10:06   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 10:06 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:46 +0200, Bernd Kuhls wrote:
> Support was added by https://github.com/xbmc/xbmc/pull/11846
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/kodi/Config.in | 6 ++++++
>  package/kodi/kodi.mk   | 7 +++++++
>  2 files changed, 13 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 27/31] package/kodi-inputstream-rtmp: new package
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (25 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 26/31] package/kodi: add optional support for lcms2 Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 28/31] package/kodi-inputstream-adaptive: " Bernd Kuhls
                   ` (6 subsequent siblings)
  33 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Select the new package by the legacy option for easier update.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 Config.in.legacy                                         |  1 +
 package/kodi-inputstream-rtmp/Config.in                  |  7 +++++++
 package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash |  2 ++
 package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk   | 13 +++++++++++++
 package/kodi/Config.in                                   |  4 ++++
 5 files changed, 27 insertions(+)
 create mode 100644 package/kodi-inputstream-rtmp/Config.in
 create mode 100644 package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
 create mode 100644 package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 6b038dba2c..cfdcd193eb 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -148,6 +148,7 @@ comment "Legacy options removed in 2017.05"
 config BR2_PACKAGE_KODI_RTMPDUMP
 	bool "kodi rtmp"
 	select BR2_LEGACY
+	select BR2_PACKAGE_KODI_INPUTSTREAM_RTMP
 	help
 	  Internal rtmp support was removed from Kodi.
 
diff --git a/package/kodi-inputstream-rtmp/Config.in b/package/kodi-inputstream-rtmp/Config.in
new file mode 100644
index 0000000000..c40bff2d7e
--- /dev/null
+++ b/package/kodi-inputstream-rtmp/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_INPUTSTREAM_RTMP
+	bool "kodi-inputstream-rtmp"
+	select BR2_PACKAGE_RTMPDUMP
+	help
+	  RTMP input stream add-on for Kodi
+
+	  https://github.com/notspiff/inputstream.rtmp
diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
new file mode 100644
index 0000000000..f5a82d2aae
--- /dev/null
+++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 75a3cc87243a7c92a0a2e3f16710a1e60d05cd8dbc8b7fd1852244fbc5da2ae8  kodi-inputstream-rtmp-v1.0.4.tar.gz
diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
new file mode 100644
index 0000000000..414c8dfc39
--- /dev/null
+++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# kodi-inputstream-rtmp
+#
+################################################################################
+
+KODI_INPUTSTREAM_RTMP_VERSION = v1.0.4
+KODI_INPUTSTREAM_RTMP_SITE = $(call github,notspiff,inputstream.rtmp,$(KODI_INPUTSTREAM_RTMP_VERSION))
+KODI_INPUTSTREAM_RTMP_LICENSE = GPLv2+
+KODI_INPUTSTREAM_RTMP_LICENSE_FILES = src/RTMPStream.cpp
+KODI_INPUTSTREAM_RTMP_DEPENDENCIES = kodi rtmpdump
+
+$(eval $(cmake-package))
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 2e1a2ba994..ed8fa75690 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -290,6 +290,10 @@ menu "Audio encoder addons"
 	source "package/kodi-audioencoder-wav/Config.in"
 endmenu
 
+menu "Inputstream addons"
+	source "package/kodi-inputstream-rtmp/Config.in"
+endmenu
+
 menu "PVR addons"
 	source "package/kodi-pvr-argustv/Config.in"
 	source "package/kodi-pvr-dvblink/Config.in"
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 28/31] package/kodi-inputstream-adaptive: new package
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (26 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 27/31] package/kodi-inputstream-rtmp: new package Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 29/31] package/libsquish: Remove Kodi-specific patch Bernd Kuhls
                   ` (5 subsequent siblings)
  33 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-inputstream-adaptive/Config.in                 |  8 ++++++++
 .../kodi-inputstream-adaptive.hash                          |  2 ++
 .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk  | 13 +++++++++++++
 package/kodi/Config.in                                      |  1 +
 4 files changed, 24 insertions(+)
 create mode 100644 package/kodi-inputstream-adaptive/Config.in
 create mode 100644 package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
 create mode 100644 package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk

diff --git a/package/kodi-inputstream-adaptive/Config.in b/package/kodi-inputstream-adaptive/Config.in
new file mode 100644
index 0000000000..d5fe5e61cc
--- /dev/null
+++ b/package/kodi-inputstream-adaptive/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE
+	bool "kodi-inputstream-adaptive"
+	select BR2_PACKAGE_LIBPLATFORM
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Kodi inputstream addon for several manifest types
+
+	  https://github.com/peak3d/inputstream.adaptive
diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
new file mode 100644
index 0000000000..d3600eb197
--- /dev/null
+++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 7e3fbb9bac11777b2f553fce0f36f2dd463adbb956a957e6c000c7013202b9ad  kodi-inputstream-adaptive-v1.0.6.tar.gz
diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
new file mode 100644
index 0000000000..bd3c34c0c9
--- /dev/null
+++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# kodi-inputstream-adaptive
+#
+################################################################################
+
+KODI_INPUTSTREAM_ADAPTIVE_VERSION = v1.0.6
+KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION))
+KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPLv2+
+KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = src/main.cpp
+KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = libplatform kodi-platform
+
+$(eval $(cmake-package))
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index ed8fa75690..f274019e99 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -291,6 +291,7 @@ menu "Audio encoder addons"
 endmenu
 
 menu "Inputstream addons"
+	source "package/kodi-inputstream-adaptive/Config.in"
 	source "package/kodi-inputstream-rtmp/Config.in"
 endmenu
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 29/31] package/libsquish: Remove Kodi-specific patch
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (27 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 28/31] package/kodi-inputstream-adaptive: " Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29 10:14   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 30/31] package/libsquish: bump version to 1.15 Bernd Kuhls
                   ` (4 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Kodi 17 does not depend on libsquish anymore:
https://github.com/xbmc/xbmc/commit/ed03f828be3615d294eb4a4cfccc5cdccec22997

We can therefore remove the patch which was needed for Kodi <= 16.x.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/libsquish/0001-kodi.patch | 327 --------------------------------------
 1 file changed, 327 deletions(-)
 delete mode 100644 package/libsquish/0001-kodi.patch

diff --git a/package/libsquish/0001-kodi.patch b/package/libsquish/0001-kodi.patch
deleted file mode 100644
index a9bca66904..0000000000
--- a/package/libsquish/0001-kodi.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-Add Kodi-specific patch
-
-Kodi 15.0 contains an updated version of libsquish:
-https://github.com/xbmc/xbmc/tree/master/tools/depends/native/libsquish-native
-
-The OpenElec project provides a separate tarball including the Kodi-
-specific patches:
-http://sources.openelec.tv/devel/libsquish-1.10-openelec.tar.gz
-
-This patch contains the relevant diff between upstream libsquish 1.13
-and the OpenElec tarball.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uwNr 1.13/squish.cpp libsquish-1.10-openelec/squish.cpp
---- 1.13/squish.cpp	2015-04-30 12:48:49.000000000 +0200
-+++ libsquish-1.10-openelec/squish.cpp	2015-01-09 10:58:43.000000000 +0100
-@@ -23,6 +23,7 @@
- 
-    -------------------------------------------------------------------------- */
- 
-+#include <string.h>
- #include <squish.h>
- #include "colourset.h"
- #include "maths.h"
-@@ -39,7 +40,7 @@
-     // grab the flag bits
-     int method = flags & ( kDxt1 | kDxt3 | kDxt5 );
-     int fit = flags & ( kColourIterativeClusterFit | kColourClusterFit | kColourRangeFit );
--    int extra = flags & kWeightColourByAlpha;
-+	int extra = flags & ( kWeightColourByAlpha | kSourceBGRA );
- 
-     // set defaults
-     if( method != kDxt3 && method != kDxt5 )
-@@ -124,8 +125,30 @@
-     return blockcount*blocksize;
- }
- 
-+void CopyRGBA( u8 const* source, u8* dest, int flags )
-+{
-+	if (flags & kSourceBGRA)
-+	{
-+		// convert from bgra to rgba
-+		dest[0] = source[2];
-+		dest[1] = source[1];
-+		dest[2] = source[0];
-+		dest[3] = source[3];
-+	}
-+	else
-+	{
-+		for( int i = 0; i < 4; ++i )
-+			*dest++ = *source++;
-+	}
-+}
-+
- void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric )
- {
-+	CompressImage(rgba, width, height, width*4, blocks, flags, metric);
-+}
-+  
-+void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric )
-+{
-     // fix any bad flags
-     flags = FixFlags( flags );
- 
-@@ -154,20 +177,14 @@
-                     if( sx < width && sy < height )
-                     {
-                         // copy the rgba value
--                        u8 const* sourcePixel = rgba + 4*( width*sy + sx );
--                        for( int i = 0; i < 4; ++i )
--                            *targetPixel++ = *sourcePixel++;
--
-+						u8 const* sourcePixel = rgba + pitch*sy + 4*sx;
-+						CopyRGBA(sourcePixel, targetPixel, flags);
-                         // enable this pixel
-                         mask |= ( 1 << ( 4*py + px ) );
-                     }
--                    else
--                    {
--                        // skip this pixel as its outside the image
-                         targetPixel += 4;
-                     }
-                 }
--            }
- 
-             // compress it into the output
-             CompressMasked( sourceRgba, mask, targetBlock, flags, metric );
-@@ -180,6 +197,11 @@
- 
- void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags )
- {
-+	DecompressImage( rgba, width, height, width*4, blocks, flags );
-+}
-+
-+void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags )
-+{
-     // fix any bad flags
-     flags = FixFlags( flags );
- 
-@@ -207,24 +229,132 @@
-                     int sy = y + py;
-                     if( sx < width && sy < height )
-                     {
--                        u8* targetPixel = rgba + 4*( width*sy + sx );
-+						u8* targetPixel = rgba + pitch*sy + 4*sx;
- 
-                         // copy the rgba value
-+						CopyRGBA(sourcePixel, targetPixel, flags);
-+					}
-+					sourcePixel += 4;
-+				}
-+			}
-+			
-+			// advance
-+			sourceBlock += bytesPerBlock;
-+		}
-+	}
-+}
-+
-+static double ErrorSq(double x, double y)
-+{
-+	return (x - y) * (x - y);
-+}
-+
-+static void ComputeBlockWMSE(u8 const *original, u8 const *compressed, unsigned int w, unsigned int h, double &cmse, double &amse)
-+{
-+	// Computes the MSE for the block and weights it by the variance of the original block.
-+	// If the variance of the original block is less than 4 (i.e. a standard deviation of 1 per channel)
-+	// then the block is close to being a single colour. Quantisation errors in single colour blocks
-+	// are easier to see than similar errors in blocks that contain more colours, particularly when there
-+	// are many such blocks in a large area (eg a blue sky background) as they cause banding.  Given that
-+	// banding is easier to see than small errors in "complex" blocks, we weight the errors by a factor
-+	// of 5. This implies that images with large, single colour areas will have a higher potential WMSE
-+	// than images with lots of detail.
-+
-+	cmse = amse = 0;
-+	unsigned int sum_p[4];  // per channel sum of pixels
-+	unsigned int sum_p2[4]; // per channel sum of pixels squared
-+	memset(sum_p, 0, sizeof(sum_p));
-+	memset(sum_p2, 0, sizeof(sum_p2));
-+	for( unsigned int py = 0; py < 4; ++py )
-+	{
-+		for( unsigned int px = 0; px < 4; ++px )
-+		{
-+			if( px < w && py < h )
-+			{
-+				double pixelCMSE = 0;
-+				for( int i = 0; i < 3; ++i )
-+				{
-+					pixelCMSE += ErrorSq(original[i], compressed[i]);
-+					sum_p[i] += original[i];
-+					sum_p2[i] += (unsigned int)original[i]*original[i];
-+				}
-+				if( original[3] == 0 && compressed[3] == 0 )
-+					pixelCMSE = 0; // transparent in both, so colour is inconsequential
-+				amse += ErrorSq(original[3], compressed[3]);
-+				cmse += pixelCMSE;
-+				sum_p[3] += original[3];
-+				sum_p2[3] += (unsigned int)original[3]*original[3];
-+			}
-+			original += 4;
-+			compressed += 4;
-+		}
-+	}
-+	unsigned int variance = 0;
-                         for( int i = 0; i < 4; ++i )
--                            *targetPixel++ = *sourcePixel++;
-+		variance += w*h*sum_p2[i] - sum_p[i]*sum_p[i];
-+	if( variance < 4 * w * w * h * h )
-+	{
-+		amse *= 5;
-+		cmse *= 5;
-                     }
--                    else
-+}
-+  
-+void ComputeMSE( u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE )
-                     {
--                        // skip this pixel as its outside the image
--                        sourcePixel += 4;
-+	ComputeMSE(rgba, width, height, width*4, dxt, flags, colourMSE, alphaMSE);
-+}
-+                
-+void ComputeMSE( u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE )
-+{
-+	// fix any bad flags
-+	flags = FixFlags( flags );
-+	colourMSE = alphaMSE = 0;
-+
-+	// initialise the block input
-+	squish::u8 const* sourceBlock = dxt;
-+	int bytesPerBlock = ( ( flags & squish::kDxt1 ) != 0 ) ? 8 : 16;
-+
-+	// loop over blocks
-+	for( int y = 0; y < height; y += 4 )
-+	{
-+		for( int x = 0; x < width; x += 4 )
-+		{
-+			// decompress the block
-+			u8 targetRgba[4*16];
-+			Decompress( targetRgba, sourceBlock, flags );
-+			u8 const* sourcePixel = targetRgba;
-+
-+			// copy across to a similar pixel block
-+			u8 originalRgba[4*16];
-+			u8* originalPixel = originalRgba;
-+
-+			for( int py = 0; py < 4; ++py )
-+			{
-+				for( int px = 0; px < 4; ++px )
-+				{
-+					int sx = x + px;
-+					int sy = y + py;
-+					if( sx < width && sy < height )
-+					{
-+						u8 const* targetPixel = rgba + pitch*sy + 4*sx;
-+						CopyRGBA(targetPixel, originalPixel, flags);
-                     }
-+					sourcePixel += 4;
-+					originalPixel += 4;
-                 }
-             }
- 
-+			// compute the weighted MSE of the block
-+			double blockCMSE, blockAMSE;
-+			ComputeBlockWMSE(originalRgba, targetRgba, std::min(4, width - x), std::min(4, height - y), blockCMSE, blockAMSE);
-+			colourMSE += blockCMSE;
-+			alphaMSE += blockAMSE;
-             // advance
-             sourceBlock += bytesPerBlock;
-         }
-     }
-+	colourMSE /= (width * height * 3);
-+	alphaMSE /= (width * height);
- }
- 
- } // namespace squish
-diff -uwNr 1.13/squish.h libsquish-1.10-openelec/squish.h
---- 1.13/squish.h	2015-04-30 12:55:27.000000000 +0200
-+++ libsquish-1.10-openelec/squish.h	2015-01-09 10:58:43.000000000 +0100
-@@ -57,7 +57,10 @@
-     kColourRangeFit = ( 1 << 4 ),
- 
-     //! Weight the colour by alpha during cluster fit (disabled by default).
--    kWeightColourByAlpha = ( 1 << 7 )
-+	kWeightColourByAlpha = ( 1 << 7 ),
-+	
-+	//! Source is BGRA rather than RGBA
-+	kSourceBGRA = ( 1 << 9 ),
- };
- 
- // -----------------------------------------------------------------------------
-@@ -194,6 +197,7 @@
-     @param rgba   The pixels of the source.
-     @param width  The width of the source image.
-     @param height The height of the source image.
-+	@param pitch	The pitch of the source image.
-     @param blocks Storage for the compressed output.
-     @param flags  Compression flags.
-     @param metric An optional perceptual metric.
-@@ -231,6 +235,7 @@
-     to allocate for the compressed output.
- */
- void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric = 0 );
-+void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric = 0 );
- 
- // -----------------------------------------------------------------------------
- 
-@@ -239,6 +244,7 @@
-     @param rgba   Storage for the decompressed pixels.
-     @param width  The width of the source image.
-     @param height The height of the source image.
-+	@param pitch    The pitch of the decompressed pixels.
-     @param blocks The compressed DXT blocks.
-     @param flags  Compression flags.
- 
-@@ -254,6 +260,32 @@
-     Internally this function calls squish::Decompress for each block.
- */
- void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags );
-+void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags );
-+
-+// -----------------------------------------------------------------------------
-+
-+/*! @brief Computes MSE of an compressed image in memory.
-+
-+	@param rgba		The original image pixels.
-+	@param width	The width of the source image.
-+	@param height	The height of the source image.
-+	@param pitch  	The pitch of the source image.
-+	@param dxt		The compressed dxt blocks
-+	@param flags	Compression flags.
-+	@param colourMSE	The MSE of the colour values.
-+	@param alphaMSE	The MSE of the alpha values.
-+	
-+	The colour MSE and alpha MSE are computed across all pixels. The colour MSE is
-+	averaged across all rgb values (i.e. colourMSE = sum sum_k ||dxt.k - rgba.k||/3)
-+	
-+	The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, 
-+	however, DXT1 will be used by default if none is specified. All other flags 
-+	are ignored.
-+
-+	Internally this function calls squish::Decompress for each block.
-+*/
-+void ComputeMSE(u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
-+void ComputeMSE(u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
- 
- // -----------------------------------------------------------------------------
- 
-diff -uwNr 1.13/squish.pc.in libsquish-1.10-openelec/squish.pc.in
---- 1.13/squish.pc	1970-01-01 01:00:00.000000000 +0100
-+++ libsquish-1.10-openelec/squish.pc	2015-01-09 10:58:43.000000000 +0100
-@@ -0,0 +1,13 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+sharedlibdir=${libdir}
-+includedir=${prefix}/include
-+
-+Name: squish
-+Description: squish DXT lib
-+Version: 1.1.3-kodi
-+
-+Requires:
-+Libs: -L${libdir} -L${sharedlibdir} -lsquish
-+Cflags: -I${includedir}
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 29/31] package/libsquish: Remove Kodi-specific patch
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 29/31] package/libsquish: Remove Kodi-specific patch Bernd Kuhls
@ 2017-04-29 10:14   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 10:14 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:49 +0200, Bernd Kuhls wrote:
> Kodi 17 does not depend on libsquish anymore:
> https://github.com/xbmc/xbmc/commit/ed03f828be3615d294eb4a4cfccc5cdccec22997
> 
> We can therefore remove the patch which was needed for Kodi <= 16.x.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/libsquish/0001-kodi.patch | 327 --------------------------------------
>  1 file changed, 327 deletions(-)
>  delete mode 100644 package/libsquish/0001-kodi.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 30/31] package/libsquish: bump version to 1.15
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (28 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 29/31] package/libsquish: Remove Kodi-specific patch Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29 10:14   ` Thomas Petazzoni
  2017-04-29 13:44   ` Thomas Petazzoni
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 31/31] package/kodi: Add support for more archs Bernd Kuhls
                   ` (3 subsequent siblings)
  33 siblings, 2 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

Added md5 hash provided by upstream.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/libsquish/libsquish.hash | 3 ++-
 package/libsquish/libsquish.mk   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/libsquish/libsquish.hash b/package/libsquish/libsquish.hash
index caa7198642..e68d28d66f 100644
--- a/package/libsquish/libsquish.hash
+++ b/package/libsquish/libsquish.hash
@@ -1,2 +1,3 @@
 # From http://sourceforge.net/projects/libsquish/files
-sha1	7bcdd7d0f0460a29e25dcdab8dc41a30e58bb366	libsquish-1.13.tgz
+sha1 51844b9a8bc815a27e2cc0ffbede5fee3ef75110 libsquish-1.15.tgz
+md5 c02645800131e55b519ff8dbe7284f93 libsquish-1.15.tgz
diff --git a/package/libsquish/libsquish.mk b/package/libsquish/libsquish.mk
index 73f8de9cc1..a707355b55 100644
--- a/package/libsquish/libsquish.mk
+++ b/package/libsquish/libsquish.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSQUISH_VERSION = 1.13
+LIBSQUISH_VERSION = 1.15
 LIBSQUISH_SOURCE = libsquish-$(LIBSQUISH_VERSION).tgz
 LIBSQUISH_SITE = http://downloads.sourceforge.net/project/libsquish
 LIBSQUISH_INSTALL_STAGING = YES
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 30/31] package/libsquish: bump version to 1.15
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 30/31] package/libsquish: bump version to 1.15 Bernd Kuhls
@ 2017-04-29 10:14   ` Thomas Petazzoni
  2017-04-29 13:44   ` Thomas Petazzoni
  1 sibling, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 10:14 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:50 +0200, Bernd Kuhls wrote:
> Added md5 hash provided by upstream.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/libsquish/libsquish.hash | 3 ++-
>  package/libsquish/libsquish.mk   | 2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 30/31] package/libsquish: bump version to 1.15
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 30/31] package/libsquish: bump version to 1.15 Bernd Kuhls
  2017-04-29 10:14   ` Thomas Petazzoni
@ 2017-04-29 13:44   ` Thomas Petazzoni
  2017-04-29 13:46     ` Bernd Kuhls
  1 sibling, 1 reply; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 13:44 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:50 +0200, Bernd Kuhls wrote:
> Added md5 hash provided by upstream.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/libsquish/libsquish.hash | 3 ++-
>  package/libsquish/libsquish.mk   | 2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)

This patch causes a build failure:
http://autobuild.buildroot.net/results/04c/04c30f9a425d10111974a315a6d7474e243cbbd3/build-end.log.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 30/31] package/libsquish: bump version to 1.15
  2017-04-29 13:44   ` Thomas Petazzoni
@ 2017-04-29 13:46     ` Bernd Kuhls
  0 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29 13:46 UTC (permalink / raw)
  To: buildroot

Am Sat, 29 Apr 2017 15:44:29 +0200 schrieb Thomas Petazzoni:

> Hello,
> 
> On Sat, 29 Apr 2017 10:37:50 +0200, Bernd Kuhls wrote:
>> Added md5 hash provided by upstream.
>> 
>> Signed-off-by: Bernd Kuhls
>> <bernd.kuhls@t-online.de>
>> ---
>>  package/libsquish/libsquish.hash | 3 ++-
>>  package/libsquish/libsquish.mk   | 2 +-
>>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> This patch causes a build failure:
> http://autobuild.buildroot.net/
results/04c/04c30f9a425d10111974a315a6d7474e243cbbd3/build-end.log.
> 
> Best regards,
> 
> Thomas

Hi Thomas,

patch sent: http://patchwork.ozlabs.org/patch/756745/

Regards, Bernd

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 31/31] package/kodi: Add support for more archs
  2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
                   ` (29 preceding siblings ...)
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 30/31] package/libsquish: bump version to 1.15 Bernd Kuhls
@ 2017-04-29  8:37 ` Bernd Kuhls
  2017-04-29 11:44   ` Thomas Petazzoni
       [not found] ` <fe62a0d1-d466-2d4d-22c4-d5165882dc7b@t-online.de>
                   ` (2 subsequent siblings)
  33 siblings, 1 reply; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29  8:37 UTC (permalink / raw)
  To: buildroot

For the autoconf-based build system it was necessary to allow each
supported architecture separatly:
https://github.com/xbmc/xbmc/blob/Krypton/m4/xbmc_arch.m4

For the CMake build system this is not necessary anymore so we only
blacklist archs in Config.in known to be broken.

Tested with testpkg using this defconfig:

BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_KODI=y
BR2_PACKAGE_KODI_ALSA_LIB=y
BR2_PACKAGE_KODI_EVENTCLIENTS=y
BR2_PACKAGE_KODI_LIBBLURAY=y
BR2_PACKAGE_KODI_LIBCEC=y
BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE=y
BR2_PACKAGE_KODI_INPUTSTREAM_RTMP=y
BR2_PACKAGE_KODI_PVR_HTS=y
BR2_PACKAGE_KODI_SCREENSAVER_RSXS=y
BR2_PACKAGE_KODI_VISUALISATION_GOOM=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_PYTHON_PY_ONLY=y

with this result:

                armv5-ctng-linux-gnueabi [ 1/49]: OK
              armv7-ctng-linux-gnueabihf [ 2/49]: OK
                        br-aarch64-glibc [ 3/49]: OK
                           br-arcle-hs38 [ 4/49]: OK
                            br-arm-basic [ 5/49]: SKIPPED
                  br-arm-cortex-a9-glibc [ 6/49]: OK
                   br-arm-cortex-a9-musl [ 7/49]: SKIPPED
                   br-arm-cortex-m4-full [ 8/49]: SKIPPED
                             br-arm-full [ 9/49]: OK
                    br-arm-full-nothread [10/49]: SKIPPED
                      br-arm-full-static [11/49]: SKIPPED
                            br-bfin-full [12/49]: SKIPPED
                   br-i386-pentium4-full [13/49]: OK
                br-i386-pentium-mmx-musl [14/49]: SKIPPED
                       br-m68k-5208-full [15/49]: SKIPPED
                      br-m68k-68040-full [16/49]: SKIPPED
                    br-microblazeel-full [17/49]: SKIPPED
                 br-mips32r6-el-hf-glibc [18/49]: OK
                      br-mips64-n64-full [19/49]: OK
                 br-mips64r6-el-hf-glibc [20/49]: OK
                      br-mipsel-o32-full [21/49]: OK
                          br-nios2-glibc [22/49]: SKIPPED
                      br-openrisc-uclibc [23/49]: SKIPPED
               br-powerpc-603e-basic-cpp [24/49]: SKIPPED
             br-powerpc64le-power8-glibc [25/49]: OK
               br-powerpc64-power7-glibc [26/49]: OK
                  br-powerpc-e500mc-full [27/49]: OK
                             br-sh4-full [28/49]: OK
                        br-sparc64-glibc [29/49]: OK
                         br-sparc-uclibc [30/49]: SKIPPED
                    br-x86-64-core2-full [31/49]: OK
                          br-x86-64-musl [32/49]: SKIPPED
                          br-xtensa-full [33/49]: OK
                     i686-ctng-linux-gnu [34/49]: SKIPPED
                          linaro-aarch64 [35/49]: OK
                              linaro-arm [36/49]: OK
             mips64el-ctng_n32-linux-gnu [37/49]: OK
             mips64el-ctng_n64-linux-gnu [38/49]: OK
        powerpc-ctng_e500v2-linux-gnuspe [39/49]: SKIPPED
                     sourcery-arm-armv4t [40/49]: OK
                            sourcery-arm [41/49]: OK
                     sourcery-arm-thumb2 [42/49]: OK
                         sourcery-mips64 [43/49]: OK
                           sourcery-mips [44/49]: OK
                          sourcery-nios2 [45/49]: SKIPPED
                             sourcery-sh [46/49]: SKIPPED
                         sourcery-x86-64 [47/49]: OK
                            sourcery-x86 [48/49]: SKIPPED
           x86_64-ctng_locales-linux-gnu [49/49]: OK
49 builds, 20 skipped, 0 build failed, 0 legal-info failed

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/kodi-pvr-mediaportal-tvserver/Config.in |   2 +
 package/kodi/0003-Add-support-for-sh4.patch     | 108 ++++++++++++++++++++++++
 package/kodi/0004-Add-support-for-sparc.patch   |  91 ++++++++++++++++++++
 package/kodi/0005-Add-support-for-arc.patch     |  91 ++++++++++++++++++++
 package/kodi/0006-Add-support-for-xtensa.patch  |  91 ++++++++++++++++++++
 package/kodi/Config.in                          |   6 +-
 package/kodi/kodi.mk                            |  51 ++++++++---
 7 files changed, 424 insertions(+), 16 deletions(-)
 create mode 100644 package/kodi/0003-Add-support-for-sh4.patch
 create mode 100644 package/kodi/0004-Add-support-for-sparc.patch
 create mode 100644 package/kodi/0005-Add-support-for-arc.patch
 create mode 100644 package/kodi/0006-Add-support-for-xtensa.patch

diff --git a/package/kodi-pvr-mediaportal-tvserver/Config.in b/package/kodi-pvr-mediaportal-tvserver/Config.in
index 733ca8859e..ff93c249b1 100644
--- a/package/kodi-pvr-mediaportal-tvserver/Config.in
+++ b/package/kodi-pvr-mediaportal-tvserver/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_KODI_PVR_MEDIAPORTAL_TVSERVER
 	bool "kodi-pvr-mediaportal-tvserver"
+	# ARC toolchain lacks xlocale.h
+	depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
 	select BR2_PACKAGE_KODI_PLATFORM
 	help
 	  MediaPortal TVServer PVR client addon for Kodi
diff --git a/package/kodi/0003-Add-support-for-sh4.patch b/package/kodi/0003-Add-support-for-sh4.patch
new file mode 100644
index 0000000000..8e0d2e2af0
--- /dev/null
+++ b/package/kodi/0003-Add-support-for-sh4.patch
@@ -0,0 +1,108 @@
+From 61c13c85d4dad978f793d0e3b75e99d95bc226c3 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Wed, 26 Apr 2017 22:34:40 +0200
+Subject: [PATCH] Add support for sh4
+
+This commit fixes Kodi build with a buildroot toolchain for sh4, also
+rewrap code to prepare for more platforms.
+
+Patch sent upstream as PR 12015.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ xbmc/cores/DllLoader/DllLoader.h                        | 7 ++++++-
+ xbmc/cores/DllLoader/ldt_keeper.c                       | 7 ++++++-
+ xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h | 8 +++++++-
+ xbmc/threads/Atomics.cpp                                | 6 +++++-
+ xbmc/utils/MathUtils.h                                  | 3 ++-
+ 5 files changed, 26 insertions(+), 5 deletions(-)
+
+diff --git a/xbmc/cores/DllLoader/DllLoader.h b/xbmc/cores/DllLoader/DllLoader.h
+index eb3c54c96b..f05c195b89 100644
+--- a/xbmc/cores/DllLoader/DllLoader.h
++++ b/xbmc/cores/DllLoader/DllLoader.h
+@@ -23,7 +23,12 @@
+ #include "coffldr.h"
+ #include "LibraryLoader.h"
+ 
+-#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__)
++#if defined(__linux__) && \
++    !defined(__powerpc__) && \
++    !defined(__arm__) && \
++    !defined(__aarch64__) && \
++    !defined(__mips__) && \
++    !defined(__SH4__)
+ #define USE_LDT_KEEPER
+ #include "ldt_keeper.h"
+ #endif
+diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c
+index 3fe68541e6..ff230d8469 100644
+--- a/xbmc/cores/DllLoader/ldt_keeper.c
++++ b/xbmc/cores/DllLoader/ldt_keeper.c
+@@ -19,7 +19,12 @@
+  */
+ 
+ //#ifndef __powerpc__
+-#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__powerpc__) && \
++    !defined(__ppc__) && \
++    !defined(__arm__) && \
++    !defined(__aarch64__) && \
++    !defined(__mips__) && \
++    !defined(__SH4__)
+ 
+ #include "ldt_keeper.h"
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+index ce3afe985b..731341ef3d 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+@@ -293,7 +293,13 @@ protected:
+ 
+ 
+ inline int NP2( unsigned x ) {
+-#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__)
++#if defined(TARGET_POSIX) && \
++    !defined(__POWERPC__) && \
++    !defined(__PPC__) && \
++    !defined(__arm__) && \
++    !defined(__aarch64__) && \
++    !defined(__mips__) && \
++    !defined(__SH4__)
+   // If there are any issues compiling this, just append a ' && 0'
+   // to the above to make it '#if defined(TARGET_POSIX) && 0'
+ 
+diff --git a/xbmc/threads/Atomics.cpp b/xbmc/threads/Atomics.cpp
+index ecba3f1081..7aaea1f2ba 100644
+--- a/xbmc/threads/Atomics.cpp
++++ b/xbmc/threads/Atomics.cpp
+@@ -106,7 +106,11 @@ long cas(volatile long *pAddr, long expectedVal, long swapVal)
+ ///////////////////////////////////////////////////////////////////////////
+ long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal)
+ {
+-#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__aarch64__)// PowerPC and ARM
++#if defined(__ppc__) || \
++    defined(__powerpc__) || \
++    defined(__arm__) || \
++    defined(__aarch64__) || \
++    defined(__SH4__)
+ // Not available/required
+ // Hack to allow compilation
+   throw "cas2 is not implemented";
+diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
+index 9ec1edba87..0be12d9abf 100644
+--- a/xbmc/utils/MathUtils.h
++++ b/xbmc/utils/MathUtils.h
+@@ -36,7 +36,8 @@
+     defined(__powerpc__) || \
+     defined(__mips__) || \
+     defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || \
++    defined(__SH4__)
+   #define DISABLE_MATHUTILS_ASM_ROUND_INT
+ #endif
+ 
+-- 
+2.11.0
+
diff --git a/package/kodi/0004-Add-support-for-sparc.patch b/package/kodi/0004-Add-support-for-sparc.patch
new file mode 100644
index 0000000000..301d11de73
--- /dev/null
+++ b/package/kodi/0004-Add-support-for-sparc.patch
@@ -0,0 +1,91 @@
+From 72ccf12d7760da4e77e70ae4cfed5caab986e8a9 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Thu, 27 Apr 2017 09:02:11 +0200
+Subject: [PATCH] Add support for sparc
+
+This commit fixes Kodi build with a buildroot toolchain for sparc.
+
+Patch sent upstream as PR 12015.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ xbmc/cores/DllLoader/DllLoader.h                        | 3 ++-
+ xbmc/cores/DllLoader/ldt_keeper.c                       | 3 ++-
+ xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h | 3 ++-
+ xbmc/threads/Atomics.cpp                                | 3 ++-
+ xbmc/utils/MathUtils.h                                  | 3 ++-
+ 5 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/xbmc/cores/DllLoader/DllLoader.h b/xbmc/cores/DllLoader/DllLoader.h
+index f05c195b89..1e51014f1a 100644
+--- a/xbmc/cores/DllLoader/DllLoader.h
++++ b/xbmc/cores/DllLoader/DllLoader.h
+@@ -28,7 +28,8 @@
+     !defined(__arm__) && \
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
+-    !defined(__SH4__)
++    !defined(__SH4__) && \
++    !defined(__sparc__)
+ #define USE_LDT_KEEPER
+ #include "ldt_keeper.h"
+ #endif
+diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c
+index ff230d8469..6aec5f8e67 100644
+--- a/xbmc/cores/DllLoader/ldt_keeper.c
++++ b/xbmc/cores/DllLoader/ldt_keeper.c
+@@ -24,7 +24,8 @@
+     !defined(__arm__) && \
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
+-    !defined(__SH4__)
++    !defined(__SH4__) && \
++    !defined(__sparc__)
+ 
+ #include "ldt_keeper.h"
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+index 731341ef3d..67da6068b6 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+@@ -299,7 +299,8 @@ inline int NP2( unsigned x ) {
+     !defined(__arm__) && \
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
+-    !defined(__SH4__)
++    !defined(__SH4__) && \
++    !defined(__sparc__)
+   // If there are any issues compiling this, just append a ' && 0'
+   // to the above to make it '#if defined(TARGET_POSIX) && 0'
+ 
+diff --git a/xbmc/threads/Atomics.cpp b/xbmc/threads/Atomics.cpp
+index 7aaea1f2ba..90aabf947b 100644
+--- a/xbmc/threads/Atomics.cpp
++++ b/xbmc/threads/Atomics.cpp
+@@ -110,7 +110,8 @@ long long cas2(volatile long long* pAddr, long long expectedVal, long long swapV
+     defined(__powerpc__) || \
+     defined(__arm__) || \
+     defined(__aarch64__) || \
+-    defined(__SH4__)
++    defined(__SH4__) || \
++    defined(__sparc__)
+ // Not available/required
+ // Hack to allow compilation
+   throw "cas2 is not implemented";
+diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
+index 0be12d9abf..873fbb8b0f 100644
+--- a/xbmc/utils/MathUtils.h
++++ b/xbmc/utils/MathUtils.h
+@@ -37,7 +37,8 @@
+     defined(__mips__) || \
+     defined(__arm__) || \
+     defined(__aarch64__) || \
+-    defined(__SH4__)
++    defined(__SH4__) || \
++    defined(__sparc__)
+   #define DISABLE_MATHUTILS_ASM_ROUND_INT
+ #endif
+ 
+-- 
+2.11.0
+
diff --git a/package/kodi/0005-Add-support-for-arc.patch b/package/kodi/0005-Add-support-for-arc.patch
new file mode 100644
index 0000000000..faa8e7d8c0
--- /dev/null
+++ b/package/kodi/0005-Add-support-for-arc.patch
@@ -0,0 +1,91 @@
+From 4e2d40e592b11380db10ff72970f2ed89206766a Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Thu, 27 Apr 2017 13:01:25 +0200
+Subject: [PATCH] Add support for arc
+
+This commit fixes Kodi build with a buildroot toolchain for arc.
+
+Patch sent upstream as PR 12015.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ xbmc/cores/DllLoader/DllLoader.h                        | 3 ++-
+ xbmc/cores/DllLoader/ldt_keeper.c                       | 3 ++-
+ xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h | 3 ++-
+ xbmc/threads/Atomics.cpp                                | 3 ++-
+ xbmc/utils/MathUtils.h                                  | 3 ++-
+ 5 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/xbmc/cores/DllLoader/DllLoader.h b/xbmc/cores/DllLoader/DllLoader.h
+index 1e51014f1a..5618445d51 100644
+--- a/xbmc/cores/DllLoader/DllLoader.h
++++ b/xbmc/cores/DllLoader/DllLoader.h
+@@ -29,7 +29,8 @@
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
+     !defined(__SH4__) && \
+-    !defined(__sparc__)
++    !defined(__sparc__) && \
++    !defined(__arc__)
+ #define USE_LDT_KEEPER
+ #include "ldt_keeper.h"
+ #endif
+diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c
+index 6aec5f8e67..a10acdb967 100644
+--- a/xbmc/cores/DllLoader/ldt_keeper.c
++++ b/xbmc/cores/DllLoader/ldt_keeper.c
+@@ -25,7 +25,8 @@
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
+     !defined(__SH4__) && \
+-    !defined(__sparc__)
++    !defined(__sparc__) && \
++    !defined(__arc__)
+ 
+ #include "ldt_keeper.h"
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+index 67da6068b6..b0cd76da45 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+@@ -300,7 +300,8 @@ inline int NP2( unsigned x ) {
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
+     !defined(__SH4__) && \
+-    !defined(__sparc__)
++    !defined(__sparc__) && \
++    !defined(__arc__)
+   // If there are any issues compiling this, just append a ' && 0'
+   // to the above to make it '#if defined(TARGET_POSIX) && 0'
+ 
+diff --git a/xbmc/threads/Atomics.cpp b/xbmc/threads/Atomics.cpp
+index 90aabf947b..0c5b13ae73 100644
+--- a/xbmc/threads/Atomics.cpp
++++ b/xbmc/threads/Atomics.cpp
+@@ -111,7 +111,8 @@ long long cas2(volatile long long* pAddr, long long expectedVal, long long swapV
+     defined(__arm__) || \
+     defined(__aarch64__) || \
+     defined(__SH4__) || \
+-    defined(__sparc__)
++    defined(__sparc__) || \
++    defined(__arc__)
+ // Not available/required
+ // Hack to allow compilation
+   throw "cas2 is not implemented";
+diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
+index 873fbb8b0f..b79be9e3d6 100644
+--- a/xbmc/utils/MathUtils.h
++++ b/xbmc/utils/MathUtils.h
+@@ -38,7 +38,8 @@
+     defined(__arm__) || \
+     defined(__aarch64__) || \
+     defined(__SH4__) || \
+-    defined(__sparc__)
++    defined(__sparc__) || \
++    defined(__arc__)
+   #define DISABLE_MATHUTILS_ASM_ROUND_INT
+ #endif
+ 
+-- 
+2.11.0
+
diff --git a/package/kodi/0006-Add-support-for-xtensa.patch b/package/kodi/0006-Add-support-for-xtensa.patch
new file mode 100644
index 0000000000..10a006b6fd
--- /dev/null
+++ b/package/kodi/0006-Add-support-for-xtensa.patch
@@ -0,0 +1,91 @@
+From 1de2a0afc083888686be6f169d1477e25ab80848 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Thu, 27 Apr 2017 16:51:36 +0200
+Subject: [PATCH] Add support for xtensa
+
+This commit fixes Kodi build with a buildroot toolchain for xtensa.
+
+Patch sent upstream as PR 12015.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ xbmc/cores/DllLoader/DllLoader.h                        | 3 ++-
+ xbmc/cores/DllLoader/ldt_keeper.c                       | 3 ++-
+ xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h | 3 ++-
+ xbmc/threads/Atomics.cpp                                | 3 ++-
+ xbmc/utils/MathUtils.h                                  | 3 ++-
+ 5 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/xbmc/cores/DllLoader/DllLoader.h b/xbmc/cores/DllLoader/DllLoader.h
+index 5618445d51..26b41e258b 100644
+--- a/xbmc/cores/DllLoader/DllLoader.h
++++ b/xbmc/cores/DllLoader/DllLoader.h
+@@ -30,7 +30,8 @@
+     !defined(__mips__) && \
+     !defined(__SH4__) && \
+     !defined(__sparc__) && \
+-    !defined(__arc__)
++    !defined(__arc__) && \
++    !defined(__xtensa__)
+ #define USE_LDT_KEEPER
+ #include "ldt_keeper.h"
+ #endif
+diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c
+index a10acdb967..83fd023196 100644
+--- a/xbmc/cores/DllLoader/ldt_keeper.c
++++ b/xbmc/cores/DllLoader/ldt_keeper.c
+@@ -26,7 +26,8 @@
+     !defined(__mips__) && \
+     !defined(__SH4__) && \
+     !defined(__sparc__) && \
+-    !defined(__arc__)
++    !defined(__arc__) && \
++    !defined(__xtensa__)
+ 
+ #include "ldt_keeper.h"
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+index b0cd76da45..32f8bc45c9 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+@@ -301,7 +301,8 @@ inline int NP2( unsigned x ) {
+     !defined(__mips__) && \
+     !defined(__SH4__) && \
+     !defined(__sparc__) && \
+-    !defined(__arc__)
++    !defined(__arc__) && \
++    !defined(__xtensa__)
+   // If there are any issues compiling this, just append a ' && 0'
+   // to the above to make it '#if defined(TARGET_POSIX) && 0'
+ 
+diff --git a/xbmc/threads/Atomics.cpp b/xbmc/threads/Atomics.cpp
+index 0c5b13ae73..7085a13882 100644
+--- a/xbmc/threads/Atomics.cpp
++++ b/xbmc/threads/Atomics.cpp
+@@ -112,7 +112,8 @@ long long cas2(volatile long long* pAddr, long long expectedVal, long long swapV
+     defined(__aarch64__) || \
+     defined(__SH4__) || \
+     defined(__sparc__) || \
+-    defined(__arc__)
++    defined(__arc__) || \
++    defined(__xtensa__)
+ // Not available/required
+ // Hack to allow compilation
+   throw "cas2 is not implemented";
+diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
+index b79be9e3d6..556787ef82 100644
+--- a/xbmc/utils/MathUtils.h
++++ b/xbmc/utils/MathUtils.h
+@@ -39,7 +39,8 @@
+     defined(__aarch64__) || \
+     defined(__SH4__) || \
+     defined(__sparc__) || \
+-    defined(__arc__)
++    defined(__arc__) || \
++    defined(__xtensa__)
+   #define DISABLE_MATHUTILS_ASM_ROUND_INT
+ #endif
+ 
+-- 
+2.11.0
+
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index f274019e99..bd2b226826 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_KODI_ARCH_SUPPORTS
 	bool
 	depends on BR2_USE_MMU # libcdio, and others
-	default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) \
-		&& BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \
-		&& BR2_TOOLCHAIN_HAS_SYNC_8
+# i386: needs sse (see upstream PR 10351)
+	default y if BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \
+		&& !(BR2_i386 && !BR2_X86_CPU_HAS_SSE)
 
 comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, locale, threads, wchar, dynamic library, gcc >= 4.8, host gcc >= 4.6"
 	depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index dea4d4c97a..c2c6f45d68 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -70,17 +70,40 @@ KODI_CONF_OPTS += \
 	-DENABLE_OPENSSL=ON \
 	-DNATIVEPREFIX=$(HOST_DIR)/usr \
 	-DDEPENDS_PATH=$(@D) \
-	-DWITH_TEXTUREPACKER=$(HOST_DIR)/usr/bin/TexturePacker
+	-DWITH_TEXTUREPACKER=$(HOST_DIR)/usr/bin/TexturePacker \
+	-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(KODI_CXX_FLAGS)"
 
-ifeq ($(BR2_arm),y)
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi
+KODI_DEPENDENCIES += rpi-userland
+ifeq ($(BR2_arm1176jzf_s)$(BR2_cortex_a7)$(BR2_cortex_a53),y)
+KODI_CONF_OPTS += -DWITH_CPU=$(BR2_GCC_TARGET_CPU)
+endif
+else  # BR2_PACKAGE_RPI_USERLAND
+ifeq ($(BR2_arceb)$(BR2_arcle),y)
+KODI_CONF_OPTS += -DWITH_ARCH=arc -DWITH_CPU=arc
+else ifeq ($(BR2_armeb),y)
 KODI_CONF_OPTS += -DWITH_ARCH=arm -DWITH_CPU=arm
-else ifeq ($(BR2_mips),y)
-KODI_CONF_OPTS += -DWITH_ARCH=mips -DWITH_CPU=mips
-else ifeq ($(BR2_i386),y)
-KODI_CONF_OPTS += -DWITH_ARCH=i486-linux -DWITH_CPU=$(BR2_GCC_TARGET_ARCH)
-else ifeq ($(BR2_x86_64),y)
-KODI_CONF_OPTS += -DWITH_ARCH=x86_64-linux -DWITH_CPU=x86_64
+else ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
+KODI_CONF_OPTS += \
+	-DWITH_ARCH=mips$(if $(BR2_ARCH_IS_64),64) \
+	-DWITH_CPU=mips$(if $(BR2_ARCH_IS_64),64)
+else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y)
+KODI_CONF_OPTS += \
+	-DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \
+	-DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64)
+else ifeq ($(BR2_powerpc64)$(BR2_sparc64),y)
+KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH)
+else ifeq ($(BR2_sh4),y)
+KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH)
+else ifeq ($(BR2_xtensa),y)
+KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH)
+else
+# Kodi auto-detects ARCH, tested: arm, aarch64, i386, x86_64
+# see project/cmake/scripts/linux/ArchSetup.cmake
+KODI_CONF_OPTS += -DWITH_CPU=$(BR2_ARCH)
 endif
+endif # !BR2_PACKAGE_RPI_USERLAND
 
 ifeq ($(BR2_X86_CPU_HAS_SSE),y)
 KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON
@@ -130,6 +153,11 @@ else
 KODI_CONF_OPTS += -D_AVX2_OK=OFF -D_AVX2_TRUE=OFF
 endif
 
+# mips: uses __atomic_load_8
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+KODI_CXX_FLAGS += -latomic
+endif
+
 ifeq ($(BR2_PACKAGE_KODI_MYSQL),y)
 KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=ON
 KODI_DEPENDENCIES += mysql
@@ -145,11 +173,8 @@ else
 KODI_CONF_OPTS += -DENABLE_NONFREE=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi
-KODI_DEPENDENCIES += rpi-userland
-else
 # these options only exist on non-rbpi systems
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),)
 KODI_CONF_OPTS += -DENABLE_LDGOLD=OFF
 ifeq ($(BR2_PACKAGE_LIBAMCODEC),y)
 KODI_CONF_OPTS += -DENABLE_AML=ON
@@ -225,7 +250,7 @@ else
 KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF
 ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y)
 KODI_DEPENDENCIES += libegl libgles
-KODI_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
+KODI_CXX_FLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
 KODI_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
 KODI_CONF_OPTS += -DENABLE_OPENGLES=ON
 else
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 31/31] package/kodi: Add support for more archs
  2017-04-29  8:37 ` [Buildroot] [PATCH v7 31/31] package/kodi: Add support for more archs Bernd Kuhls
@ 2017-04-29 11:44   ` Thomas Petazzoni
  2017-04-29 13:24     ` Bernd Kuhls
  0 siblings, 1 reply; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 11:44 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 10:37:51 +0200, Bernd Kuhls wrote:

>  package/kodi/0003-Add-support-for-sh4.patch     | 108 ++++++++++++++++++++++++
>  package/kodi/0004-Add-support-for-sparc.patch   |  91 ++++++++++++++++++++
>  package/kodi/0005-Add-support-for-arc.patch     |  91 ++++++++++++++++++++
>  package/kodi/0006-Add-support-for-xtensa.patch  |  91 ++++++++++++++++++++

Have these patches any chance of being merged upstream? Indeed, it's
very unlikely that Kodi will ever be used on any of those
architectures, so having to carry forever those patches doesn't seem
like a great thing. I would prefer to exclude those architectures in
Config.in.

>  	depends on BR2_USE_MMU # libcdio, and others
> -	default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) \
> -		&& BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \
> -		&& BR2_TOOLCHAIN_HAS_SYNC_8
> +# i386: needs sse (see upstream PR 10351)
> +	default y if BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \
> +		&& !(BR2_i386 && !BR2_X86_CPU_HAS_SSE)

Kodi doesn't really support all architectures, since it contains
architecture-specific definitions in several files...


> +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
> +KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi
> +KODI_DEPENDENCIES += rpi-userland
> +ifeq ($(BR2_arm1176jzf_s)$(BR2_cortex_a7)$(BR2_cortex_a53),y)
> +KODI_CONF_OPTS += -DWITH_CPU=$(BR2_GCC_TARGET_CPU)

Why only for Raspberry Pi ?

> +endif
> +else  # BR2_PACKAGE_RPI_USERLAND
> +ifeq ($(BR2_arceb)$(BR2_arcle),y)
> +KODI_CONF_OPTS += -DWITH_ARCH=arc -DWITH_CPU=arc
> +else ifeq ($(BR2_armeb),y)
>  KODI_CONF_OPTS += -DWITH_ARCH=arm -DWITH_CPU=arm
> -else ifeq ($(BR2_mips),y)

MIPS is handled here...

> -KODI_CONF_OPTS += -DWITH_ARCH=mips -DWITH_CPU=mips
> -else ifeq ($(BR2_i386),y)
> -KODI_CONF_OPTS += -DWITH_ARCH=i486-linux -DWITH_CPU=$(BR2_GCC_TARGET_ARCH)
> -else ifeq ($(BR2_x86_64),y)
> -KODI_CONF_OPTS += -DWITH_ARCH=x86_64-linux -DWITH_CPU=x86_64
> +else ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)

... and here.

> +KODI_CONF_OPTS += \
> +	-DWITH_ARCH=mips$(if $(BR2_ARCH_IS_64),64) \
> +	-DWITH_CPU=mips$(if $(BR2_ARCH_IS_64),64)
> +else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y)
> +KODI_CONF_OPTS += \
> +	-DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \
> +	-DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64)
> +else ifeq ($(BR2_powerpc64)$(BR2_sparc64),y)
> +KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH)
> +else ifeq ($(BR2_sh4),y)
> +KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH)
> +else ifeq ($(BR2_xtensa),y)
> +KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH)

You can refactor those in one single assignment.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 31/31] package/kodi: Add support for more archs
  2017-04-29 11:44   ` Thomas Petazzoni
@ 2017-04-29 13:24     ` Bernd Kuhls
  0 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29 13:24 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Am Sat, 29 Apr 2017 13:44:04 +0200 schrieb Thomas Petazzoni:

> Hello,
> 
> On Sat, 29 Apr 2017 10:37:51 +0200, Bernd Kuhls wrote:
> 
>>  package/kodi/0003-Add-support-for-sh4.patch     | 108
>>  ++++++++++++++++++++++++
>>  package/kodi/0004-Add-support-for-sparc.patch   |  91
>>  ++++++++++++++++++++ package/kodi/0005-Add-support-for-arc.patch     |
>>   91 ++++++++++++++++++++
>>  package/kodi/0006-Add-support-for-xtensa.patch  |  91
>>  ++++++++++++++++++++
> 
> Have these patches any chance of being merged upstream? Indeed, it's
> very unlikely that Kodi will ever be used on any of those architectures,
> so having to carry forever those patches doesn't seem like a great
> thing. I would prefer to exclude those architectures in Config.in.

the patches are currently under review upstream, based on their decision 
I will sent the next version of this patch.

>>  	depends on BR2_USE_MMU # libcdio, and others
>> -	default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) 
||
>> BR2_i386 || BR2_x86_64) \
>> -		&& BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \
>> -		&& BR2_TOOLCHAIN_HAS_SYNC_8 +# i386: needs sse (see 
upstream PR
>> 10351)
>> +	default y if BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \
>> +		&& !(BR2_i386 && !BR2_X86_CPU_HAS_SSE)
> 
> Kodi doesn't really support all architectures, since it contains
> architecture-specific definitions in several files...

I am not sure that I understood what you mean here. The result of testpkg 
shows that Kodi is not built for all archs, mostly because of the 
restrictions from BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS and BR2_USE_MMU.

>> +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
>> +KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi +KODI_DEPENDENCIES +=
>> rpi-userland +ifeq
>> ($(BR2_arm1176jzf_s)$(BR2_cortex_a7)$(BR2_cortex_a53),y)
>> +KODI_CONF_OPTS += -DWITH_CPU=$(BR2_GCC_TARGET_CPU)
> 
> Why only for Raspberry Pi ?

These CPU-specific options are only needed for rbpi:
https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/
ArchSetup.cmake#L13

>> +endif +else  # BR2_PACKAGE_RPI_USERLAND +ifeq
>> ($(BR2_arceb)$(BR2_arcle),y)
>> +KODI_CONF_OPTS += -DWITH_ARCH=arc -DWITH_CPU=arc +else ifeq
>> ($(BR2_armeb),y)
>>  KODI_CONF_OPTS += -DWITH_ARCH=arm -DWITH_CPU=arm
>> -else ifeq ($(BR2_mips),y)
> 
> MIPS is handled here...

Not anymore, because I removed the check for mips ...

>> -KODI_CONF_OPTS += -DWITH_ARCH=mips -DWITH_CPU=mips -else ifeq
>> ($(BR2_i386),y)
>> -KODI_CONF_OPTS += -DWITH_ARCH=i486-linux
>> -DWITH_CPU=$(BR2_GCC_TARGET_ARCH)
>> -else ifeq ($(BR2_x86_64),y)
>> -KODI_CONF_OPTS += -DWITH_ARCH=x86_64-linux -DWITH_CPU=x86_64 +else
>> ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
> 
> ... and here.

and re-added it here for all mips archs.

>> +KODI_CONF_OPTS += \
>> +	-DWITH_ARCH=mips$(if $(BR2_ARCH_IS_64),64) \
>> +	-DWITH_CPU=mips$(if $(BR2_ARCH_IS_64),64)
>> +else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y)
>> +KODI_CONF_OPTS += \
>> +	-DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \
>> +	-DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64)
>> +else ifeq ($(BR2_powerpc64)$(BR2_sparc64),y)
>> +KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH)
>> +else ifeq ($(BR2_sh4),y)
>> +KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH)
>> +else ifeq ($(BR2_xtensa),y)
>> +KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH)
> 
> You can refactor those in one single assignment.

Done.

Regards, Bernd

^ permalink raw reply	[flat|nested] 62+ messages in thread

[parent not found: <fe62a0d1-d466-2d4d-22c4-d5165882dc7b@t-online.de>]

* [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton
       [not found] ` <fe62a0d1-d466-2d4d-22c4-d5165882dc7b@t-online.de>
@ 2017-04-29 12:42   ` Thomas Petazzoni
  2017-04-29 13:06     ` Bernd Kuhls
  0 siblings, 1 reply; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 12:42 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 14:29:13 +0200, Bernd Kuhls wrote:

> > I don't understand why you have this !BR2_PACKAGE_RPI_USERLAND
> > dependency here. Can you explain?  
> 
> We need to rule out that a rbpi build is done with opengl/egl, otherwise
> the build will fail like this:
> http://forum.kodi.tv/showthread.php?tid=305752&pid=2569701#pid2569701

But rpi-userland doesn't provide OpenGL support, only OpenGLES, so how
is it possible to get a RPi build with OpenGL support ?


> Ok, sent patch: http://patchwork.ozlabs.org/patch/756733/

Thanks, looks good.


> > This looks a bit fishy. Why each option has a _OK option and a _TRUE
> > option? Is setting both really needed?  
> 
> Yes, otherwise host CPU features sneak into the build parameters,
> upstream does something similar:
> https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/modules/
> FindSSE.cmake#L81

Hum, OK.

> > This looks very very weird. Why is LDGOLD related to RPi ?  
> 
> RPi and Linux are considered different platforms, both have their own
> ArchSetup.cmake:
> 
> https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/linux/
> ArchSetup.cmake
> https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/
> ArchSetup.cmake
> 
> LDGOLD is only used for the linux platform:
> https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/linux/
> ArchSetup.cmake#L34
> 
> If you think that treating Linux and RPi as separate platforms is weird
> then you are not alone, but it may change in Kodi 18:
> https://github.com/xbmc/xbmc/pull/12021 ;)

Ah, ok, makes sense. Well, considering them as separate platforms
doesn't, but the way you've handled the current situation makes sense.
What about adding a comment?

Also, I changed rbpi to rpi in the comments, thinking that rbpi was a
typo, but it apparently isn't.

> Because all these options do not exist in https://github.com/xbmc/xbmc/
> blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake

OK. Good reason to add a comment in the .mk file.

> > So this thing is the only reason why we need xmlstarlet built for the
> > host system?  
> 
> No, I plan to add more patches to control the skin addon(s) being used,
> also the default skin addon can then be changed using xmlstarlet:
> http://lists.busybox.net/pipermail/buildroot/2017-April/189753.html
> 
> I removed these patches from v6+ because Yann had problems with them:
> http://lists.busybox.net/pipermail/buildroot/2017-April/190190.html
> and, as feature patches, they should not block the version bump.

It is indeed a good idea to have separate those changes from the
version bump itself. Now the version bump has been merged, it is
possible to focus on this rather than having a too long patch series.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

* [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton
  2017-04-29 12:42   ` [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton Thomas Petazzoni
@ 2017-04-29 13:06     ` Bernd Kuhls
  0 siblings, 0 replies; 62+ messages in thread
From: Bernd Kuhls @ 2017-04-29 13:06 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Am Sat, 29 Apr 2017 14:42:37 +0200 schrieb Thomas Petazzoni:

> Hello,
> 
> On Sat, 29 Apr 2017 14:29:13 +0200, Bernd Kuhls wrote:
> 
>> > I don't understand why you have this !BR2_PACKAGE_RPI_USERLAND
>> > dependency here. Can you explain?
>> 
>> We need to rule out that a rbpi build is done with opengl/egl,
>> otherwise the build will fail like this:
>> http://forum.kodi.tv/showthread.php?tid=305752&pid=2569701#pid2569701
> 
> But rpi-userland doesn't provide OpenGL support, only OpenGLES, so how
> is it possible to get a RPi build with OpenGL support ?

Mesa3d can provide libgl at the same time rpi-userland provides egl/gles 
support:

$ grep _PROVIDES_ .config
BR2_PACKAGE_PROVIDES_LIBOPENMAX="rpi-userland"
BR2_PACKAGE_PROVIDES_LIBGL="mesa3d"
BR2_PACKAGE_PROVIDES_LIBEGL="rpi-userland"
BR2_PACKAGE_PROVIDES_LIBGLES="rpi-userland"
BR2_PACKAGE_PROVIDES_LIBOPENVG="rpi-userland"

With this defconfig I could reproduce the build error I mentioned today:

BR2_arm=y
BR2_cortex_a15=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_RPI_USERLAND=y

>> Because all these options do not exist in https://github.com/xbmc/xbmc/
>> blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake
> 
> OK. Good reason to add a comment in the .mk file.

Sent patch: http://patchwork.ozlabs.org/patch/756741/

Regards, Bernd

^ permalink raw reply	[flat|nested] 62+ messages in thread

[parent not found: <5bfda10f-6383-2bf6-afa7-4fffcd2fc5cb@t-online.de>]

* [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton
       [not found] ` <5bfda10f-6383-2bf6-afa7-4fffcd2fc5cb@t-online.de>
@ 2017-04-29 13:13   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 13:13 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 15:06:36 +0200, Bernd Kuhls wrote:

> Mesa3d can provide libgl at the same time rpi-userland provides egl/gles
> support:
> 
> $ grep _PROVIDES_ .config
> BR2_PACKAGE_PROVIDES_LIBOPENMAX="rpi-userland"
> BR2_PACKAGE_PROVIDES_LIBGL="mesa3d"
> BR2_PACKAGE_PROVIDES_LIBEGL="rpi-userland"
> BR2_PACKAGE_PROVIDES_LIBGLES="rpi-userland"
> BR2_PACKAGE_PROVIDES_LIBOPENVG="rpi-userland"
> 
> With this defconfig I could reproduce the build error I mentioned today:
> 
> BR2_arm=y
> BR2_cortex_a15=y
> BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
> BR2_TOOLCHAIN_BUILDROOT_CXX=y
> BR2_PACKAGE_MESA3D=y
> BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y
> BR2_PACKAGE_XORG7=y
> BR2_PACKAGE_RPI_USERLAND=y

Then your fix doesn't work, because for example sunxi-mali, like
rpi-userland, also provides GLES but not full GL. So you can have a
random configuration where OpenGLES is provided by sunxi-mali, but
OpenGL is provided by Mesa.

I believe this should not be solved in the Kodi package itself, so
please send a patch to remove this line.

Instead, what we want is a mechanism to make sure that we don't have
conflicting OpenGL/OpenGLES providers, and Yann made a proposal on the
mailing list about that some time ago. See the thread "[PATCH]
package/opengl: ensure consistency between the various providers" on
the mailing list.

> > OK. Good reason to add a comment in the .mk file.  
> 
> Sent patch: http://patchwork.ozlabs.org/patch/756741/

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

[parent not found: <8b5332b4-ff7b-7afc-a545-a5cef63612b4@t-online.de>]

* [Buildroot] [PATCH v7 31/31] package/kodi: Add support for more archs
       [not found] ` <8b5332b4-ff7b-7afc-a545-a5cef63612b4@t-online.de>
@ 2017-04-29 13:41   ` Thomas Petazzoni
  0 siblings, 0 replies; 62+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 13:41 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 29 Apr 2017 15:25:04 +0200, Bernd Kuhls wrote:

> > Have these patches any chance of being merged upstream? Indeed, it's
> > very unlikely that Kodi will ever be used on any of those architectures,
> > so having to carry forever those patches doesn't seem like a great
> > thing. I would prefer to exclude those architectures in Config.in.  
> 
> the patches are currently under review upstream, based on their decision
> I will sent the next version of this patch.

Great, thanks!

> > Kodi doesn't really support all architectures, since it contains
> > architecture-specific definitions in several files...  
> 
> I am not sure that I understood what you mean here.

What I mean here is that Kodi *does* have architecture dependencies,
since it contains a bunch of .c/.h files that have conditionals based
on the architectures.

Therefore, pretending in our Config.in that Kodi builds on all
architectures is not correct. It only builds for those that Kodi
supports. Your patch works today, but if tomorrow we add support for
architecture "barfoo", then Kodi will fail to build on this
architecture.

Therefore, since Kodi has support only for a selection of
architectures, I would prefer if kodi/Config.in was reflecting this
list of architectures.

Some other packages that have architecture dependencies are more
fundamental (like libffi) and therefore we really want them to exist on
all architectures we support. However, Kodi is unlikely to be used on
ARC, SuperH, Sparc, Xtensa, etc, so putting effort to make Kodi build
on those platforms is not very useful.

> >> +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
> >> +KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi +KODI_DEPENDENCIES +=
> >> rpi-userland +ifeq
> >> ($(BR2_arm1176jzf_s)$(BR2_cortex_a7)$(BR2_cortex_a53),y)
> >> +KODI_CONF_OPTS += -DWITH_CPU=$(BR2_GCC_TARGET_CPU)  
> > 
> > Why only for Raspberry Pi ?  
> 
> These CPU-specific options are only needed for rbpi:
> https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/
> ArchSetup.cmake#L13

OK, then again, comment needed. The fact that Kodi handles RPi
specially is very confusing.

> >> +endif +else  # BR2_PACKAGE_RPI_USERLAND +ifeq
> >> ($(BR2_arceb)$(BR2_arcle),y)
> >> +KODI_CONF_OPTS += -DWITH_ARCH=arc -DWITH_CPU=arc +else ifeq
> >> ($(BR2_armeb),y)
> >>  KODI_CONF_OPTS += -DWITH_ARCH=arm -DWITH_CPU=arm
> >> -else ifeq ($(BR2_mips),y)  
> > 
> > MIPS is handled here...  
> 
> Not anymore, because I removed the check for mips ...

Aaah, yes, my bad. It was a "-" at the beginning of the line, not a
"+". Sorry about that.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 62+ messages in thread

end of thread, other threads:[~2017-04-29 13:46 UTC | newest]

Thread overview: 62+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-29  8:37 [Buildroot] [PATCH v7 00/31] odi: bump to version 17.1-Krypton Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 01/31] package/kodi-visualisation-fountain: remove package Bernd Kuhls
2017-04-29  9:25   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 02/31] package/libplatform: bump version Bernd Kuhls
2017-04-29  9:31   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 03/31] package/kodi-platform: " Bernd Kuhls
2017-04-29  9:31   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 04/31] package/libcec: bump version to 4.0.2 Bernd Kuhls
2017-04-29  9:31   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 05/31] package/xmlstarlet: add host variant Bernd Kuhls
2017-04-29  9:31   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 06/31] package/kodi-jsonschemabuilder: new host package Bernd Kuhls
2017-04-29  9:32   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 07/31] package/kodi-texturepacker: " Bernd Kuhls
2017-04-29  9:37   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton Bernd Kuhls
2017-04-29  9:56   ` Thomas Petazzoni
2017-04-29 12:29     ` Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 09/31] package/kodi-pvr-*: mass version bump Bernd Kuhls
2017-04-29  9:57   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 10/31] package/kodi-pvr-mythtv: bump version to 4.15.0 Bernd Kuhls
2017-04-29  9:57   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 11/31] package/kodi-pvr-nextpvr: bump version to 2.4.11 Bernd Kuhls
2017-04-29  9:57   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 12/31] package/kodi-adsp-basic: bump version Bernd Kuhls
2017-04-29  9:58   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 13/31] package/kodi-adsp-freesurround: " Bernd Kuhls
2017-04-29  9:58   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 14/31] package/kodi-audioencoder-*: mass version bump Bernd Kuhls
2017-04-29 10:00   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 15/31] package/kodi-audiodecoder-*: " Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 16/31] package/kodi-audiodecoder-timidity: bump version Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 17/31] package/kodi-screensaver-*: mass version bump Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 18/31] package/kodi-screensaver-rsxs: bump version Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 19/31] package/kodi-visualisation-*: mass version bump Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 20/31] package/kodi-visualisation-waveforhue: bump version Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 21/31] package/kodi-visualisation-shadertoy: " Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 22/31] package/kodi: add optional support for bluez5 Bernd Kuhls
2017-04-29 10:03   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 23/31] package/kodi: libxslt is an optional package Bernd Kuhls
2017-04-29 10:04   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 24/31] package/kodi: add optional support for pulseaudio Bernd Kuhls
2017-04-29 10:05   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 25/31] package/kodi: add optional support for event clients Bernd Kuhls
2017-04-29 10:06   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 26/31] package/kodi: add optional support for lcms2 Bernd Kuhls
2017-04-29 10:06   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 27/31] package/kodi-inputstream-rtmp: new package Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 28/31] package/kodi-inputstream-adaptive: " Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 29/31] package/libsquish: Remove Kodi-specific patch Bernd Kuhls
2017-04-29 10:14   ` Thomas Petazzoni
2017-04-29  8:37 ` [Buildroot] [PATCH v7 30/31] package/libsquish: bump version to 1.15 Bernd Kuhls
2017-04-29 10:14   ` Thomas Petazzoni
2017-04-29 13:44   ` Thomas Petazzoni
2017-04-29 13:46     ` Bernd Kuhls
2017-04-29  8:37 ` [Buildroot] [PATCH v7 31/31] package/kodi: Add support for more archs Bernd Kuhls
2017-04-29 11:44   ` Thomas Petazzoni
2017-04-29 13:24     ` Bernd Kuhls
     [not found] ` <fe62a0d1-d466-2d4d-22c4-d5165882dc7b@t-online.de>
2017-04-29 12:42   ` [Buildroot] [PATCH v7 08/31] package/kodi: bump to version 17.1-Krypton Thomas Petazzoni
2017-04-29 13:06     ` Bernd Kuhls
     [not found] ` <5bfda10f-6383-2bf6-afa7-4fffcd2fc5cb@t-online.de>
2017-04-29 13:13   ` Thomas Petazzoni
     [not found] ` <8b5332b4-ff7b-7afc-a545-a5cef63612b4@t-online.de>
2017-04-29 13:41   ` [Buildroot] [PATCH v7 31/31] package/kodi: Add support for more archs Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.