kodi: update to 17.1

33 files changed, 37 insertions, 991 deletions

diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 6ab088e59..24d6abfca 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -4,38 +4,37 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kodi
-PKG_VERSION:=		16.1
-PKG_RELEASE:=		2
-PKG_HASH:=		7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10
+PKG_VERSION:=		17.3
+PKG_RELEASE:=		1
+PKG_HASH:=		1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
-PKG_DEPENDS:=		boost python2 libsquish libbluray libressl libxz
+PKG_DEPENDS:=		python2 libsquish libbluray libressl libxz
 PKG_DEPENDS+=		libass libmpeg2 libmad libdbus libglew mesa libxshmfence
-PKG_DEPENDS+=		libjpeg-turbo libogg libvorbis libmodplug libcurl
-PKG_DEPENDS+=		libflac libbz2 libtiff liblzo libnettle librtmp
-PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libpng libncurses
+PKG_DEPENDS+=		libogg libvorbis libmodplug libcurl libxrandr
+PKG_DEPENDS+=		libflac libbz2 libtiff libnettle librtmp
+PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libncurses
 PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate libuuid
 PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd libgtk2
 PKG_DEPENDS+=		libgpg-error libudev python2-mod-sqlite libffmpeg
 PKG_DEPENDS+=		libxslt libvorbisenc alsa-lib glib libglu libdcadec
-PKG_BUILDDEP:=		boost python2 libass ffmpeg libglew rtmpdump
+PKG_BUILDDEP:=		python2 libass ffmpeg libglew rtmpdump xrandr
 PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis
-PKG_BUILDDEP+=		curl flac bzip2 libtiff liblzo yajl mesa
-PKG_BUILDDEP+=		tinyxml sqlite pcre libpng libcdio freetype 
+PKG_BUILDDEP+=		curl flac bzip2 libtiff yajl mesa cmake-host
+PKG_BUILDDEP+=		tinyxml sqlite pcre libcdio freetype 
 PKG_BUILDDEP+=		libsamplerate taglib libjasper lame libmicrohttpd
 PKG_BUILDDEP+=		eudev alsa-lib glib glu libmodplug libgtk2
 PKG_BUILDDEP+=		libgpg-error dbus libxslt libvorbis libbluray
 PKG_BUILDDEP+=		swig-host liblzo-host libpng-host libjpeg-turbo-host
 PKG_BUILDDEP+=		zip-host unzip-host giflib-host libsquish libdcadec
-PKG_BUILDDEP+=		libcrossguid libressl libxshmfence xz bzip2
+PKG_BUILDDEP+=		libcrossguid libressl libxshmfence xz bzip2 liblzo
 PKG_NEEDS:=		threads c++
 PKG_URL:=		http://kodi.tv/
 PKG_SITES:=		https://github.com/xbmc/xbmc/archive/
 
-PKG_CFLINE_KODI:=	select ADK_PACKAGE_GPU_VIV_BIN_MX6Q if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-
-DISTFILES:=		$(PKG_VERSION)-Jarvis.tar.gz
-WRKDIST=		${WRKDIR}/xbmc-$(PKG_VERSION)-Jarvis
+DISTFILES:=		$(PKG_VERSION)-Krypton.tar.gz
+WRKDIST=		${WRKDIR}/xbmc-$(PKG_VERSION)-Krypton
+WRKSRC=			$(WRKDIR)/xbmc-$(PKG_VERSION)-Krypton/project/cmake
 
 PKG_FLAVOURS_KODI:=	WITH_SMB WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC 
 PKG_FLAVOURS_KODI+=	WITH_WEBSERVER WITH_LIRC
@@ -60,115 +59,38 @@ PKGFB_WITH_LIRC:=	lirc
 PKGFS_WITH_LIRC:=	lirc
 PKGFD_WITH_WEBSERVER:=	enable internal webserver support
 
-PKG_BUILDDEP_SOLIDRUN_IMX6:=	gpu-viv-bin-mx6q
 PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 raspberry-pi3 solidrun-imx6
 
