package/kodi: bump version to 15.0 rc2 Isengard

index 0aa0aeb..f346da1 100644
@@ -32,7 +32,7 @@ index 6deccc3..85b25fd 100644
 +        h->got_first_iframe = 1;
 +    }
 +
-     ret = ff_dxva2_common_end_frame(avctx, &h->cur_pic_ptr->f,
+     ret = ff_dxva2_common_end_frame(avctx, h->cur_pic_ptr->f,
                                      &ctx_pic->pp, sizeof(ctx_pic->pp),
                                      &ctx_pic->qm, sizeof(ctx_pic->qm),
 diff --git a/libavcodec/h264.c b/libavcodec/h264.c

@@ -40,9 +40,9 @@ index 222bf58..ea2ec17 100644
 --- a/libavcodec/h264.c
 +++ b/libavcodec/h264.c
 @@ -1085,6 +1085,7 @@ void ff_h264_flush_change(H264Context *h)
-     h->list_count = 0;
-     h->current_slice = 0;
      h->mmco_reset = 1;
+     for (i = 0; i < h->nb_slice_ctx; i++)
+         h->slice_ctx[i].list_count = 0;
 +    h->got_first_iframe = 0;
  }
  

131 lines not on this page · raw message

72 lines not on this page · raw message

index 0add973..a6cb310 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	59eb98c1b5896ac29abc0385f7c875d1b4942d695818818d418ee71eea1e0cfb	ffmpeg-2.6.3.tar.bz2
+sha256	7e07b97d2415feeae9c9b5595e35e7b7aab33207e81bf9f8c0d1eece43f7f720	ffmpeg-2.7.1.tar.bz2

index 0030d97..0162db2 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FFMPEG_VERSION = 2.6.3
+FFMPEG_VERSION = 2.7.1
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES

index 20ecd38..983d4e4 100644
@@ -717,6 +717,7 @@ endmenu
 menu "Compression and decompression"
 	source "package/libarchive/Config.in"
 	source "package/libzip/Config.in"
+	source "package/libsquish/Config.in"
 	source "package/lzo/Config.in"
 	source "package/snappy/Config.in"
 	source "package/szip/Config.in"

327 lines not on this page · raw message

new file mode 100644
index 0000000..eabe6c5
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBSQUISH
+	bool "libsquish"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS
+	help
+	  The libSquish library compresses images with the DXT standard
+	  (also known as S3TC). This standard is mainly used by OpenGL
+	  and DirectX for the lossy compression of RGBA textures.
+
+	  http://sourceforge.net/projects/libsquish
+
+comment "libsquish needs a toolchain w/ C++, dynamic library"
+	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS

new file mode 100644
index 0000000..caa7198
@@ -0,0 +1,2 @@
+# From http://sourceforge.net/projects/libsquish/files
+sha1	7bcdd7d0f0460a29e25dcdab8dc41a30e58bb366	libsquish-1.13.tgz

new file mode 100644
index 0000000..df37368
@@ -0,0 +1,36 @@
+################################################################################
+#
+# libsquish
+#
+################################################################################
+
+LIBSQUISH_VERSION = 1.13
+LIBSQUISH_SOURCE = libsquish-$(LIBSQUISH_VERSION).tgz
+LIBSQUISH_SITE = http://downloads.sourceforge.net/project/libsquish
+LIBSQUISH_INSTALL_STAGING = YES
+LIBSQUISH_STRIP_COMPONENTS = 0
+LIBSQUISH_LICENSE = MIT
+LIBSQUISH_LICENSE_FILES = README
+
+define LIBSQUISH_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define LIBSQUISH_INSTALL_STAGING_CMDS
+	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \
+		PREFIX=/usr INSTALL_DIR=$(STAGING_DIR)/usr
+	$(INSTALL) -m 644 $(@D)/squish.pc $(STAGING_DIR)/usr/lib/pkgconfig
+	ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so
+
+endef
+
+define LIBSQUISH_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/include/
+	mkdir -p $(TARGET_DIR)/usr/lib/pkgconfig/
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \
+		PREFIX=/usr INSTALL_DIR=$(TARGET_DIR)/usr
+	ln -sf libsquish.so.0.0 $(TARGET_DIR)/usr/lib/libsquish.so
+endef
+
+$(eval $(generic-package))

index 983d4e4..c8f3a72 100644
@@ -1063,6 +1063,7 @@ menu "Other"
 	source "package/liblinear/Config.in"
 	source "package/libnspr/Config.in"
 	source "package/libpfm4/Config.in"
+	source "package/libplatform/Config.in"
 	source "package/libplist/Config.in"
 	source "package/libpthread-stubs/Config.in"
 	source "package/libpthsem/Config.in"

new file mode 100644
index 0000000..7d275b1
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBPLATFORM
+	bool
+	help
+	  Platform support library used by libCEC and binary add-ons for Kodi
+
+	  https://github.com/Pulse-Eight/platform

new file mode 100644
index 0000000..77fbcec
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libplatform
+#
+################################################################################
+
+LIBPLATFORM_VERSION = 1.0.10
+LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION))
+LIBPLATFORM_LICENSE = GPLv3+
+LIBPLATFORM_LICENSE_FILES = COPYING
+LIBPLATFORM_INSTALL_STAGING = YES
+
+LIBPLATFORM_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index ea4b449..bc845f8 100644
@@ -161,6 +161,7 @@ comment "rsxs needs an OpenGL backend"
 config BR2_PACKAGE_KODI_LIBCEC
 	bool "hdmi cec"
 	depends on !BR2_STATIC_LIBS # libcec
+	depends on !BR2_GCC_VERSION_4_5_X # libcec
 	depends on BR2_PACKAGE_HAS_UDEV
 	select BR2_PACKAGE_LIBCEC
 	help

@@ -168,6 +169,7 @@ config BR2_PACKAGE_KODI_LIBCEC
 	  Select this if you want Kodi to support HDMI CEC.
 
 comment "hdmi cec support needs udev /dev management and a toolchain w/ dynamic library"
+	depends on !BR2_GCC_VERSION_4_5_X
 	depends on BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV
 
 config BR2_PACKAGE_KODI_LIBMICROHTTPD

deleted file mode 100644
index 4956c14..0000000
@@ -1,21 +0,0 @@
-Do not use -Wno-psabi option
-
-This option was added in gcc 4.5, and Buildroot still uses gcc 4.3 on
-some architectures. Since it's non essential (only disables some
-warning), let's get rid of it.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,7 +137,7 @@
- use_udev="no"
- use_adapter_detection="yes"
- use_lockdev="no"
--SUPPRESS_MANGLING_WARNINGS=" -Wno-psabi"
-+SUPPRESS_MANGLING_WARNINGS=""
- case "${host}" in
-   *-*-linux*)
-     ## search for udev if pkg-config was found

index e5fa9c8..c435047 100644
@@ -4,6 +4,9 @@ config BR2_PACKAGE_LIBCEC
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR
 	depends on !BR2_STATIC_LIBS
+	# https://github.com/Pulse-Eight/libcec/issues/78#issuecomment-91578591
+	depends on !BR2_GCC_VERSION_4_5_X
+	select BR2_PACKAGE_LIBPLATFORM
 	help
 	  libcec allows you in combination with the right hardware to
 	  control your home theater devices with your TV remote

@@ -12,5 +15,6 @@ config BR2_PACKAGE_LIBCEC
 	  http://libcec.pulse-eight.com
 
 comment "libcec needs a toolchain w/ C++, wchar, threads, dynamic library"
+	depends on !BR2_GCC_VERSION_4_5_X
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_USE_WCHAR || BR2_STATIC_LIBS

index 8bdc9ea..c5b008f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCEC_VERSION = libcec-2.2.0-repack
+LIBCEC_VERSION = libcec-3.0.1
 LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION))
 LIBCEC_LICENSE = GPLv2+
 LIBCEC_LICENSE_FILES = COPYING

@@ -12,7 +12,7 @@ LIBCEC_LICENSE_FILES = COPYING
 # Autoreconf required due to being a dev tarball and not a release tarball.
 LIBCEC_AUTORECONF = YES
 LIBCEC_INSTALL_STAGING = YES
-LIBCEC_DEPENDENCIES = host-pkgconf
+LIBCEC_DEPENDENCIES = host-pkgconf libplatform
 
 ifeq ($(BR2_PACKAGE_LOCKDEV),y)
 LIBCEC_DEPENDENCIES += lockdev

@@ -22,13 +22,20 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 LIBCEC_DEPENDENCIES += udev
 endif
 
+ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+LIBCEC_DEPENDENCIES += host-swig $(if $(BR2_PACKAGE_PYTHON3),python3,python)
+endif
+
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-LIBCEC_CONF_OPTS = --enable-rpi \
-	--with-rpi-include-path=$(STAGING_DIR)/usr/include
 LIBCEC_DEPENDENCIES += rpi-userland
-LIBCEC_CONF_ENV += LIBS="-lvcos -lvchostif"
-else
-LIBCEC_CONF_OPTS = --disable-rpi
+LIBCEC_CONF_OPTS += \
+	-DCMAKE_C_FLAGS="-lvcos -lvchiq_arm" \
+	-DCMAKE_CXX_FLAGS="-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux \
+		-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads"
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
+LIBCEC_DEPENDENCIES += xlib_libXrandr
 endif
 
