kodi: update to 17.1

1 files changed, 37 insertions, 115 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