From f45bf3f4f0a0e482b17859d971c561740dba1c7c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 16 May 2016 09:25:35 +0000 Subject: community/kodi: upgrade to 16.1 --- community/kodi/APKBUILD | 43 +++++------ community/kodi/fix-musl.patch | 164 ++++++++++++++++++++++-------------------- community/kodi/fix-rsxs.patch | 24 ------- 3 files changed, 107 insertions(+), 124 deletions(-) delete mode 100644 community/kodi/fix-rsxs.patch (limited to 'community') diff --git a/community/kodi/APKBUILD b/community/kodi/APKBUILD index 1e2bbc6c6a..14ac677c0b 100644 --- a/community/kodi/APKBUILD +++ b/community/kodi/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter # Maintainer: Natanael Copa pkgname=kodi -pkgver=15.2 -_realname=Isengard +pkgver=16.1 +_realname=Jarvis pkgrel=1 pkgdesc="A software media player and entertainment hub for digital media" url="http://kodi.tv" @@ -19,10 +19,11 @@ depends_dev="gettext-dev boost-dev mesa-dev glew-dev glu-dev mariadb-dev libxt-dev libxmu-dev samba-dev gawk libssh-dev libva-dev libnfs-dev yasm-dev libmpeg2-dev libmad-dev libsamplerate-dev rtmpdump-dev libjpeg-turbo-dev eudev-dev libcap-dev udisks2-dev faac-dev gnutls-dev - libxslt-dev libplist-dev libshairport-dev ffmpeg-dev afpfs-ng-dev - libcec-dev x264-dev bsd-compat-headers curl-dev python-dev" -makedepends="$depends_dev automake autoconf m4 libtool swig findutils openjdk8-jre-base - boost-thread zip gperf cmake coreutils nasm tar" + libxslt-dev libplist-dev libshairport-dev ffmpeg2.8-dev afpfs-ng-dev + libcec-dev x264-dev bsd-compat-headers curl-dev python-dev dcadec-dev" +makedepends="$depends_dev automake autoconf m4 libtool swig findutils + openjdk8-jre-base boost-thread zip gperf cmake coreutils nasm tar + git" subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg" install="" replaces="xbmc" @@ -30,28 +31,31 @@ options="ldpath-recursive" source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.tar.gz fix-musl.patch fix-fileemu.patch - fix-rsxs.patch fortify-source-fix.patch remove-filewrap.patch add-missing-includes.patch set-default-stacksize.patch " -_builddir="$srcdir/xbmc-$pkgver-$_realname" +builddir="$srcdir/xbmc-$pkgver-$_realname" prepare() { local i - cd "$_builddir" + cd "$builddir" for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + MAKEFLAGS="-j1" ./bootstrap || return 1 + mkdir -p crossguid + make -j1 -C tools/depends/target/crossguid PREFIX="$PWD"/crossguid } build() { - cd "$_builddir" - MAKEFLAGS="-j1" ./bootstrap || return 1 + cd "$builddir" + LDFLAGS="$LDFLAGS -L$PWD/crossguid/lib" \ + CXXFLAGS="$CXXFLAGS -I$PWD/crossguid/include" \ ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -70,30 +74,27 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="c2fc432da92df09ca827d39e32167880 15.2-Isengard.tar.gz -7d642a5499a92a8ca9aeb2863bd2a81d fix-musl.patch +md5sums="79358ad5f77f42c5498a9412d5a78dd5 16.1-Jarvis.tar.gz +95651684aaabac248e30203980b6acf2 fix-musl.patch 69049c53ffc4a403ccff3bba77e47793 fix-fileemu.patch -1c8cc1618f29613fe3521db3e4a99db5 fix-rsxs.patch a769a0018f58cb4f5ea865dcabbe2bed fortify-source-fix.patch cb116c5b55438222db308d4b6b7bc6ff remove-filewrap.patch ed12b2515c259c87ea622e04df78dfe5 add-missing-includes.patch deff09ba18d3bc4674d1c195a40ea399 set-default-stacksize.patch" -sha256sums="dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 15.2-Isengard.tar.gz -1e3f70ac77172247c3bb67dc01ae59b22b7dfac1b427a253c1824c470e8c5f37 fix-musl.patch +sha256sums="7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 16.1-Jarvis.tar.gz +c2da00fd415eb4b3d1146c3534aa4f36f68a21bd0efae41b2a36e717efec8ae8 fix-musl.patch cd566ae87c0ecc3e7cbeee9d80b042ae937d4f243413293616bd31f24efffec7 fix-fileemu.patch -e5de7cf5e781de9288f362c9d1c88d226297ba4aae3f75e5980f0a7cfc2258f0 fix-rsxs.patch b5b6636e77dc11bd3a78d811e60cd98b6929e018b8f32ae2ee100a00e5535bea fortify-source-fix.patch 11f537c6d5a2089053c80600b4dc1d6530faaee2141eba1a7eb0b941385ba9f1 remove-filewrap.patch 0ea70141b3b80ac586e941c97806f819b562f1d5166d0fe045e28dff0b62d739 add-missing-includes.patch 212cb3d9861b2b57d9929c2046917c5789d4bacf7849ec3f7c5a4740693349b2 set-default-stacksize.patch" -sha512sums="870f67b83aaa96b1a4111f34824eb47c24616d067adf930f4456ca8f1ac57052c41aa73915304ea85b1d10390865b88d88c85e6cd425b42ec5a504908adf4b67 15.2-Isengard.tar.gz -1cf662861a7325cf34dff912df17e0348934a8fb525aa2d1239bd0c7fc7e6223a227432f450b890c7c97fcbae055b9781c2b0628565bf4d57da986e0816ad52b fix-musl.patch +sha512sums="fe7012ea899906d418faa19af5066e5976d092745e91030106ea4f75399ad67a4bb4e4f384605ab7b2d9e24174aab2e243531f31d79ff5ae33564361b25eb073 16.1-Jarvis.tar.gz +3f3c5183f1b3181e60867d3749633e5e2bb435daf6dfd89c365ed40eea9d8f6d0af8e0d0599553a23a235b889eb3d8882872b38159edcfdfa40aa93d9f6b3fd6 fix-musl.patch d2c284a7156a842e23a1089053cb28af1a825fddbeb5b5e8d4a8f2d8b37a7861a7082529e603cfe56eb2c7fd35c4ce1aa7e9f224690ab42689c9886d60dafbc7 fix-fileemu.patch -e1ed2e2e53c20b59f2ea926e9097e99438fdaed9b9d4c0133567bd1c8dc26b003961ad045ce4aaba62e9825e1a2d9651e72bd21bdb09dcc840c8e14d9602d109 fix-rsxs.patch 5e972e6f6ad13f5dc8ac5e9d593171988e0cc93879178aa7621af44d41b89b5b86429af4d0c2e6516b626d042f247bcf0b1f957f647138a03ce73c5c7b3311b9 fortify-source-fix.patch cdac558134441633a83a346c2d5f5d69a1dea10276d5a46d18433d5c94937528610a662749db0909685e6bf42277e1318726409b572390f3b8ebea61209ee5c9 remove-filewrap.patch 378a0e8fd9676dd76cfb30d62085b953625dd0185e2673de2331fc7ae0802dae4f56d0b74e878e4d313942fda8831e9669bff284dbe974db5ad16fe07af884d6 add-missing-includes.patch diff --git a/community/kodi/fix-musl.patch b/community/kodi/fix-musl.patch index f174d0032b..75a7b07f32 100644 --- a/community/kodi/fix-musl.patch +++ b/community/kodi/fix-musl.patch @@ -1,26 +1,3 @@ ---- ./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 @@ @@ -32,85 +9,114 @@ #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) ---- ./m4/xbmc_arch.m4.orig -+++ ./m4/xbmc_arch.m4 -@@ -2,10 +2,10 @@ - - # host detection and setup - case $host in -- i*86*-linux-gnu*|i*86*-*-linux-uclibc*) -+ 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*) -+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*) - AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") - ;; - i386-*-freebsd*) ---- ./configure.ac.orig -+++ ./configure.ac -@@ -604,7 +604,7 @@ +diff --git a/configure.ac b/configure.ac +index 5d47a4a..3860e32 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -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*) ++ i*86*-linux-*) + 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*) ++ x86_64-*-linux-*) + 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 @@ - powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) - ARCH="powerpc64-linux" - ;; -- arm*-*-linux-gnu*|arm*-*-linux-uclibc*) -+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-muslgnu*) - ARCH="arm" - use_arch="arm" - use_joystick=no ---- ./m4/xbmc_arch.m4.orig -+++ ./m4/xbmc_arch.m4 -@@ -2,10 +2,10 @@ - +diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4 +index 0b66a82..5198263 100644 +--- a/m4/xbmc_arch.m4 ++++ b/m4/xbmc_arch.m4 +@@ -2,10 +2,10 @@ AC_DEFUN([XBMC_SETUP_ARCH_DEFINES],[ + # build detection and setup - this is the native arch case $build in - i*86*-linux-gnu*|i*86*-*-linux-uclibc*) -+ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-linux-musl*) ++ i*86*-linux-*) AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; - x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) -+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*) ++ x86_64-*-linux-*) AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; i386-*-freebsd*) -@@ -23,7 +23,7 @@ - powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) +@@ -17,13 +17,13 @@ case $build in + *86*-apple-darwin*) + AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX") + ;; +- powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*) ++ powerpc-*-linux-*) + AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC") + ;; +- powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) ++ powerpc64-*-linux-*) AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64") ;; - arm*-*-linux-gnu*|arm*-*-linux-uclibc*) -+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-muslgnu*) ++ arm*-*-linux-*) AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; *) +@@ -33,10 +33,10 @@ esac + + # host detection and setup - this is the target arch + case $host in +- i*86*-linux-gnu*|i*86*-*-linux-uclibc*) ++ i*86*-linux-*) + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") + ;; +- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) ++ x86_64-*-linux-*) + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") + ;; + i386-*-freebsd*) +@@ -54,16 +54,16 @@ case $host in + powerpc-apple-darwin*) + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX") + ;; +- powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*) ++ powerpc-*-linux-*) + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC") + ;; +- powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) ++ powerpc64-*-linux-*) + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64") + ;; +- arm*-*-linux-gnu*|arm*-*-linux-uclibc*) ++ arm*-*-linux-*) + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") + ;; +- mips*-*-linux-gnu*|mips*-*-linux-uclibc*) ++ mips*-*-linux-*) + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") + ;; + *-*linux-android*) +diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac +index 12935e3..fdd5bf3 100644 +--- a/tools/depends/configure.ac ++++ b/tools/depends/configure.ac +@@ -97,13 +97,13 @@ platform_cc=gcc + platform_cxx=g++ + + case $build in +- arm*-*-linux-gnu*|arm*-*-linux-uclibc*) ++ arm*-*-linux-*) + build_os="linux" + ;; +- *i686*-linux-gnu*|i*86*-*-linux-uclibc*) ++ i*86*-*-linux-*) + build_os="linux" + ;; +- x86_64*-linux-gnu*|x86_64-*-linux-uclibc*) ++ x86_64*-linux-*) + build_os="linux" + ;; + *darwin*) diff --git a/community/kodi/fix-rsxs.patch b/community/kodi/fix-rsxs.patch deleted file mode 100644 index ccc7698c73..0000000000 --- a/community/kodi/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 -- cgit v1.2.3