-$(eval $(autotools-package))
+$(eval $(cmake-package))

index be99bd6..9298981 100644
@@ -14,34 +14,6 @@ Signed-off-by: Maxime Hadjinlian <[email protected]>
  lib/timidity/configure.in                    | 6 +++---
  4 files changed, 6 insertions(+), 12 deletions(-)
 
-diff --git a/lib/enca/configure b/lib/enca/configure
-index c839a51..7af5a09 100644
---- a/lib/enca/configure
-+++ b/lib/enca/configure
-@@ -12011,9 +12011,6 @@ fi
- if test "$prefix" = "NONE"; then
-   LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib"
-   CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include"
--else
--  LDFLAGS="$LDFLAGS -L$prefix/lib"
--  CPPFLAGS="$CPPFLAGS -I$prefix/include"
- fi
- 
- 
-diff --git a/lib/enca/configure.ac b/lib/enca/configure.ac
-index 41434df..47d5367 100644
---- a/lib/enca/configure.ac
-+++ b/lib/enca/configure.ac
-@@ -100,9 +100,6 @@ dnl Dirty path hack.  Helps some people with badly set up search paths.
- if test "$prefix" = "NONE"; then
-   LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib"
-   CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include"
--else
--  LDFLAGS="$LDFLAGS -L$prefix/lib"
--  CPPFLAGS="$CPPFLAGS -I$prefix/include"
- fi
- 
- dnl Checks for libraries.
 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

@@ -59,23 +31,3 @@ index e170c7e..25ee893 100644
 -fi      
 +      echo $dvdreadlib
 +fi
-diff --git a/lib/timidity/configure.in b/lib/timidity/configure.in
-index 9f2835b..733470a 100644
---- a/lib/timidity/configure.in
-+++ b/lib/timidity/configure.in
-@@ -100,9 +100,9 @@ done
- 
- # add $prefix if specified.
- if test "x$prefix" != xNONE -a "x$prefix" != "x$ac_default_prefix" -a "x$prefix" != "x/usr"; then
--  LDFLAGS="-L$prefix/lib $LDFLAGS"
--  SHLDFLAGS="-L$prefix/lib $SHLDFLAGS"
--  CPPFLAGS="-I$prefix/include $CPPFLAGS"
-+  LDFLAGS="$LDFLAGS"
-+  SHLDFLAGS="$SHLDFLAGS"
-+  CPPFLAGS="$CPPFLAGS"
- fi
- 
- dnl add --with-includes, --with-libraries
--- 
-1.8.5.2
-

new file mode 100644
index 0000000..c9e28dd
@@ -0,0 +1,12 @@
+diff -uNr xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd.org/tools/depends/native/TexturePacker/Makefile xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd/tools/depends/native/TexturePacker/Makefile
+--- xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd.org/tools/depends/native/TexturePacker/Makefile	2015-01-25 09:00:48.000000000 +0100
++++ xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd/tools/depends/native/TexturePacker/Makefile	2015-01-25 13:03:23.606140953 +0100
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)

179 lines not on this page · raw message

index bc845f8..62553d4 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_KODI_ARCH_SUPPORTS
 	bool
-	default y if (BR2_arm || BR2_i386 || BR2_x86_64) && BR2_PACKAGE_BOOST_ARCH_SUPPORTS
-
+	default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) && BR2_PACKAGE_BOOST_ARCH_SUPPORTS
 
 comment "kodi needs a toolchain w/ C++, threads, wchar, dynamic library"
 	depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS

@@ -52,14 +51,12 @@ menuconfig BR2_PACKAGE_KODI
 	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_LIBID3TAG
-	select BR2_PACKAGE_LIBMAD
-	select BR2_PACKAGE_LIBMODPLUG
 	select BR2_PACKAGE_LIBMPEG2
 	select BR2_PACKAGE_LIBOGG
 	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

@@ -79,9 +76,6 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_PYTHON_UNICODEDATA
 	select BR2_PACKAGE_PYTHON_ZLIB
 	select BR2_PACKAGE_READLINE
-	select BR2_PACKAGE_SDL if BR2_PACKAGE_KODI_GL
-	select BR2_PACKAGE_SDL_X11 if BR2_PACKAGE_KODI_GL
-	select BR2_PACKAGE_SDL_IMAGE if BR2_PACKAGE_KODI_GL
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_TAGLIB
 	select BR2_PACKAGE_TIFF

index ad61f0d..c97dafa 100644
@@ -4,22 +4,20 @@
 #
 ################################################################################
 
-KODI_VERSION = 14.2-Helix
+#KODI_VERSION = 15.0rc3-Isengard
+KODI_VERSION = 94871aef9425751658dc32159ddcb45914f14bae
 KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
 KODI_LICENSE = GPLv2
 KODI_LICENSE_FILES = LICENSE.GPL
-# needed for audioencoder addons
+# needed for binary addons
 KODI_INSTALL_STAGING = YES
-# Kodi needs host-sdl_image (and therefore host-sdl) for a host tools it builds
-# called TexturePacker. It is responsible to take all the images used in the
-# GUI and pack them in a blob.
-# http://wiki.xbmc.org/index.php?title=TexturePacker
-KODI_DEPENDENCIES = host-gawk host-gettext host-gperf host-infozip host-lzo \
-	host-nasm host-sdl_image host-swig
+KODI_DEPENDENCIES = host-gawk host-gettext host-gperf host-infozip host-giflib \
+	host-libjpeg host-lzo host-nasm host-libpng host-swig
 KODI_DEPENDENCIES += boost bzip2 expat ffmpeg fontconfig freetype jasper jpeg \
-	libass libcdio libcurl libfribidi libgcrypt libmad libmodplug libmpeg2 \
-	libogg libplist libpng libsamplerate libvorbis libxml2 libxslt lzo ncurses \
-	openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib
+	libass libcdio libcurl libfribidi libgcrypt libmpeg2 \
+	libogg libplist libpng libsamplerate libsquish libvorbis libxml2 \
+	libxslt lzo ncurses openssl pcre python readline sqlite taglib tiff \
+	tinyxml yajl zlib
 
 KODI_CONF_ENV = \
 	PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \

@@ -33,8 +31,6 @@ KODI_CONF_ENV = \
 
 KODI_CONF_OPTS +=  \
 	--with-ffmpeg=shared \
-	--disable-crystalhd \
-	--disable-hal \
 	--disable-joystick \
 	--disable-openmax \
 	--disable-projectm \

@@ -91,13 +87,15 @@ endif
 # 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 sdl_image xlib_libX11 xlib_libXext \
+KODI_DEPENDENCIES += libglew libglu libgl xlib_libX11 xlib_libXext \
 	xlib_libXmu xlib_libXrandr xlib_libXt libdrm
-KODI_CONF_OPTS += --enable-gl --enable-sdl --enable-x11 --enable-xrandr --disable-gles
+KODI_CONF_OPTS += --enable-gl --enable-x11 --disable-gles
 ifeq ($(BR2_PACKAGE_KODI_RSXS),y)
 # fix rsxs compile
+# gcc5: http://trac.kodi.tv/ticket/16006#comment:6
 # make sure target libpng-config is used, options taken from rsxs-0.9/acinclude.m4
 KODI_CONF_ENV += \
+	ac_cv_type__Bool=yes \
 	jm_cv_func_gettimeofday_clobber=no \
 	mac_cv_pkg_png=$(STAGING_DIR)/usr/bin/libpng-config \
 	mac_cv_pkg_cppflags="`$(STAGING_DIR)/usr/bin/libpng-config --I_opts --cppflags`" \

@@ -109,7 +107,7 @@ else
 KODI_CONF_OPTS += --disable-rsxs
 endif
 else
-KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-sdl --disable-x11 --disable-xrandr
+KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-x11
 ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y)
 KODI_DEPENDENCIES += libegl libgles
 KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`"

@@ -212,10 +210,19 @@ 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
 
+# needed to fix binary addons compile
+# https://github.com/OpenELEC/OpenELEC.tv/commit/ecb91611931a4f89bd6551b4a2eaaf0b7cbf19fc
+define KODI_FIX_CONFIG_CMAKE
+	$(SED) "s:INCLUDE_DIR /usr/include/kodi:INCLUDE_DIR $(STAGING_DIR)/usr/include/kodi:g" $(STAGING_DIR)/usr/lib/kodi/kodi-config.cmake
+endef
+KODI_POST_INSTALL_STAGING_HOOKS += KODI_FIX_CONFIG_CMAKE
+
 define KODI_CLEAN_UNUSED_ADDONS
 	rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/screensaver.rsxs.plasma
 	rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.milkdrop

index 62553d4..7d4b068 100644
@@ -166,6 +166,11 @@ comment "hdmi cec support needs udev /dev management and a toolchain w/ dynamic
 	depends on !BR2_GCC_VERSION_4_5_X
 	depends on BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV
 
+config BR2_PACKAGE_KODI_LIRC
+	bool "lirc"
+	help
+	  Enable lirc support
+
 config BR2_PACKAGE_KODI_LIBMICROHTTPD
 	bool "web server"
 	select BR2_PACKAGE_LIBMICROHTTPD

index c97dafa..44ecea9 100644
@@ -186,6 +186,12 @@ else
 KODI_CONF_OPTS += --disable-libcec
 endif
 
+ifeq ($(BR2_PACKAGE_KODI_LIRC),y)
+KODI_CONF_OPTS += --enable-lirc
+else
+KODI_CONF_OPTS += --disable-lirc
+endif
+
 ifeq ($(BR2_PACKAGE_KODI_WAVPACK),y)
 KODI_DEPENDENCIES += wavpack
 endif

index 799f9c5..95acbba 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_KODI_AUDIOENCODER_FLAC
 	bool "kodi-audioencoder-flac"
 	select BR2_PACKAGE_FLAC
+	select BR2_PACKAGE_KODI_OPTICALDRIVE
 	select BR2_PACKAGE_LIBOGG
 	help
 	  An audioencoder addon for Kodi

index be00296..dc6a0cd 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KODI_AUDIOENCODER_LAME
 	bool "kodi-audioencoder-lame"
+	select BR2_PACKAGE_KODI_OPTICALDRIVE
 	select BR2_PACKAGE_LAME
 	help
 	  An audioencoder addon for Kodi

index ab8b4b3..8b84626 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KODI_AUDIOENCODER_VORBIS
 	bool "kodi-audioencoder-vorbis"
+	select BR2_PACKAGE_KODI_OPTICALDRIVE
 	select BR2_PACKAGE_LIBOGG
 	select BR2_PACKAGE_LIBVORBIS
 	help

index 6813f02..6bdbb9a 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KODI_AUDIOENCODER_WAV
 	bool "kodi-audioencoder-wav"
+	select BR2_PACKAGE_KODI_OPTICALDRIVE
 	help
 	  An audioencoder addon for Kodi
 

index 7d4b068..f182fbf 100644
@@ -247,20 +247,14 @@ config BR2_PACKAGE_KODI_WAVPACK
 	  Select this if you want to play back WV files.
 
 config BR2_PACKAGE_KODI_OPTICALDRIVE
-	bool "optical drive"
-	help
-	  Enable support for optical drives
-
-if BR2_PACKAGE_KODI_OPTICALDRIVE
-
-comment "Kodi audioencoder addons"
-
-source "package/kodi-audioencoder-flac/Config.in"
-source "package/kodi-audioencoder-lame/Config.in"
-source "package/kodi-audioencoder-vorbis/Config.in"
-source "package/kodi-audioencoder-wav/Config.in"
+	bool
 
-endif # BR2_PACKAGE_KODI_OPTICALDRIVE
+menu "Audio encoder addons"
+	source "package/kodi-audioencoder-flac/Config.in"
+	source "package/kodi-audioencoder-lame/Config.in"
+	source "package/kodi-audioencoder-vorbis/Config.in"
+	source "package/kodi-audioencoder-wav/Config.in"
+endmenu
 
 comment "Kodi PVR addons"
 

index 2ccc1b7..154e39c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_FLAC_VERSION = 84acb14101b9114472cd20f6a0f8fdefbb376113
+KODI_AUDIOENCODER_FLAC_VERSION = a5e2d1262de3b2de567cf0a8207636ebaacb8775
 KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION))
 KODI_AUDIOENCODER_FLAC_LICENSE = GPLv2+
 KODI_AUDIOENCODER_FLAC_LICENSE_FILES = src/EncoderFlac.cpp

index 8a4a28c..78a2d71 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_LAME_VERSION = 3eb59de951996659c143faaabacc5f34ee9a0b81
+KODI_AUDIOENCODER_LAME_VERSION = b283cd50cd2f89b7fd7b903c957a6a993e3756d2
 KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION))
 KODI_AUDIOENCODER_LAME_LICENSE = GPLv2+
 KODI_AUDIOENCODER_LAME_LICENSE_FILES = src/EncoderLame.cpp

index 493fcbf..6bf2933 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_VORBIS_VERSION = d556a6872e59806526f208e8d0af5f886a6c67bb
+KODI_AUDIOENCODER_VORBIS_VERSION = 15d619dae4411ecebadf2ec2996d611600ad0bee
 KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION))
 KODI_AUDIOENCODER_VORBIS_LICENSE = GPLv2+
 KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = src/EncoderVorbis.cpp

index 06803f2..9cd5117 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_WAV_VERSION = 40aaedfa1cd9c75749c82f6e1bd7c42ef61fdb38
+KODI_AUDIOENCODER_WAV_VERSION = 797c990eea7851889cd44a597c0392deba9c51c0
 KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION))
 KODI_AUDIOENCODER_WAV_LICENSE = GPLv2+
 KODI_AUDIOENCODER_WAV_LICENSE_FILES = src/EncoderWav.cpp

index e05510c..eff053e 100644
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-# This cset is on master. When a Helix branch is made, we should
+# This cset is on master. When a Isengard branch is made, we should
 # follow it, as incompatible changes in the plugins API can happen
 # on the master branch.
-KODI_ADDON_XVDR_VERSION = 328fa653b821a4edc1256a13833f30a4483e2819
+KODI_ADDON_XVDR_VERSION = 88265b86896513a219acb8d5f0c0f77956fae939
 KODI_ADDON_XVDR_SITE = $(call github,pipelka,xbmc-addon-xvdr,$(KODI_ADDON_XVDR_VERSION))
 KODI_ADDON_XVDR_LICENSE = GPLv2+
 KODI_ADDON_XVDR_LICENSE_FILES = COPYING

deleted file mode 100644
index 80916c7..0000000
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_KODI_PVR_ADDONS
-	bool "kodi-pvr-addons"
-	help
-	  A collection of PVR backend addons for Kodi
-
-	  https://github.com/opdenkamp/xbmc-pvr-addons

deleted file mode 100644
index 1a09265..0000000
@@ -1,27 +0,0 @@
-################################################################################
-#
-# kodi-pvr-addons
-#
-################################################################################
-
-# This cset is on the branch 'helix'
-# When Kodi is updated, this should be updated to the corresponding branch
-KODI_PVR_ADDONS_VERSION = 4854fbe9dc0499ca8d1e10e8c18e329d3eb48814
-KODI_PVR_ADDONS_SITE = $(call github,opdenkamp,xbmc-pvr-addons,$(KODI_PVR_ADDONS_VERSION))
-KODI_PVR_ADDONS_LICENSE = GPLv3+
-KODI_PVR_ADDONS_LICENSE_FILES = COPYING
-
-# There's no ./configure in the git tree, we need to generate it
-KODI_PVR_ADDONS_AUTORECONF = YES
-
-KODI_PVR_ADDONS_DEPENDENCIES = zlib
-# This really is a runtime dependency, but we need KODI to be installed
-# first, since we'll install files in KODI's directories _after_ KODI has
-# installed its own files
-KODI_PVR_ADDONS_DEPENDENCIES += kodi
-
-KODI_PVR_ADDONS_CONF_OPTS = \
-	--enable-release \
-	--enable-addons-with-dependencies
-
-$(eval $(autotools-package))

index f182fbf..13638df 100644
@@ -249,6 +249,10 @@ config BR2_PACKAGE_KODI_WAVPACK
 config BR2_PACKAGE_KODI_OPTICALDRIVE
 	bool
 
+menu "PVR addons"
+	source "package/kodi-addon-xvdr/Config.in"
+endmenu
+
 menu "Audio encoder addons"
 	source "package/kodi-audioencoder-flac/Config.in"
 	source "package/kodi-audioencoder-lame/Config.in"

@@ -256,9 +260,4 @@ menu "Audio encoder addons"
 	source "package/kodi-audioencoder-wav/Config.in"
 endmenu
 
-comment "Kodi PVR addons"
-
-source "package/kodi-addon-xvdr/Config.in"
-source "package/kodi-pvr-addons/Config.in"
-
 endif # BR2_PACKAGE_KODI

new file mode 100644
index 0000000..cde1925
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PLATFORM
+	bool
+	select BR2_PACKAGE_LIBPLATFORM
+	help
+	  Kodi add-on platform support library
+
+	  https://github.com/xbmc/kodi-platform

new file mode 100644
index 0000000..22d7752
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-platform
+#
+################################################################################
+
+KODI_PLATFORM_VERSION = 33b6390b5d2abe5b674f9eb04bdee19228543054
+KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION))
+KODI_PLATFORM_LICENSE = GPLv3+
+KODI_PLATFORM_LICENSE_FILES = COPYING
+KODI_PLATFORM_INSTALL_STAGING = YES
+KODI_PLATFORM_DEPENDENCIES = libplatform kodi
+
+KODI_PLATFORM_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 13638df..454f839 100644
@@ -102,6 +102,8 @@ menuconfig BR2_PACKAGE_KODI
 
 if BR2_PACKAGE_KODI
 
+source "package/kodi-platform/Config.in"
+
 config BR2_PACKAGE_KODI_ALSA_LIB
 	bool "alsa"
 	select BR2_PACKAGE_ALSA_LIB

new file mode 100644
index 0000000..698ff46
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_ARGUSTV
+	bool "kodi-pvr-argustv"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Kodi's ARGUS TV client addon
+
+	  https://github.com/kodi-pvr/pvr.argustv

new file mode 100644
index 0000000..0e318e6
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-argustv
+#
+################################################################################
+
+KODI_PVR_ARGUSTV_VERSION = 96c80267935d8edc4f6f92d16b540ef77cdcb1db
+KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION))
+KODI_PVR_ARGUSTV_LICENSE = GPLv2+
+KODI_PVR_ARGUSTV_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_ARGUSTV_DEPENDENCIES = jsoncpp kodi-platform
+
+KODI_PVR_ARGUSTV_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 454f839..bb9e3fc 100644
@@ -253,6 +253,7 @@ config BR2_PACKAGE_KODI_OPTICALDRIVE
 
 menu "PVR addons"
 	source "package/kodi-addon-xvdr/Config.in"
+	source "package/kodi-pvr-argustv/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..57f1127
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_KODI_PVR_DVBLINK
+	bool "kodi-pvr-dvblink"
+	select BR2_PACKAGE_KODI_PLATFORM
+	select BR2_PACKAGE_TINYXML2
+	help
+	  Kodi's DVBLink client addon
+
+	  https://github.com/kodi-pvr/pvr.dvblink

new file mode 100644
index 0000000..745f3cd
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-dvblink
+#
+################################################################################
+
+KODI_PVR_DVBLINK_VERSION = cf756e9241c58d98c3b56dfcae89da9f35e4555f
+KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION))
+KODI_PVR_DVBLINK_LICENSE = GPLv2+
+KODI_PVR_DVBLINK_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_DVBLINK_DEPENDENCIES = kodi-platform tinyxml2
+
+KODI_PVR_DVBLINK_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index bb9e3fc..b21530b 100644
@@ -254,6 +254,7 @@ config BR2_PACKAGE_KODI_OPTICALDRIVE
 menu "PVR addons"
 	source "package/kodi-addon-xvdr/Config.in"
 	source "package/kodi-pvr-argustv/Config.in"
+	source "package/kodi-pvr-dvblink/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..e7dd7b3
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_DVBVIEWER
+	bool "kodi-pvr-dvbviewer"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Kodi's DVBViewer client addon
+
+	  https://github.com/kodi-pvr/pvr.dvbviewer

new file mode 100644
index 0000000..21e6372
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-dvbviewer
+#
+################################################################################
+
+KODI_PVR_DVBVIEWER_VERSION = cbfd4552a4381d289bcfb8eda33699ecfd156bd7
+KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION))
+KODI_PVR_DVBVIEWER_LICENSE = GPLv2+
+KODI_PVR_DVBVIEWER_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_DVBVIEWER_DEPENDENCIES = kodi-platform
+
+KODI_PVR_DVBVIEWER_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index b21530b..716f8e1 100644
@@ -255,6 +255,7 @@ menu "PVR addons"
 	source "package/kodi-addon-xvdr/Config.in"
 	source "package/kodi-pvr-argustv/Config.in"
 	source "package/kodi-pvr-dvblink/Config.in"
+	source "package/kodi-pvr-dvbviewer/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..0b662df
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_KODI_PVR_FILMON
+	bool "kodi-pvr-filmon"
+	select BR2_PACKAGE_JSONCPP
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Filmon PVR client addon for Kodi
+
+	  https://github.com/kodi-pvr/pvr.filmon

new file mode 100644
index 0000000..8dabb03
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-filmon
+#
+################################################################################
+
+KODI_PVR_FILMON_VERSION = 5c41f4e361c9bcdd6e53cffd541222c5aa131a27
+KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION))
+KODI_PVR_FILMON_LICENSE = GPLv2+
+KODI_PVR_FILMON_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_FILMON_DEPENDENCIES = jsoncpp kodi-platform
+
+KODI_PVR_FILMON_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 716f8e1..12d299c 100644
@@ -256,6 +256,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-argustv/Config.in"
 	source "package/kodi-pvr-dvblink/Config.in"
 	source "package/kodi-pvr-dvbviewer/Config.in"
+	source "package/kodi-pvr-filmon/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..c4c4497
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_HTS
+	bool "kodi-pvr-hts"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Tvheadend HTSP PVR client addon for Kodi
+
+	  https://github.com/kodi-pvr/pvr.hts

new file mode 100644
index 0000000..abd8b6b
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-hts
+#
+################################################################################
+
+KODI_PVR_HTS_VERSION = 5c2244044a00ecd3320fc6ce15dd208c16578588
+KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION))
+KODI_PVR_HTS_LICENSE = GPLv2+
+KODI_PVR_HTS_LICENSE_FILES = src/Tvheadend.cpp
+
+KODI_PVR_HTS_DEPENDENCIES = kodi-platform
+
+KODI_PVR_HTS_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 12d299c..9a20d83 100644
@@ -257,6 +257,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-dvblink/Config.in"
 	source "package/kodi-pvr-dvbviewer/Config.in"
 	source "package/kodi-pvr-filmon/Config.in"
+	source "package/kodi-pvr-hts/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..b596749
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_IPTVSIMPLE
+	bool "kodi-pvr-iptvsimple"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  IPTV Live TV and Radio PVR client addon for Kodi
+
+	  https://github.com/kodi-pvr/pvr.iptvsimple

new file mode 100644
index 0000000..60329bd
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-iptvsimple
+#
+################################################################################
+
+KODI_PVR_IPTVSIMPLE_VERSION = 23defebace9a596d549a688c1d017900aeaf7761
+KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION))
+KODI_PVR_IPTVSIMPLE_LICENSE = GPLv2+
+KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi-platform
+
+KODI_PVR_IPTVSIMPLE_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 9a20d83..fe1d032 100644
@@ -258,6 +258,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-dvbviewer/Config.in"
 	source "package/kodi-pvr-filmon/Config.in"
 	source "package/kodi-pvr-hts/Config.in"
+	source "package/kodi-pvr-iptvsimple/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..733ca88
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_MEDIAPORTAL_TVSERVER
+	bool "kodi-pvr-mediaportal-tvserver"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  MediaPortal TVServer PVR client addon for Kodi
+
+	  https://github.com/kodi-pvr/pvr.mediaportal.tvserver

new file mode 100644
index 0000000..3509b28
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-mediaportal-tvserver
+#
+################################################################################
+
+KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 29809d10010a21b08b9e652e36bc51dac2171690
+KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION))
+KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPLv2+
+KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = src/README
+
+KODI_PVR_MEDIAPORTAL_TVSERVER_DEPENDENCIES = kodi-platform
+
+KODI_PVR_MEDIAPORTAL_TVSERVER_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index fe1d032..ad1d23e 100644
@@ -259,6 +259,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-filmon/Config.in"
 	source "package/kodi-pvr-hts/Config.in"
 	source "package/kodi-pvr-iptvsimple/Config.in"
+	source "package/kodi-pvr-mediaportal-tvserver/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..798ff3e
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_MYTHTV
+	bool "kodi-pvr-mythtv"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  MythTV PVR for Kodi
+
+	  https://github.com/kodi-pvr/pvr.mythtv

new file mode 100644
index 0000000..c90eeeb
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-mythtv
+#
+################################################################################
+
+KODI_PVR_MYTHTV_VERSION = 75fee97e2e690b0ee6d2b1540218b61586683e20
+KODI_PVR_MYTHTV_SITE = $(call github,kodi-pvr,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION))
+KODI_PVR_MYTHTV_LICENSE = GPLv2+
+KODI_PVR_MYTHTV_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_MYTHTV_DEPENDENCIES = kodi-platform
+
+KODI_PVR_MYTHTV_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index ad1d23e..80ffe3a 100644
@@ -260,6 +260,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-hts/Config.in"
 	source "package/kodi-pvr-iptvsimple/Config.in"
 	source "package/kodi-pvr-mediaportal-tvserver/Config.in"
+	source "package/kodi-pvr-mythtv/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..e520426
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_NEXTPVR
+	bool "kodi-pvr-nextpvr"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Kodi's NextPVR client addon
+
+	  https://github.com/kodi-pvr/pvr.nextpvr

new file mode 100644
index 0000000..0193b6a
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-nextpvr
+#
+################################################################################
+
+KODI_PVR_NEXTPVR_VERSION = 3a205e49b50baba605d3235f6613fdd36c1d3234
+KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION))
+KODI_PVR_NEXTPVR_LICENSE = GPLv2+
+KODI_PVR_NEXTPVR_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_NEXTPVR_DEPENDENCIES = kodi-platform
+
+KODI_PVR_NEXTPVR_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 80ffe3a..53dfa42 100644
@@ -261,6 +261,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-iptvsimple/Config.in"
 	source "package/kodi-pvr-mediaportal-tvserver/Config.in"
 	source "package/kodi-pvr-mythtv/Config.in"
+	source "package/kodi-pvr-nextpvr/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..33c493c
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_NJOY
+	bool "kodi-pvr-njoy"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Kodi's Njoy N7 client addon
+
+	  https://github.com/kodi-pvr/pvr.njoy

new file mode 100644
index 0000000..618e3be
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-njoy
+#
+################################################################################
+
+KODI_PVR_NJOY_VERSION = 4f88a097cb62b4604ffb0ac293a5dc8f40885e79
+KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION))
+KODI_PVR_NJOY_LICENSE = GPLv2+
+KODI_PVR_NJOY_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_NJOY_DEPENDENCIES = kodi-platform
+
+KODI_PVR_NJOY_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 53dfa42..f9a3602 100644
@@ -262,6 +262,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-mediaportal-tvserver/Config.in"
 	source "package/kodi-pvr-mythtv/Config.in"
 	source "package/kodi-pvr-nextpvr/Config.in"
+	source "package/kodi-pvr-njoy/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..255cd4a
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_KODI_PVR_PCTV
+	bool "kodi-pvr-pctv"
+	select BR2_PACKAGE_JSONCPP
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  PCTV PVR client addon for Kodi
+
+	  https://github.com/kodi-pvr/pvr.vdr.vnsi

new file mode 100644
index 0000000..978cb7b
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-pctv
+#
+################################################################################
+
+KODI_PVR_PCTV_VERSION = d23160c043b0cd0a86463f6a3590a8126ff8af9d
+KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION))
+KODI_PVR_PCTV_LICENSE = GPLv2+
+KODI_PVR_PCTV_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_PCTV_DEPENDENCIES = jsoncpp kodi-platform
+
+KODI_PVR_PCTV_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index f9a3602..6aaf72f 100644
@@ -263,6 +263,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-mythtv/Config.in"
 	source "package/kodi-pvr-nextpvr/Config.in"
 	source "package/kodi-pvr-njoy/Config.in"
+	source "package/kodi-pvr-pctv/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..b327fd8
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_STALKER
+	bool "kodi-pvr-stalker"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  A PVR Client that connects Kodi to Stalker Middleware
+
+	  https://github.com/kodi-pvr/pvr.stalker

new file mode 100644
index 0000000..8e98425
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-stalker
+#
+################################################################################
+
+KODI_PVR_STALKER_VERSION = 5f6eb1992ffd45a075ebb7bc4253c4a88bf65c80
+KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION))
+KODI_PVR_STALKER_LICENSE = GPLv2+
+KODI_PVR_STALKER_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_STALKER_DEPENDENCIES = kodi-platform
+
+KODI_PVR_STALKER_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 6aaf72f..3cbc9aa 100644
@@ -264,6 +264,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-nextpvr/Config.in"
 	source "package/kodi-pvr-njoy/Config.in"
 	source "package/kodi-pvr-pctv/Config.in"
+	source "package/kodi-pvr-stalker/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..3a5f8c4
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_VBOX
+	bool "kodi-pvr-vbox"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Kodi PVR addon for interfacing with VBox Communications XTi TV Gateway
+
+	  https://github.com/kodi-pvr/pvr.vbox

new file mode 100644
index 0000000..5fc8eb4
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-vbox
+#
+################################################################################
+
+KODI_PVR_VBOX_VERSION = 874eb8812db1dd1b2626ed6c9f8391790f0e6818
+KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION))
+KODI_PVR_VBOX_LICENSE = GPLv2+
+KODI_PVR_VBOX_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_VBOX_DEPENDENCIES = kodi-platform
+
+KODI_PVR_VBOX_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 3cbc9aa..7b497fc 100644
@@ -265,6 +265,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-njoy/Config.in"
 	source "package/kodi-pvr-pctv/Config.in"
 	source "package/kodi-pvr-stalker/Config.in"
+	source "package/kodi-pvr-vbox/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..768dec8
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_VDR_VNSI
+	bool "kodi-pvr-vdr-vnsi"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Kodi PVR addon VNSI
+
+	  https://github.com/kodi-pvr/pvr.vdr.vnsi

new file mode 100644
index 0000000..bac61ab
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-vdr-vnsi
+#
+################################################################################
+
+KODI_PVR_VDR_VNSI_VERSION = 550a4a2e093b4418394cdbe6f72cd7c76f0327b7
+KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION))
+KODI_PVR_VDR_VNSI_LICENSE = GPLv2+
+KODI_PVR_VDR_VNSI_LICENSE_FILES = src/VNSI_Admin.cpp
+
+KODI_PVR_VDR_VNSI_DEPENDENCIES = kodi-platform
+
+KODI_PVR_VDR_VNSI_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 7b497fc..92f10df 100644
@@ -266,6 +266,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-pctv/Config.in"
 	source "package/kodi-pvr-stalker/Config.in"
 	source "package/kodi-pvr-vbox/Config.in"
+	source "package/kodi-pvr-vdr-vnsi/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..a56c4ed
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_VUPLUS
+	bool "kodi-pvr-vuplus"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  VuPlus PVR client addon for Kodi
+
+	  https://github.com/kodi-pvr/pvr.vuplus

new file mode 100644
index 0000000..c44bdc4
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-vuplus
+#
+################################################################################
+
+KODI_PVR_VUPLUS_VERSION = 96115e9b8898ed6bde36874b43b2fba531cfef5c
+KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION))
+KODI_PVR_VUPLUS_LICENSE = GPLv2+
+KODI_PVR_VUPLUS_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_VUPLUS_DEPENDENCIES = kodi-platform
+
+KODI_PVR_VUPLUS_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 92f10df..f184db0 100644
@@ -267,6 +267,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-stalker/Config.in"
 	source "package/kodi-pvr-vbox/Config.in"
 	source "package/kodi-pvr-vdr-vnsi/Config.in"
+	source "package/kodi-pvr-vuplus/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..2672c83
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_PVR_WMC
+	bool "kodi-pvr-wmc"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Kodi's Windows Media Center client addon
+
+	  https://github.com/kodi-pvr/pvr.wmc

new file mode 100644
index 0000000..4d6d839
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-pvr-wmc
+#
+################################################################################
+
+KODI_PVR_WMC_VERSION = e19c3e99c87e81d406bac0bc4e8edeb47df66dcc
+KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION))
+KODI_PVR_WMC_LICENSE = GPLv2+
+KODI_PVR_WMC_LICENSE_FILES = src/client.cpp
+
+KODI_PVR_WMC_DEPENDENCIES = kodi-platform
+
+KODI_PVR_WMC_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index f184db0..e3a9393 100644
@@ -268,6 +268,7 @@ menu "PVR addons"
 	source "package/kodi-pvr-vbox/Config.in"
 	source "package/kodi-pvr-vdr-vnsi/Config.in"
 	source "package/kodi-pvr-vuplus/Config.in"
+	source "package/kodi-pvr-wmc/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..0269973
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_KODI_AUDIODECODER_MODPLUG
+	bool "kodi-audiodecoder-modplug"
+	select BR2_PACKAGE_KODI_PLATFORM
+	select BR2_PACKAGE_LIBMODPLUG
+	help
+	  Modplug decoder addon for Kodi
+
+	  https://github.com/notspiff/audiodecoder.modplug

new file mode 100644
index 0000000..69cb622
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-audiodecoder-modplug
+#
+################################################################################
+
+KODI_AUDIODECODER_MODPLUG_VERSION = 5ae7349f39a8e5552c86dfdad339fb18c7e52550
+KODI_AUDIODECODER_MODPLUG_SITE = $(call github,notspiff,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION))
+KODI_AUDIODECODER_MODPLUG_LICENSE = GPLv2+
+KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = src/ModplugCodec.cpp
+
+KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi-platform libmodplug
+
+KODI_AUDIODECODER_MODPLUG_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index e3a9393..f7041c3 100644
@@ -271,6 +271,10 @@ menu "PVR addons"
 	source "package/kodi-pvr-wmc/Config.in"
 endmenu
 
+menu "Audio decoder addons"
+	source "package/kodi-audiodecoder-modplug/Config.in"
+endmenu
+
 menu "Audio encoder addons"
 	source "package/kodi-audioencoder-flac/Config.in"
 	source "package/kodi-audioencoder-lame/Config.in"

new file mode 100644
index 0000000..96591aa
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_AUDIODECODER_NOSEFART
+	bool "kodi-audiodecoder-nosefart"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Nosefart decoder addon for Kodi
+
+	  https://github.com/notspiff/audiodecoder.nosefart

new file mode 100644
index 0000000..b849e76
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-audiodecoder-nosefart
+#
+################################################################################
+
+KODI_AUDIODECODER_NOSEFART_VERSION = 936313f2be5c4936af8a643876363dcea76a8ebe
+KODI_AUDIODECODER_NOSEFART_SITE = $(call github,notspiff,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION))
+KODI_AUDIODECODER_NOSEFART_LICENSE = GPLv2+
+KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = src/NSFCodec.cpp
+
+KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi-platform
+
+KODI_AUDIODECODER_NOSEFART_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index f7041c3..94a3624 100644
@@ -273,6 +273,7 @@ endmenu
 
 menu "Audio decoder addons"
 	source "package/kodi-audiodecoder-modplug/Config.in"
+	source "package/kodi-audiodecoder-nosefart/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..ae99afa
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_KODI_AUDIODECODER_SIDPLAY
+	bool "kodi-audiodecoder-sidplay"
+	select BR2_PACKAGE_KODI_PLATFORM
+	select BR2_PACKAGE_LIBSIDPLAY2
+	help
+	  Sidplay decoder addon for Kodi
+
+	  https://github.com/notspiff/audiodecoder.sidplay

new file mode 100644
index 0000000..ba9a515
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-audiodecoder-sidplay
+#
+################################################################################
+
+KODI_AUDIODECODER_SIDPLAY_VERSION = 27b2c0582878857bfe03195471fa7ffa4bcc40f0
+KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,notspiff,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION))
+KODI_AUDIODECODER_SIDPLAY_LICENSE = GPLv2+
+KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = src/SIDCodec.cpp
+
+KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi-platform libsidplay2
+
+KODI_AUDIODECODER_SIDPLAY_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 94a3624..790be0d 100644
@@ -274,6 +274,7 @@ endmenu
 menu "Audio decoder addons"
 	source "package/kodi-audiodecoder-modplug/Config.in"
 	source "package/kodi-audiodecoder-nosefart/Config.in"
+	source "package/kodi-audiodecoder-sidplay/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..0cb572f
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_AUDIODECODER_SNESAPU
+	bool "kodi-audiodecoder-snesapu"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  SPC decoder addon for Kodi
+
+	  https://github.com/notspiff/audiodecoder.snesapu

new file mode 100644
index 0000000..6d433d7
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-audiodecoder-snesapu
+#
+################################################################################
+
+KODI_AUDIODECODER_SNESAPU_VERSION = 399d1d3f32fe6f62f5657b8ce67c30229629cb51
+KODI_AUDIODECODER_SNESAPU_SITE = $(call github,notspiff,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION))
+KODI_AUDIODECODER_SNESAPU_LICENSE = GPLv2+
+KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = src/SPCCodec.cpp
+
+KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi-platform
+
+KODI_AUDIODECODER_SNESAPU_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 790be0d..91d9783 100644
@@ -275,6 +275,7 @@ menu "Audio decoder addons"
 	source "package/kodi-audiodecoder-modplug/Config.in"
 	source "package/kodi-audiodecoder-nosefart/Config.in"
 	source "package/kodi-audiodecoder-sidplay/Config.in"
+	source "package/kodi-audiodecoder-snesapu/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..6be216a
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_AUDIODECODER_STSOUND
+	bool "kodi-audiodecoder-stsound"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  YM decoder addon for Kodi
+
+	  https://github.com/notspiff/audiodecoder.stsound

new file mode 100644
index 0000000..2898311
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-audiodecoder-stsound
+#
+################################################################################
+
+KODI_AUDIODECODER_STSOUND_VERSION = f6fbae94818fedd09e2f55c6cd1cb283bfdab6f4
+KODI_AUDIODECODER_STSOUND_SITE = $(call github,notspiff,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION))
+KODI_AUDIODECODER_STSOUND_LICENSE = GPLv2+
+KODI_AUDIODECODER_STSOUND_LICENSE_FILES = src/YMCodec.cpp
+
+KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi-platform
+
+KODI_AUDIODECODER_STSOUND_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 91d9783..8bf3ee1 100644
@@ -276,6 +276,7 @@ menu "Audio decoder addons"
 	source "package/kodi-audiodecoder-nosefart/Config.in"
 	source "package/kodi-audiodecoder-sidplay/Config.in"
 	source "package/kodi-audiodecoder-snesapu/Config.in"
+	source "package/kodi-audiodecoder-stsound/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..8f604ad
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_AUDIODECODER_TIMIDITY
+	bool "kodi-audiodecoder-timidity"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Timidity decoder addon for Kodi
+
+	  https://github.com/notspiff/audiodecoder.timidity

new file mode 100644
index 0000000..70672c4
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-audiodecoder-timidity
+#
+################################################################################
+
+KODI_AUDIODECODER_TIMIDITY_VERSION = da5eb9ac6557fc1ea0f48cc044cfd16f4f2a1e0b
+KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,notspiff,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION))
+KODI_AUDIODECODER_TIMIDITY_LICENSE = GPLv2+
+KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = src/TimidityCodec.cpp
+
+KODI_AUDIODECODER_TIMIDITY_DEPENDENCIES = kodi-platform
+
+KODI_AUDIODECODER_TIMIDITY_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 8bf3ee1..bf937ad 100644
@@ -277,6 +277,7 @@ menu "Audio decoder addons"
 	source "package/kodi-audiodecoder-sidplay/Config.in"
 	source "package/kodi-audiodecoder-snesapu/Config.in"
 	source "package/kodi-audiodecoder-stsound/Config.in"
+	source "package/kodi-audiodecoder-timidity/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..ebf83df
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_AUDIODECODER_VGMSTREAM
+	bool "kodi-audiodecoder-vgmstream"
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  VGM decoder addon for Kodi
+
+	  https://github.com/notspiff/audiodecoder.vgmstream

new file mode 100644
index 0000000..a888e9f
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-audiodecoder-vgmstream
+#
+################################################################################
+
+KODI_AUDIODECODER_VGMSTREAM_VERSION = 7723f9130957f4684eac5788ccbc2f45c39590ad
+KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,notspiff,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION))
+KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPLv2+
+KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = src/VGMCodec.cpp
+
+KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi-platform
+
+KODI_AUDIODECODER_VGMSTREAM_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index bf937ad..63c3564 100644
@@ -278,6 +278,7 @@ menu "Audio decoder addons"
 	source "package/kodi-audiodecoder-snesapu/Config.in"
 	source "package/kodi-audiodecoder-stsound/Config.in"
 	source "package/kodi-audiodecoder-timidity/Config.in"
+	source "package/kodi-audiodecoder-vgmstream/Config.in"
 endmenu
 
 menu "Audio encoder addons"

new file mode 100644
index 0000000..b1a1d20
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS
+	bool "kodi-screensaver-asteroids"
+	help
+	  Asteroids screensaver for Kodi
+
+	  https://github.com/notspiff/screensaver.asteroids

new file mode 100644
index 0000000..cc25e40
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-screensaver-asteroids
+#
+################################################################################
+
+KODI_SCREENSAVER_ASTEROIDS_VERSION = d4c2e3b499544ef55be364b34e5569d9c31c9615
+KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,notspiff,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION))
+KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPLv2+
+KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = src/main.cpp
+
+KODI_SCREENSAVER_ASTEROIDS_DEPENDENCIES = kodi
+
+KODI_SCREENSAVER_ASTEROIDS_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 63c3564..60e0e15 100644
@@ -288,4 +288,8 @@ menu "Audio encoder addons"
 	source "package/kodi-audioencoder-wav/Config.in"
 endmenu
 
+menu "Screensavers"
+	source "package/kodi-screensaver-asteroids/Config.in"
+endmenu
+
 endif # BR2_PACKAGE_KODI

new file mode 100644
index 0000000..31e1017
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_SCREENSAVER_BIOGENESIS
+	bool "kodi-screensaver-biogenesis"
+	help
+	  BioGenesis screensaver for Kodi
+
+	  https://github.com/notspiff/screensaver.biogenesis

new file mode 100644
index 0000000..3639198
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-screensaver-biogenesis
+#
+################################################################################
+
+KODI_SCREENSAVER_BIOGENESIS_VERSION = 2eccbd4e46320de03fde6731c560660659fd34d7
+KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,notspiff,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION))
+KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPLv2+
+KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = src/Life.cpp
+
+KODI_SCREENSAVER_BIOGENESIS_DEPENDENCIES = kodi
+
+KODI_SCREENSAVER_BIOGENESIS_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 60e0e15..9598c53 100644
@@ -290,6 +290,7 @@ endmenu
 
 menu "Screensavers"
 	source "package/kodi-screensaver-asteroids/Config.in"
+	source "package/kodi-screensaver-biogenesis/Config.in"
 endmenu
 
 endif # BR2_PACKAGE_KODI

new file mode 100644
index 0000000..88edbf0
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH
+	bool "kodi-screensaver-crystalmorph"
+	depends on BR2_PACKAGE_KODI_GL # libglu
+	help
+	  CrystalMorph screensaver for Kodi
+
+	  https://github.com/notspiff/screensaver.crystalmorph
+
+comment "crystalmorph needs an OpenGL backend"
+	depends on !BR2_PACKAGE_KODI_GL

new file mode 100644
index 0000000..afa48ff
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-screensaver-crystalmorph
+#
+################################################################################
+
+KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 2e7c10e3543f5aaab6fd2f5aa9d05b976a43ba68
+KODI_SCREENSAVER_CRYSTALMORPH_SITE = $(call github,notspiff,screensaver.crystalmorph,$(KODI_SCREENSAVER_CRYSTALMORPH_VERSION))
+KODI_SCREENSAVER_CRYSTALMORPH_LICENSE = GPLv2+
+KODI_SCREENSAVER_CRYSTALMORPH_LICENSE_FILES = src/Fractal.cpp
+
+KODI_SCREENSAVER_CRYSTALMORPH_DEPENDENCIES = kodi
+
+KODI_SCREENSAVER_CRYSTALMORPH_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 9598c53..87b3698 100644
@@ -291,6 +291,7 @@ endmenu
 menu "Screensavers"
 	source "package/kodi-screensaver-asteroids/Config.in"
 	source "package/kodi-screensaver-biogenesis/Config.in"
+	source "package/kodi-screensaver-crystalmorph/Config.in"
 endmenu
 
 endif # BR2_PACKAGE_KODI

new file mode 100644
index 0000000..fd83295
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_SCREENSAVER_GREYNETIC
+	bool "kodi-screensaver-greynetic"
+	help
+	  Greynetic screensaver for Kodi
+
+	  https://github.com/notspiff/screensaver.greynetic

new file mode 100644
index 0000000..fb72b70
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-screensaver-greynetic
+#
+################################################################################
+
+KODI_SCREENSAVER_GREYNETIC_VERSION = 5f370b0f1a51e57719f605344e94824105316c17
+KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,notspiff,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION))
+KODI_SCREENSAVER_GREYNETIC_LICENSE = GPLv2+
+KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = src/GreyNetic.cpp
+
+KODI_SCREENSAVER_GREYNETIC_DEPENDENCIES = kodi
+
+KODI_SCREENSAVER_GREYNETIC_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 87b3698..56a378e 100644
@@ -292,6 +292,7 @@ menu "Screensavers"
 	source "package/kodi-screensaver-asteroids/Config.in"
 	source "package/kodi-screensaver-biogenesis/Config.in"
 	source "package/kodi-screensaver-crystalmorph/Config.in"
+	source "package/kodi-screensaver-greynetic/Config.in"
 endmenu
 
 endif # BR2_PACKAGE_KODI

new file mode 100644
index 0000000..916b8c2
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_SCREENSAVER_PINGPONG
+	bool "kodi-screensaver-pingpong"
+	help
+	  Ping-pong screensaver for Kodi
+
+	  https://github.com/notspiff/screensaver.pingpong

new file mode 100644
index 0000000..57bcc92
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-screensaver-pingpong
+#
+################################################################################
+
+KODI_SCREENSAVER_PINGPONG_VERSION = 00fd2a7c70d581ada1bc89829c6870530b4c65b9
+KODI_SCREENSAVER_PINGPONG_SITE = $(call github,notspiff,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION))
+KODI_SCREENSAVER_PINGPONG_LICENSE = GPLv2+
+KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = src/readme.txt
+
+KODI_SCREENSAVER_PINGPONG_DEPENDENCIES = kodi
+
+KODI_SCREENSAVER_PINGPONG_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 56a378e..67be56c 100644
@@ -293,6 +293,7 @@ menu "Screensavers"
 	source "package/kodi-screensaver-biogenesis/Config.in"
 	source "package/kodi-screensaver-crystalmorph/Config.in"
 	source "package/kodi-screensaver-greynetic/Config.in"
+	source "package/kodi-screensaver-pingpong/Config.in"
 endmenu
 
 endif # BR2_PACKAGE_KODI

new file mode 100644
index 0000000..eaed84e
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_SCREENSAVER_PYRO
+	bool "kodi-screensaver-pyro"
+	help
+	  Pyro screensaver for Kodi
+
+	  https://github.com/notspiff/screensaver.pyro

new file mode 100644
index 0000000..97d63f4
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-screensaver-pyro
+#
+################################################################################
+
+KODI_SCREENSAVER_PYRO_VERSION = 7551f3f4b6414c40c1c4170c750b9f45dd995261
+KODI_SCREENSAVER_PYRO_SITE = $(call github,notspiff,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION))
+KODI_SCREENSAVER_PYRO_LICENSE = GPLv2+
+KODI_SCREENSAVER_PYRO_LICENSE_FILES = src/Pyro.cpp
+
+KODI_SCREENSAVER_PYRO_DEPENDENCIES = kodi
+
+KODI_SCREENSAVER_PYRO_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 67be56c..e574517 100644
@@ -294,6 +294,7 @@ menu "Screensavers"
 	source "package/kodi-screensaver-crystalmorph/Config.in"
 	source "package/kodi-screensaver-greynetic/Config.in"
 	source "package/kodi-screensaver-pingpong/Config.in"
+	source "package/kodi-screensaver-pyro/Config.in"
 endmenu
 
 endif # BR2_PACKAGE_KODI

new file mode 100644
index 0000000..e8f7862
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_SCREENSAVER_STARS
+	bool "kodi-screensaver-stars"
+	help
+	  Starfield screensaver for Kodi
+
+	  https://github.com/notspiff/screensaver.stars

new file mode 100644
index 0000000..bc86bd9
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-screensaver-stars
+#
+################################################################################
+
+KODI_SCREENSAVER_STARS_VERSION = 91b59f687ceb52488763aca4ba67d50a92f01731
+KODI_SCREENSAVER_STARS_SITE = $(call github,notspiff,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION))
+KODI_SCREENSAVER_STARS_LICENSE = GPLv2+
+KODI_SCREENSAVER_STARS_LICENSE_FILES = src/StarField.cpp
+
+KODI_SCREENSAVER_STARS_DEPENDENCIES = kodi
+
+KODI_SCREENSAVER_STARS_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index e574517..2cf6940 100644
@@ -295,6 +295,7 @@ menu "Screensavers"
 	source "package/kodi-screensaver-greynetic/Config.in"
 	source "package/kodi-screensaver-pingpong/Config.in"
 	source "package/kodi-screensaver-pyro/Config.in"
+	source "package/kodi-screensaver-stars/Config.in"
 endmenu
 
 endif # BR2_PACKAGE_KODI

new file mode 100644
index 0000000..10a6e55
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_VISUALISATION_SHADERTOY
+	bool "kodi-visualisation-shadertoy"
+	help
+	  Shadertoy visualiser for Kodi
+
+	  https://github.com/notspiff/visualization.shadertoy

new file mode 100644
index 0000000..72493c1
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-visualisation-shadertoy
+#
+################################################################################
+
+KODI_VISUALISATION_SHADERTOY_VERSION = a4eaaad4ab7204a30224f2c6952f7a7035ca1c38
+KODI_VISUALISATION_SHADERTOY_SITE = $(call github,notspiff,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION))
+KODI_VISUALISATION_SHADERTOY_LICENSE = GPLv2+
+KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = src/main.cpp
+
+KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = kodi
+
+KODI_VISUALISATION_SHADERTOY_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 2cf6940..e60815c 100644
@@ -298,4 +298,8 @@ menu "Screensavers"
 	source "package/kodi-screensaver-stars/Config.in"
 endmenu
 
+menu "Visualisations"
+	source "package/kodi-visualisation-shadertoy/Config.in"
+endmenu
+
 endif # BR2_PACKAGE_KODI

new file mode 100644
index 0000000..56f2509
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_VISUALISATION_WAVEFORM
+	bool "kodi-visualisation-waveform"
+	help
+	  Waveform visualiser for Kodi
+
+	  https://github.com/notspiff/visualization.waveform

new file mode 100644
index 0000000..ddf48f1
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-visualisation-waveform
+#
+################################################################################
+
+KODI_VISUALISATION_WAVEFORM_VERSION = abbdbffc5fd2dff1d627de8df3cb5a3887d1119c
+KODI_VISUALISATION_WAVEFORM_SITE = $(call github,notspiff,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION))
+KODI_VISUALISATION_WAVEFORM_LICENSE = GPLv2+
+KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = COPYING
+
+KODI_VISUALISATION_WAVEFORM_DEPENDENCIES = kodi
+
+KODI_VISUALISATION_WAVEFORM_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index e60815c..631483b 100644
@@ -300,6 +300,7 @@ endmenu
 
 menu "Visualisations"
 	source "package/kodi-visualisation-shadertoy/Config.in"
+	source "package/kodi-visualisation-waveform/Config.in"
 endmenu
 
 endif # BR2_PACKAGE_KODI

new file mode 100644
index 0000000..3b2b0a2
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_VISUALISATION_SPECTRUM
+	bool "kodi-visualisation-spectrum"
+	help
+	  Spectrum visualiser for Kodi
+
+	  https://github.com/notspiff/visualization.spectrum

new file mode 100644
index 0000000..3ea5775
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-visualisation-spectrum
+#
+################################################################################
+
+KODI_VISUALISATION_SPECTRUM_VERSION = aae1960b5bc14e50914205e2dabcb51077690a64
+KODI_VISUALISATION_SPECTRUM_SITE = $(call github,notspiff,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION))
+KODI_VISUALISATION_SPECTRUM_LICENSE = GPLv2+
+KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = COPYING
+
+KODI_VISUALISATION_SPECTRUM_DEPENDENCIES = kodi
+
+KODI_VISUALISATION_SPECTRUM_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 631483b..6048818 100644
@@ -300,6 +300,7 @@ endmenu
 
 menu "Visualisations"
 	source "package/kodi-visualisation-shadertoy/Config.in"
+	source "package/kodi-visualisation-spectrum/Config.in"
 	source "package/kodi-visualisation-waveform/Config.in"
 endmenu
 

new file mode 100644
index 0000000..9694027
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_VISUALISATION_WAVEFORHUE
+	bool "kodi-visualisation-waveforhue"
+	help
+	  WaveForHue visualiser for Kodi
+
+	  https://github.com/notspiff/visualization.waveforhue

new file mode 100644
index 0000000..d278654
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-visualisation-waveforhue
+#
+################################################################################
+
+KODI_VISUALISATION_WAVEFORHUE_VERSION = 330b5d0432a976993d8ea3e13f01ec9bd3d8b02e
+KODI_VISUALISATION_WAVEFORHUE_SITE = $(call github,notspiff,visualization.waveforhue,$(KODI_VISUALISATION_WAVEFORHUE_VERSION))
+KODI_VISUALISATION_WAVEFORHUE_LICENSE = GPLv2+
+KODI_VISUALISATION_WAVEFORHUE_LICENSE_FILES = COPYING
+
+KODI_VISUALISATION_WAVEFORHUE_DEPENDENCIES = kodi
+
+KODI_VISUALISATION_WAVEFORHUE_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 6048818..946694b 100644
@@ -301,6 +301,7 @@ endmenu
 menu "Visualisations"
 	source "package/kodi-visualisation-shadertoy/Config.in"
 	source "package/kodi-visualisation-spectrum/Config.in"
+	source "package/kodi-visualisation-waveforhue/Config.in"
 	source "package/kodi-visualisation-waveform/Config.in"
 endmenu
 

new file mode 100644
index 0000000..5be51c6
@@ -0,0 +1,23 @@
+diff -uNr visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt
+--- visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt	2014-10-31 11:34:21.000000000 +0100
++++ visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt	2015-07-19 19:49:43.340054342 +0200
+@@ -13,6 +13,10 @@
+                     ${KODI_INCLUDE_DIR}
+                     ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/src)
+ 
++get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME )
++string( REGEX REPLACE "-[^-]+$" ""
++        TOOLCHAIN_NAME "${COMPILER_FILENAME}" )
++
+ include(ExternalProject)
+ set(update_command "")
+ if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE)
+@@ -20,7 +24,7 @@
+ endif()
+ externalproject_add(libgoom SOURCE_DIR ${PROJECT_SOURCE_DIR}/lib/goom2k4-0
+                     "${update_command}"
+-                    CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix=<INSTALL_DIR>
++                    CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix=<INSTALL_DIR> --host=${TOOLCHAIN_NAME}
+                     BUILD_COMMAND ${MAKE}
+                     INSTALL_COMMAND "")
+ 

new file mode 100644
index 0000000..c1f1751
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_KODI_VISUALISATION_GOOM
+	bool "kodi-visualisation-goom"
+	depends on BR2_PACKAGE_KODI_GL
+	help
+	  GOOM visualiser for Kodi
+
+	  https://github.com/notspiff/visualization.goom
+
+comment "goom needs an OpenGL backend"
+	depends on !BR2_PACKAGE_KODI_GL

new file mode 100644
index 0000000..ee593e1
@@ -0,0 +1,17 @@
+################################################################################
+#
+# kodi-visualisation-goom
+#
+################################################################################
+
+KODI_VISUALISATION_GOOM_VERSION = fb5933ba5b2143d055cc7749dc60a82f6002b305
+KODI_VISUALISATION_GOOM_SITE = $(call github,notspiff,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION))
+KODI_VISUALISATION_GOOM_LICENSE = GPLv2+
+KODI_VISUALISATION_GOOM_LICENSE_FILES = COPYING
+
+KODI_VISUALISATION_GOOM_DEPENDENCIES = kodi
+
+KODI_VISUALISATION_GOOM_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 946694b..8538231 100644
@@ -136,15 +136,6 @@ config BR2_PACKAGE_KODI_LIBBLURAY
 comment "libbluray support needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 
-config BR2_PACKAGE_KODI_GOOM
-	bool "goom screensaver"
-	depends on BR2_PACKAGE_KODI_GL
-	help
-	  Enable goom screensaver
-
-comment "goom needs an OpenGL backend"
-	depends on !BR2_PACKAGE_KODI_GL
-
 config BR2_PACKAGE_KODI_RSXS
 	bool "rsxs screensaver"
 	depends on BR2_PACKAGE_KODI_GL

@@ -299,6 +290,7 @@ menu "Screensavers"
 endmenu
 
 menu "Visualisations"
+	source "package/kodi-visualisation-goom/Config.in"
 	source "package/kodi-visualisation-shadertoy/Config.in"
 	source "package/kodi-visualisation-spectrum/Config.in"
 	source "package/kodi-visualisation-waveforhue/Config.in"

index 44ecea9..67310ce 100644
@@ -31,6 +31,7 @@ KODI_CONF_ENV = \
 
 KODI_CONF_OPTS +=  \
 	--with-ffmpeg=shared \
+	--disable-goom \
 	--disable-joystick \
 	--disable-openmax \
 	--disable-projectm \

@@ -117,12 +118,6 @@ KODI_CONF_OPTS += --disable-gles
 endif
 endif
 
-ifeq ($(BR2_PACKAGE_KODI_GOOM),y)
-KODI_CONF_OPTS += --enable-goom
-else
-KODI_CONF_OPTS += --disable-goom
-endif
-
 ifeq ($(BR2_PACKAGE_KODI_LIBUSB),y)
 KODI_DEPENDENCIES += libusb-compat
 KODI_CONF_OPTS += --enable-libusb

new file mode 100644
index 0000000..8b16298
@@ -0,0 +1,28 @@
+diff -uNr screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt
+--- screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt	2015-03-19 12:20:23.000000000 +0100
++++ screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt	2015-07-19 20:26:16.660481032 +0200
+@@ -33,6 +33,11 @@
+                     ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/skyrocket
+                     ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/solarwinds)
+                         
++
++get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME )
++string( REGEX REPLACE "-[^-]+$" ""
++        TOOLCHAIN_NAME "${COMPILER_FILENAME}" )
++
+ include(ExternalProject)
+ set(update_command "")
+ if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE)
+@@ -46,8 +51,11 @@
+   endif()
+ endif()
+ externalproject_add(rsxs SOURCE_DIR ${PROJECT_SOURCE_DIR}/${rsxs_dir}
+-                    CONFIGURE_COMMAND ${configure_start}
++                    CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no
++                                      ac_cv_func_malloc_0_nonnull=yes
++                                      ${configure_start}
+                                       --prefix=<INSTALL_DIR>
++                                      --host=${TOOLCHAIN_NAME}
+                                       --without-xscreensaver
+                                       --disable-cyclone
+                                       --disable-euphoria

new file mode 100644
index 0000000..810f785
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_SCREENSAVER_RSXS
+	bool "kodi-screensaver-rsxs"
+	help
+	  RSXS screensaver add-ons for Kodi
+
+	  https://github.com/notspiff/screensavers.rsxs

new file mode 100644
index 0000000..b36e83d
@@ -0,0 +1,15 @@
+################################################################################
+#
+# kodi-screensaver-rsxs
+#
+################################################################################
+
+KODI_SCREENSAVER_RSXS_VERSION = 195e0ec3fbbcb2ee2012cd560e42d05167f0f259
+KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION))
+
+KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi
+
+KODI_SCREENSAVER_RSXS_CONF_OPTS += \
+	-DCMAKE_MODULE_PATH=$(STAGING_DIR)/usr/lib/kodi
+
+$(eval $(cmake-package))

index 8538231..98fc126 100644
@@ -81,9 +81,7 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_TIFF
 	select BR2_PACKAGE_TINYXML
 	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL
-	select BR2_PACKAGE_XLIB_XMU if BR2_PACKAGE_KODI_GL # needed by rsxs screensaver
 	select BR2_PACKAGE_XLIB_XRANDR if BR2_PACKAGE_KODI_GL
-	select BR2_PACKAGE_XLIB_XT if BR2_PACKAGE_KODI_GL # needed by rsxs screensaver
 	select BR2_PACKAGE_YAJL
 	select BR2_PACKAGE_ZLIB
 	select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support

@@ -136,15 +134,6 @@ config BR2_PACKAGE_KODI_LIBBLURAY
 comment "libbluray support needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 
-config BR2_PACKAGE_KODI_RSXS
-	bool "rsxs screensaver"
-	depends on BR2_PACKAGE_KODI_GL
-	help
-	  Enable goom screensaver
-
-comment "rsxs needs an OpenGL backend"
-	depends on !BR2_PACKAGE_KODI_GL
-
 config BR2_PACKAGE_KODI_LIBCEC
 	bool "hdmi cec"
 	depends on !BR2_STATIC_LIBS # libcec

@@ -286,6 +275,7 @@ menu "Screensavers"
 	source "package/kodi-screensaver-greynetic/Config.in"
 	source "package/kodi-screensaver-pingpong/Config.in"
 	source "package/kodi-screensaver-pyro/Config.in"
+	source "package/kodi-screensaver-rsxs/Config.in"
 	source "package/kodi-screensaver-stars/Config.in"
 endmenu
 

index 67310ce..36b580c 100644
@@ -36,6 +36,7 @@ KODI_CONF_OPTS +=  \
 	--disable-openmax \
 	--disable-projectm \
 	--disable-pulse \
+	--disable-rsxs \
 	--disable-ssh \
 	--disable-vdpau \
 	--disable-vtbdecoder \

@@ -91,24 +92,8 @@ 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_RSXS),y)
-# fix rsxs compile
-# gcc5: http://trac.kodi.tv/ticket/16006#comment:6
-# make sure target libpng-config is used, options taken from rsxs-0.9/acinclude.m4
-KODI_CONF_ENV += \
-	ac_cv_type__Bool=yes \
-	jm_cv_func_gettimeofday_clobber=no \
-	mac_cv_pkg_png=$(STAGING_DIR)/usr/bin/libpng-config \
-	mac_cv_pkg_cppflags="`$(STAGING_DIR)/usr/bin/libpng-config --I_opts --cppflags`" \
-	mac_cv_pkg_cxxflags="`$(STAGING_DIR)/usr/bin/libpng-config --ccopts`" \
-	mac_cv_pkg_ldflags="`$(STAGING_DIR)/usr/bin/libpng-config --L_opts --R_opts`" \
-	mac_cv_pkg_libs="`$(STAGING_DIR)/usr/bin/libpng-config --libs`"
-KODI_CONF_OPTS += --enable-rsxs
 else
-KODI_CONF_OPTS += --disable-rsxs
-endif
-else
-KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-x11
+KODI_CONF_OPTS += --disable-gl --disable-x11
 ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y)
 KODI_DEPENDENCIES += libegl libgles
 KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`"

@@ -225,7 +210,6 @@ endef
 KODI_POST_INSTALL_STAGING_HOOKS += KODI_FIX_CONFIG_CMAKE
 
 define KODI_CLEAN_UNUSED_ADDONS
-	rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/screensaver.rsxs.plasma
 	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