-DIFF_IGNOREFILES:=	configure missing depcomp install-sh INSTALL \
-			aclocal.m4 config.h.in
-
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,KODI,kodi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_CXXFLAGS+=		$(HOST_CPPFLAGS)
-XAKE_FLAGS+=		V=1 TIXML_USE_STL=1 GCC_HONOUR_COPTS=s
-TARGET_CPPFLAGS+=	-I. -I./utils \
-			-I$(STAGING_TARGET_DIR)/usr/include/afpfs-ng \
-			-DTIXML_USE_STL=1 -DLINUX
-
-ifeq ($(ADK_TARGET_BOARD_BCM28XX),y)
-TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/opt/vc/include \
-			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vcos/pthreads \
-			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vmcs_host/linux
-TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/opt/vc/lib
-endif
-
-ifeq ($(ADK_TARGET_LIBICONV),y)
-TARGET_LDFLAGS+=	-liconv
-endif
-
-AUTOTOOL_STYLE:=	autoreconf
-CONFIGURE_ENV+=		DESTDIR='${WRKINST}' \
-			TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
-CONFIGURE_ARGS+=	--disable-optical-drive \
-			--disable-optimizations \
-			--disable-mysql \
-			--disable-mdnsembedded \
-			--disable-libusb \
-			--disable-libcap \
-			--disable-joystick \
-			--disable-dvdcss \
-			--disable-gtest \
-			--disable-ccache \
-			--disable-wayland \
-			--disable-pulse \
-			--disable-mid \
-			--disable-debug \
-			--enable-alsa \
-			--enable-rtmp \
-			--enable-libbluray \
-			--enable-texturepacker \
-			--enable-udev \
-			--with-ffmpeg=shared
-
-ifneq ($(ADK_PACKAGE_KODI_WITH_SMB),)
-CONFIGURE_ARGS+=	--enable-samba
-else
-CONFIGURE_ARGS+=	--disable-samba
-endif
-ifneq ($(ADK_PACKAGE_KODI_WITH_SSH),)
-CONFIGURE_ARGS+=	--enable-ssh
-else
-CONFIGURE_ARGS+=	--disable-ssh
-endif
-ifneq ($(ADK_PACKAGE_KODI_WITH_NFS),)
-CONFIGURE_ARGS+=	--enable-nfs
-else
-CONFIGURE_ARGS+=	--disable-nfs
-endif
-ifneq ($(ADK_PACKAGE_KODI_WITH_CEC),)
-CONFIGURE_ARGS+=	--enable-libcec
-else
-CONFIGURE_ARGS+=	--disable-libcec
-endif
-ifneq ($(ADK_PACKAGE_KODI_WITH_LIRC),)
-CONFIGURE_ARGS+=	--enable-lirc
-else
-CONFIGURE_ARGS+=	--disable-lirc
-endif
-ifneq ($(ADK_PACKAGE_KODI_WITH_AVAHI),)
-CONFIGURE_ARGS+=	--enable-avahi
-else
-CONFIGURE_ARGS+=	--disable-avahi
-endif
-ifneq ($(ADK_PACKAGE_KODI_WITH_WEBSERVER),)
-CONFIGURE_ARGS+=	--enable-webserver
-else
-CONFIGURE_ARGS+=	--disable-webserver
-endif
+HOST_CXXFLAGS:=		-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(WRKBUILD)/../../xbmc/linux
 
-ifeq ($(ADK_TARGET_BOARD_BCM28XX),y)
-CONFIGURE_ARGS+=	--with-platform=raspberry-pi \
-			--enable-player=omxplayer \
-			--enable-gles \
-			--disable-x11
-endif
-ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
-CONFIGURE_ARGS+=	--disable-x11 \
-			--enable-gles \
-			--enable-codec=imxvpu
-endif
+CONFIG_STYLE:=		cmake
+CMAKE_FLAGS+= 		-DENABLE_CCACHE=OFF \
+			-DENABLE_DVDCSS=ON \
+			-DENABLE_INTERNAL_CROSSGUID=OFF \
+			-DENABLE_INTERNAL_FFMPEG=OFF \
+			-DKODI_DEPENDSBUILD=OFF \
+			-DENABLE_OPENSSL=ON \
+			-DNATIVEPREFIX=$(STAGING_HOST_DIR)/usr \
+			-DDEPENDS_PATH=$(STAGING_HOST_DIR) \
+			-DWITH_TEXTUREPACKER=$(STAGING_HOST_DIR)/usr/bin/TexturePacker
 
 pre-configure:
