diff --git a/srcpkgs/kodi/kodi-15.2-generated-addons.tar.xz b/srcpkgs/kodi/kodi-15.2-generated-addons.tar.xz new file mode 100644 index 00000000000..858ea36a8fe Binary files /dev/null and b/srcpkgs/kodi/kodi-15.2-generated-addons.tar.xz differ diff --git a/srcpkgs/kodi/patches/fix-musl.patch b/srcpkgs/kodi/patches/fix-musl.patch index 337895245d2..e44e5a280c1 100644 --- a/srcpkgs/kodi/patches/fix-musl.patch +++ b/srcpkgs/kodi/patches/fix-musl.patch @@ -1,82 +1,36 @@ ---- ./lib/SlingboxLib/SlingboxLib.cpp 2013-12-12 21:47:49.000000000 +0000 -+++ ./lib/SlingboxLib/SlingboxLib.cpp 2014-04-15 06:07:15.746789122 +0000 -@@ -29,7 +29,9 @@ - #include - #include - #include -+#include - #include -+#include - #define INVALID_SOCKET (SOCKET)(~0) - #define SOCKET_ERROR (-1) - #endif ---- ./xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp 2014-04-15 05:52:42.214313750 +0000 -+++ ./xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp 2014-04-15 05:49:51.921324165 +0000 -@@ -33,7 +33,7 @@ - - #include "Common.hpp" - #include "PCM.hpp" --#include -+#include "math.h" - #include "BeatDetect.hpp" - - #ifdef _WIN32 ---- ./xbmc/cores/DllLoader/ldt_keeper.c.orig -+++ ./xbmc/cores/DllLoader/ldt_keeper.c -@@ -48,7 +48,7 @@ - #if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0)) - _syscall3( int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount ); - #else --#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt) -+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt) - #define modify_ldt(a,b,c) syscall( __NR_modify_ldt, a, b, c); - #else - int modify_ldt(int func, void *ptr, unsigned long bytecount); ---- ./tools/depends/native/TexturePacker/src/XBTFWriter.cpp -+++ ./tools/depends/native/TexturePacker/src/XBTFWriter.cpp -@@ -23,11 +23,7 @@ - #include - #include "guilib/XBTF.h" - #include "utils/EndianSwap.h" --#if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN) - #include --#elif !defined(TARGET_DARWIN) --#include --#endif - #include - - #define WRITE_STR(str, size, file) fwrite(str, size, 1, file) ---- ./configure.ac.orig -+++ ./configure.ac -@@ -604,7 +604,7 @@ +diff -upr xbmc-16.0-Jarvis.orig/configure.ac xbmc-16.0-Jarvis/configure.ac +--- xbmc-16.0-Jarvis.orig/configure.ac 2016-03-19 07:28:05.389703445 +0100 ++++ xbmc-16.0-Jarvis/configure.ac 2016-03-19 07:35:44.771669064 +0100 +@@ -564,7 +564,7 @@ case $host in use_x11=no - build_shared_lib=yes + build_shared_lib=yes ;; - i*86*-linux-gnu*|i*86*-*-linux-uclibc*) + i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-linux-musl*) + target_platform=target_linux ARCH="i486-linux" if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then - use_arch="x86" -@@ -625,7 +625,7 @@ +@@ -586,7 +586,7 @@ case $host in fi fi ;; - x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) + x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*) + target_platform=target_linux ARCH="x86_64-linux" if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then - use_arch="x86_64" -@@ -681,7 +681,7 @@ +@@ -645,7 +645,7 @@ case $host in powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) ARCH="powerpc64-linux" ;; - arm*-*-linux-gnu*|arm*-*-linux-uclibc*) + arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-musl*) + target_platform=target_linux ARCH="arm" use_arch="arm" - use_joystick=no ---- ./m4/xbmc_arch.m4.orig 2015-10-19 08:31:15.000000000 +0200 -+++ ./m4/xbmc_arch.m4 2015-11-05 18:50:57.346659240 +0100 +diff -upr xbmc-16.0-Jarvis.orig/m4/xbmc_arch.m4 xbmc-16.0-Jarvis/m4/xbmc_arch.m4 +--- xbmc-16.0-Jarvis.orig/m4/xbmc_arch.m4 2016-02-20 16:21:19.000000000 +0100 ++++ xbmc-16.0-Jarvis/m4/xbmc_arch.m4 2016-03-19 07:37:37.070660659 +0100 @@ -2,10 +2,10 @@ AC_DEFUN([XBMC_SETUP_ARCH_DEFINES],[ # build detection and setup - this is the native arch @@ -104,7 +58,7 @@ # host detection and setup - this is the target arch case $host in - i*86*-linux-gnu*|i*86*-*-linux-uclibc*) -+ i*86*-linux-gnu*|i*86*-*-linux-uclibc|*i*86*-linux-musl*) ++ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|*i*86*-linux-musl*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; - x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) diff --git a/srcpkgs/kodi/patches/fix-rsxs.patch b/srcpkgs/kodi/patches/fix-rsxs.patch deleted file mode 100644 index ccc7698c73d..00000000000 --- a/srcpkgs/kodi/patches/fix-rsxs.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- xbmc-12.3-Frodo/xbmc/screensavers/rsxs-0.9/configure.ac 2014-04-15 10:22:51.025587069 +0000 -+++ xbmc-12.3-Frodo/xbmc/screensavers/rsxs-0.9/configure.ac 2014-04-15 10:21:51.947852111 +0000 -@@ -14,18 +14,13 @@ - - # Checks for programs. - LT_AC_PROG_SED --AC_LANG(C++) --AC_PROG_CXX --#CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,` --AC_PROG_CXXCPP -- --#if test x"$GXX" = x"yes"; then --# CXXFLAGS=`echo $CXXFLAGS -Wall` --#fi - - AC_PROG_CC - AM_PROG_CC_C_O - gl_EARLY -+AC_PROG_CXX -+AC_PROG_CXXCPP -+ - AC_PROG_RANLIB - - # Cut-down version of AC_LIB_LTDL. We don't want the option to install diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 6ddaa0ecaee..628e70ca186 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,16 +1,16 @@ # Template file for 'kodi' pkgname=kodi -version=15.2 -revision=4 +version=16.0 +revision=1 patch_args="-Np1" -_codename="Isengard" +_codename="Jarvis" wrksrc="xbmc-${version}-${_codename}" short_desc="A software media player and entertainment hub for digital media" maintainer="Juan RP " homepage="http://www.kodi.tv/" license="GPL-2" distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz" -checksum=dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 +checksum=0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" @@ -30,7 +30,7 @@ makedepends=" libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel ffmpeg-devel giflib-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel - libcec-devel" + libcec-devel dcadec-devel crossguid" # The following dependencies are dlopen(3)ed. depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs>=1.9.7 libplist>=1.12"