-	(cd $(WRKBUILD)/lib/cpluff && env PATH='$(AUTOTOOL_PATH)' ./autogen.sh)
-	PATH='$(HOST_PATH)' \
-	make CXX="${HOST_CXX}" CC="${HOST_CC}" CFLAGS="${HOST_CFLAGS}" \
-		CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
-		 -C $(WRKBUILD)/tools/depends/native/JsonSchemaBuilder
-	PATH='$(HOST_PATH)' \
-	make CXX="${HOST_CXX}" CC="${HOST_CC}" CFLAGS="${HOST_CFLAGS}" \
-		CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
-		 -C $(WRKBUILD)/tools/depends/native/TexturePacker
+	#(cd $(WRKBUILD)/lib/cpluff && env PATH='$(AUTOTOOL_PATH)' ./autogen.sh)
+	(cd $(WRKBUILD)/../../tools/depends/native/JsonSchemaBuilder && PATH='$(HOST_PATH)' cmake .)
+	PATH='$(HOST_PATH)' make -C $(WRKBUILD)/../../tools/depends/native/JsonSchemaBuilder
+	cp $(WRKBUILD)/../../tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \
+		$(STAGING_HOST_DIR)/usr/bin
+	(cd $(WRKBUILD)/../../tools/depends/native/TexturePacker && PATH='$(HOST_PATH)' \
+		cmake -DCORE_SOURCE_DIR=$(WRKBUILD)/../.. \
+			-DCMAKE_MODULE_PATH=$(WRKBUILD)/../../project/cmake/modules \
+			-DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .)
+	PATH='$(HOST_PATH)' make -C $(WRKBUILD)/../../tools/depends/native/TexturePacker
+	cp $(WRKBUILD)/../../tools/depends/native/TexturePacker/TexturePacker \
+		$(STAGING_HOST_DIR)/usr/bin
 
 kodi-install:
 	$(INSTALL_DIR) $(IDIR_KODI)/usr/lib/kodi/addons
diff --git a/package/kodi/patches/patch-Makefile_in b/package/kodi/patches/patch-Makefile_in
deleted file mode 100644
index a50f137c1..000000000
--- a/package/kodi/patches/patch-Makefile_in
+++ /dev/null
@@ -1,110 +0,0 @@
---- xbmc-16.0-Jarvis.orig/Makefile.in	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/Makefile.in	2016-04-08 13:41:57.000000000 +0200
-@@ -314,17 +314,9 @@ $(DVDPLAYER_ARCHIVES)         : dvdpcode
- lib/cpluff/libcpluff/.libs/libcpluff.a: force
- 	$(MAKE) -C lib/cpluff/libcpluff
- system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a exports
--ifeq ($(findstring osx,@ARCH@), osx)
--  ifeq (@ARCH@, arm-osx)
--	$(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ $<
--  else
--	$(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -lexpat $(BUNDLE1_O) -o $@ $<
--  endif
--else
- 	$(CXX) $(LDFLAGS) -shared -o $@ -Wl,--whole-archive $< \
- 		-Wl,--no-whole-archive  \
- 		`cat xbmc/cores/DllLoader/exports/wrapper.def` xbmc/cores/DllLoader/exports/wrapper.o -lexpat
--endif
- 
- exports: xbmc/cores/DllLoader/exports/exports.a xbmc/cores/DllLoader/exports/util/exports_utils.a
- 	$(MAKE) -C xbmc/cores/DllLoader/exports wrapper.def
-@@ -348,13 +340,8 @@ dvdpextcodecs:
- endif
- 
- eventclients:
--ifeq ($(findstring osx,@ARCH@), osx)
--ifneq ($(findstring arm,@ARCH@), arm)
--	$(MAKE) -C tools/EventClients/Clients/OSXRemote
--endif
--else
- 	$(MAKE) -C tools/EventClients
--endif
-+
- libexif: dllloader
- 	$(MAKE) -C lib/libexif
- 
-@@ -423,19 +410,10 @@ $(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(M
- include xbmc/addons/addon-bindings.mk
- 
- lib@APP_NAME_LC@.so: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS)
--ifeq ($(findstring osx,@ARCH@), osx)
--	$(SILENT_LD) $(CXX) $(LDFLAGS) -bundle -o $@ $(MAINOBJS) -Wl,-all_load,-ObjC $(MAINOBJS) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -read_only_relocs suppress
--else
- 	$(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ -Wl,--whole-archive $(MAINOBJS) -Wl,--no-whole-archive,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group -Wl,--no-undefined $(NWAOBJSXBMC) $(LIBS) -Wl,-Bsymbolic
--endif
- 
- @APP_NAME_LC@.bin: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS)
--
--ifeq ($(findstring osx,@ARCH@), osx)
--	$(SILENT_LD) $(CXX) $(LDFLAGS) -o @APP_NAME_LC@.bin $(MAINOBJS) -Wl,-all_load,-ObjC $(MAINOBJS) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
--else
--	$(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o @APP_NAME_LC@.bin $(MAINOBJS) -Wl,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group $(NWAOBJSXBMC) $(LIBS) -rdynamic
--endif
-+	$(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o @APP_NAME_LC@.bin $(MAINOBJS) -Wl,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group $(NWAOBJSXBMC) $(LIBS) -rdynamic
- 
- @APP_NAME_LC@-xrandr: xbmc-xrandr.c
- ifneq (1,@USE_X11@)
-@@ -450,9 +428,6 @@ install-bin: @APP_NAME_LC@.bin # develop
- 	sudo install -d $(DESTDIR)$(libdir)
- 	sudo install @APP_NAME_LC@.bin $(DESTDIR)$(libdir)/@APP_NAME_LC@
- 
--ifeq ($(findstring osx,@ARCH@), osx)
--	# TODO: add osx install
--else
- install: install-binaries install-arch install-datas
- 
- apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb: install
-@@ -474,30 +449,11 @@ else
- 	@install @APP_NAME_LC@.bin $(DESTDIR)$(libdir)/@APP_NAME_LC@/@APP_NAME_LC@.bin
- 	@echo "You can run @APP_NAME_LC@ with the command '@APP_NAME_LC@'"
- endif
--endif
- 
- install-arch:
- 	@# Arch dependent files
--ifeq ($(findstring freebsd,@ARCH@), freebsd)
--	@find -E system addons -type f -not -iregex ".*\.git.*" \
--		-iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
--		-exec sh -c "install -d \"$(DESTDIR)$(libdir)/@APP_NAME_LC@/\`dirname '{}'\`\"" \; \
--		-and \
--		-exec install "{}" $(DESTDIR)$(libdir)/@APP_NAME_LC@/"{}" \; \
--		-exec printf " -- %-75.75s\r" "{}" \;
--else
--ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
--	@find -E system addons -type f -not -iregex ".*\.git.*" \
--		-iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
--		-exec sh -c "install -d \"$(DESTDIR)$(libdir)/@APP_NAME_LC@/\`dirname '{}'\`\"" \; \
--		-and \
--		-exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
--		-exec printf " -- %-75.75s\r" "{}" \;
--else
- 	@find system addons -regextype posix-extended -type f -not -iregex ".*\.git.*" -iregex ".*\.so|.*\.so\.[0-9].*|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)$(libdir)/@APP_NAME_LC@/"{}" \; -printf " -- %-75.75f\r"
- 	@find -L addons -regextype posix-extended -type f -not -iregex ".*\.git.*" -iregex ".*\.so|.*\.so\.[0-9].*" -exec cp -d "{}" $(DESTDIR)$(libdir)/@APP_NAME_LC@/"{}" \; -printf " -- %-75.75f\r"
--endif
--endif
- 
- install-scripts:
- 	@install -d $(DESTDIR)$(bindir)
-@@ -620,11 +576,7 @@ $(CHECK_LIBS): force
- 	@$(MAKE) CXXFLAGS="$(CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1" $(if $(V),,-s) -C $(@D)
- 
- @APP_NAME_LC@-test: $(CHECK_LIBS) $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(GTEST_LIBS)
--ifeq ($(findstring osx,@ARCH@), osx)
--	$(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) $(GTEST_INCLUDES) -o $@ -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(GTEST_LIBS) $(CHECK_LIBS) $(LIBS) $(CHECK_LIBADD) -rdynamic
--else
--	$(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) $(GTEST_INCLUDES) -o $@ -Wl,--whole-archive $(DYNOBJSXBMC) $(OBJSXBMC) $(GTEST_LIBS) $(CHECK_LIBS) -Wl,--no-whole-archive $(NWAOBJSXBMC) $(LIBS) $(CHECK_LIBADD) -rdynamic
--endif
-+	$(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) $(GTEST_INCLUDES) -o $@ -Wl,--whole-archive $(DYNOBJSXBMC) $(OBJSXBMC) $(GTEST_LIBS) $(CHECK_LIBS) -Wl,--no-whole-archive $(NWAOBJSXBMC) $(LIBS) $(CHECK_LIBADD)
- else
- # Give a message that the framework is not configured, but don't fail.
- check testsuite testframework:
diff --git a/package/kodi/patches/patch-configure_ac b/package/kodi/patches/patch-configure_ac
deleted file mode 100644
index 2faf66ccf..000000000
--- a/package/kodi/patches/patch-configure_ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-16.0-Jarvis.orig/configure.ac	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/configure.ac	2016-03-14 04:38:00.056255849 +0100
-@@ -1004,7 +1004,7 @@ if test "$use_gles" = "yes"; then
-       AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
-       AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
-       AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
--      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util"
-+      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lvcsm -lmmal_vc_client -lmmal_components -lcontainers -lkhrn_static -lpthread -lm"
-     else
-       AC_CHECK_LIB([EGL],   [main],, AC_MSG_ERROR($missing_library))
-       AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))
diff --git a/package/kodi/patches/patch-lib_cpluff_Makefile_am b/package/kodi/patches/patch-lib_cpluff_Makefile_am
deleted file mode 100644
index fb70c6993..000000000
--- a/package/kodi/patches/patch-lib_cpluff_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/Makefile.am	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/Makefile.am	2014-05-05 13:03:15.329450196 +0200
-@@ -6,7 +6,7 @@
- 
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = libcpluff loader console po test docsrc doc
-+SUBDIRS = libcpluff loader console test docsrc doc
- DIST_SUBDIRS = $(SUBDIRS) examples
- 
- EXTRA_DIST = COPYRIGHT.txt INSTALL.txt ChangeLog.txt Roadmap.txt autogen.sh plugin.xsd
diff --git a/package/kodi/patches/patch-lib_cpluff_autogen_sh b/package/kodi/patches/patch-lib_cpluff_autogen_sh
deleted file mode 100644
index 24a84ea38..000000000
--- a/package/kodi/patches/patch-lib_cpluff_autogen_sh
+++ /dev/null
@@ -1,10 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/autogen.sh	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/autogen.sh	2014-05-05 12:15:29.307227206 +0200
-@@ -15,7 +15,6 @@ fi
- 
- # Generate files in top level directory
- cd "$basedir"
--autopoint
- rm -f ABOUT-NLS
- test -d auxliary || mkdir auxliary
- libtoolize --automake -f
diff --git a/package/kodi/patches/patch-lib_cpluff_configure_ac b/package/kodi/patches/patch-lib_cpluff_configure_ac
deleted file mode 100644
index d38754bfd..000000000
--- a/package/kodi/patches/patch-lib_cpluff_configure_ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/configure.ac	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/configure.ac	2014-05-05 13:03:32.437577723 +0200
-@@ -46,8 +46,6 @@ AC_SUBST([CP_CXX_LIB_VERSION])
- # -----------------------
- AM_INIT_AUTOMAKE([foreign])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.16.1])
- 
- # C/C++ compiler settings
- # -------------------
diff --git a/package/kodi/patches/patch-lib_cpluff_libcpluff_Makefile_am b/package/kodi/patches/patch-lib_cpluff_libcpluff_Makefile_am
deleted file mode 100644
index ffa9a1529..000000000
--- a/package/kodi/patches/patch-lib_cpluff_libcpluff_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/libcpluff/Makefile.am	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/libcpluff/Makefile.am	2014-05-05 13:53:11.766461900 +0200
-@@ -6,7 +6,7 @@
- 
- SUBDIRS = docsrc
- 
--LIBS = @LIBS_LIBCPLUFF@ @LTLIBINTL@ @LIBS@
-+LIBS = @LIBS_LIBCPLUFF@ @LIBS@
- 
- CPPFLAGS = @CPPFLAGS@
- CPPFLAGS += -I. -DCP_C_API=CP_EXPORT -DCP_HOST="\"$(host)\"" -DCP_DATADIR="\"$(datadir)\""
diff --git a/package/kodi/patches/patch-m4_ax_python_devel_m4 b/package/kodi/patches/patch-m4_ax_python_devel_m4
deleted file mode 100644
index 6359e37e8..000000000
--- a/package/kodi/patches/patch-m4_ax_python_devel_m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-16.0-Jarvis.orig/m4/ax_python_devel.m4	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/m4/ax_python_devel.m4	2016-03-14 04:38:00.080254255 +0100
-@@ -289,7 +289,7 @@ EOD`
- 	# save current global flags
- 	ac_save_LIBS="$LIBS"
- 	ac_save_CPPFLAGS="$CPPFLAGS"
--	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
-+	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
- 	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
- 	AC_LANG_PUSH([C])
- 	AC_LINK_IFELSE([
diff --git a/package/kodi/patches/patch-tools_depends_native_TexturePacker_Makefile b/package/kodi/patches/patch-tools_depends_native_TexturePacker_Makefile
deleted file mode 100644
index 7d7ac0a29..000000000
--- a/package/kodi/patches/patch-tools_depends_native_TexturePacker_Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- xbmc-16.0-Jarvis.orig/tools/depends/native/TexturePacker/Makefile	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/tools/depends/native/TexturePacker/Makefile	2016-04-07 23:49:21.000000000 +0200
-@@ -9,18 +9,10 @@ endif
- 
- ifeq ($(NATIVEPLATFORM),)
-   PLATFORM = native
--  EXTRA_CONFIGURE = --enable-static
- else
-   PLATFORM = $(NATIVEPLATFORM)
- endif
- 
--ifeq ($(NATIVE_OS), linux)
--  EXTRA_CONFIGURE = --enable-static
--endif
--ifeq ($(NATIVE_OS), android)
--  EXTRA_CONFIGURE = --enable-static
--endif
--
- ifeq ($(XBMCROOT),)
-   XBMCROOT = $(ROOT_DIR)/../../../..
- endif
diff --git a/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_XBTFWriter_cpp b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_XBTFWriter_cpp
deleted file mode 100644
index f1ef31669..000000000
--- a/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_XBTFWriter_cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- xbmc-16.0-Jarvis.orig/tools/depends/native/TexturePacker/src/XBTFWriter.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/tools/depends/native/TexturePacker/src/XBTFWriter.cpp	2016-04-07 23:19:25.000000000 +0200
-@@ -20,11 +20,7 @@
- 
- #define __STDC_FORMAT_MACROS
- #include <inttypes.h>
--#if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN)
- #include <stdlib.h>
--#elif !defined(TARGET_DARWIN)
--#include <malloc.h>
--#endif
- #include <memory.h>
- #include <string.h>
- 
diff --git a/package/kodi/patches/patch-xbmc_Application_cpp b/package/kodi/patches/patch-xbmc_Application_cpp
deleted file mode 100644
index 325ced594..000000000
--- a/package/kodi/patches/patch-xbmc_Application_cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/Application.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/Application.cpp	2016-03-14 04:38:00.084253990 +0100
-@@ -871,10 +871,7 @@ bool CApplication::InitDirectoriesLinux(
-     userName = "root";
- 
-   std::string userHome;
--  if (getenv("HOME"))
--    userHome = getenv("HOME");
--  else
--    userHome = "/root";
-+  userHome = "/data/kodi";
- 
-   std::string appBinPath, appPath;
-   std::string appName = CCompileInfo::GetAppName();
diff --git a/package/kodi/patches/patch-xbmc_cores_FFmpeg_h b/package/kodi/patches/patch-xbmc_cores_FFmpeg_h
deleted file mode 100644
index 022a971b8..000000000
--- a/package/kodi/patches/patch-xbmc_cores_FFmpeg_h
+++ /dev/null
@@ -1,34 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h	2016-03-19 18:38:18.594026700 +0100
-@@ -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();
diff --git a/package/kodi/patches/patch-xbmc_cores_VideoRenderers_LinuxRendererGLES_cpp b/package/kodi/patches/patch-xbmc_cores_VideoRenderers_LinuxRendererGLES_cpp
deleted file mode 100644
index 017c98833..000000000
--- a/package/kodi/patches/patch-xbmc_cores_VideoRenderers_LinuxRendererGLES_cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp	2016-03-19 18:38:18.678021277 +0100
-@@ -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 };
diff --git a/package/kodi/patches/patch-xbmc_cores_VideoRenderers_LinuxRendererGL_cpp b/package/kodi/patches/patch-xbmc_cores_VideoRenderers_LinuxRendererGL_cpp
deleted file mode 100644
index d7a322e39..000000000
--- a/package/kodi/patches/patch-xbmc_cores_VideoRenderers_LinuxRendererGL_cpp
+++ /dev/null
@@ -1,85 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp	2016-03-19 18:38:18.666022051 +0100
-@@ -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 };
diff --git a/package/kodi/patches/patch-xbmc_cores_VideoRenderers_WinRenderer_cpp b/package/kodi/patches/patch-xbmc_cores_VideoRenderers_WinRenderer_cpp
deleted file mode 100644
index 459cafe85..000000000
--- a/package/kodi/patches/patch-xbmc_cores_VideoRenderers_WinRenderer_cpp
+++ /dev/null
@@ -1,45 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/WinRenderer.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp	2016-03-19 18:38:18.678021277 +0100
-@@ -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];
- 
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecUtils_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecUtils_cpp
deleted file mode 100644
index cd6c53c41..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecUtils_cpp
+++ /dev/null
@@ -1,79 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp	2016-03-19 18:38:18.610025667 +0100
-@@ -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;
- }
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp
deleted file mode 100644
index 56a9ba98b..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp
+++ /dev/null
@@ -1,68 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2016-03-19 18:38:18.614025409 +0100
-@@ -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;
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_h b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_h
deleted file mode 100644
index a1493e1f1..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_h
+++ /dev/null
@@ -1,29 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h	2016-03-19 18:38:18.618025151 +0100
-@@ -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;
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecVDA_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecVDA_cpp
deleted file mode 100644
index d318f906f..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecVDA_cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp	2016-03-19 18:38:18.626024634 +0100
-@@ -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 };
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DXVA_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DXVA_cpp
deleted file mode 100644
index 9585da52e..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DXVA_cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp	2016-03-19 18:38:18.626024634 +0100
-@@ -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;
- }
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DXVA_h b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DXVA_h
deleted file mode 100644
index 4af890eea..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DXVA_h
+++ /dev/null
@@ -1,20 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h	2016-03-19 18:38:18.626024634 +0100
-@@ -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();
- 
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VAAPI_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VAAPI_cpp
deleted file mode 100644
index 4adb39567..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VAAPI_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp	2016-03-19 18:38:18.634024117 +0100
-@@ -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
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VAAPI_h b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VAAPI_h
deleted file mode 100644
index e75c87563..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VAAPI_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h	2016-03-19 18:38:18.646023343 +0100
-@@ -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();
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDA_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDA_cpp
deleted file mode 100644
index ec75c8d37..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDA_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp	2016-03-19 18:38:18.650023085 +0100
-@@ -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();
- 
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDA_h b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDA_h
deleted file mode 100644
index 7b7052092..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDA_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h	2016-03-19 18:38:18.650023085 +0100
-@@ -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);
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDPAU_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDPAU_cpp
deleted file mode 100644
index 33873389d..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDPAU_cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp	2016-03-19 18:38:18.658022569 +0100
-@@ -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;
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDPAU_h b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDPAU_h
deleted file mode 100644
index d89140427..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VDPAU_h
+++ /dev/null
@@ -1,20 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h	2016-03-19 18:38:18.658022569 +0100
-@@ -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);
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp
deleted file mode 100644
index 22249026a..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2016-03-19 18:38:18.658022569 +0100
-@@ -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;
-       }
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDFileInfo_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDFileInfo_cpp
deleted file mode 100644
index 81f58c029..000000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDFileInfo_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDFileInfo.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp	2016-03-19 18:38:18.662022310 +0100
-@@ -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)
-             {
diff --git a/package/kodi/patches/patch-xbmc_linux_PlatformDefs_h b/package/kodi/patches/patch-xbmc_linux_PlatformDefs_h
deleted file mode 100644
index 419e103ac..000000000
--- a/package/kodi/patches/patch-xbmc_linux_PlatformDefs_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/linux/PlatformDefs.h	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/linux/PlatformDefs.h	2016-04-08 10:28:03.000000000 +0200
-@@ -55,7 +55,7 @@
- #include <stdio.h>
- #include <sys/sysctl.h>
- #include <sys/types.h>
--#else
-+#elif !defined(__APPLE__)
- #include <sys/sysinfo.h>
- #endif
- #include <sys/time.h>
diff --git a/package/kodi/patches/patch-xbmc_pictures_Picture_cpp b/package/kodi/patches/patch-xbmc_pictures_Picture_cpp
deleted file mode 100644
index aa0727372..000000000
--- a/package/kodi/patches/patch-xbmc_pictures_Picture_cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/pictures/Picture.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp	2016-03-19 18:38:18.694020244 +0100
-@@ -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 };
diff --git a/package/kodi/patches/patch-xbmc_utils_SystemInfo_cpp b/package/kodi/patches/patch-xbmc_utils_SystemInfo_cpp
deleted file mode 100644
index a9746c03b..000000000
--- a/package/kodi/patches/patch-xbmc_utils_SystemInfo_cpp
+++ /dev/null
@@ -1,52 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/utils/SystemInfo.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/utils/SystemInfo.cpp	2016-03-14 04:38:00.092253459 +0100
-@@ -614,16 +614,11 @@ std::string CSysInfo::GetOsName(bool emp
-     osName = "iOS";
- #elif defined(TARGET_DARWIN_OSX)
-     osName = "OS X";
--#elif defined (TARGET_ANDROID)
-+#elif defined(TARGET_ANDROID)
-     osName = "Android";
- #elif defined(TARGET_LINUX)
--    osName = getValueFromOs_release("NAME");
--    if (osName.empty())
--      osName = getValueFromLsb_release(lsb_rel_distributor);
--    if (osName.empty())
--      osName = getValueFromOs_release("ID");
--#endif // defined(TARGET_LINUX)
--
-+    osName = "OpenADK";
-+#endif
-     if (osName.empty())
-       osName = "Unknown OS";
-   }
-@@ -664,7 +659,7 @@ std::string CSysInfo::GetOsVersion(void)
- #elif defined(TARGET_LINUX)
-   osVersion = getValueFromOs_release("VERSION_ID");
-   if (osVersion.empty())
--    osVersion = getValueFromLsb_release(lsb_rel_release);
-+    osVersion = "1.0";
- #endif // defined(TARGET_LINUX)
- 
-   if (osVersion.empty())
-@@ -742,19 +737,7 @@ std::string CSysInfo::GetOsPrettyNameWit
- #elif defined(TARGET_ANDROID)
-   osNameVer = GetOsName() + " " + GetOsVersion() + " API level " +   StringUtils::Format("%d", CJNIBuild::SDK_INT);
- #elif defined(TARGET_LINUX)
--  osNameVer = getValueFromOs_release("PRETTY_NAME");
--  if (osNameVer.empty())
--  {
--    osNameVer = getValueFromLsb_release(lsb_rel_description);
--    std::string osName(GetOsName(true));
--    if (!osName.empty() && osNameVer.find(osName) == std::string::npos)
--      osNameVer = osName + osNameVer;
--    if (osNameVer.empty())
--      osNameVer = "Unknown Linux Distribution";
--  }
--
--  if (osNameVer.find(GetOsVersion()) == std::string::npos)
--    osNameVer += " " + GetOsVersion();
-+  osNameVer = GetOsName() + " " + GetOsVersion();
- #endif // defined(TARGET_LINUX)
- 
-   if (osNameVer.empty())
diff --git a/package/kodi/patches/patch-xbmc_video_FFmpegVideoDecoder_cpp b/package/kodi/patches/patch-xbmc_video_FFmpegVideoDecoder_cpp
deleted file mode 100644
index 8493b30f4..000000000
--- a/package/kodi/patches/patch-xbmc_video_FFmpegVideoDecoder_cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- xbmc-16.0-Jarvis.orig/xbmc/video/FFmpegVideoDecoder.cpp	2016-02-20 16:21:19.000000000 +0100
-+++ xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp	2016-03-19 18:38:18.710019211 +0100
-@@ -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 );