Commit d1ca8bf0 authored by Natanael Copa's avatar Natanael Copa

community/kodi: upgrade to 17.1

parent 2075d342
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=kodi
pkgver=16.1
_realname=Jarvis
pkgrel=3
pkgver=17.1
_realname=Krypton
pkgrel=0
pkgdesc="A software media player and entertainment hub for digital media"
url="http://kodi.tv"
arch="x86 x86_64"
......@@ -19,8 +19,9 @@ 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 ffmpeg2.8-dev afpfs-ng-dev
libcec-dev x264-dev bsd-compat-headers curl-dev python2-dev dcadec-dev"
libxslt-dev libplist-dev libshairport-dev ffmpeg-dev afpfs-ng-dev
libcec-dev x264-dev bsd-compat-headers curl-dev python2-dev dcadec-dev
libdvdcss-dev"
makedepends="$depends_dev automake autoconf m4 libtool swig findutils
openjdk8-jre-base boost-thread zip gperf cmake coreutils nasm tar
git"
......@@ -29,7 +30,6 @@ install=""
replaces="xbmc"
options="ldpath-recursive"
source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.tar.gz
gcc6-fix.patch
fix-musl.patch
fix-fileemu.patch
fortify-source-fix.patch
......@@ -70,6 +70,7 @@ build() {
--with-ffmpeg=shared \
--enable-static=no \
--enable-libbluray \
--enable-external-libraries \
|| return 1
make || return 1
}
......@@ -79,27 +80,10 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
md5sums="79358ad5f77f42c5498a9412d5a78dd5 16.1-Jarvis.tar.gz
f723a234a2a341ad3d20777c24a0d28a gcc6-fix.patch
95651684aaabac248e30203980b6acf2 fix-musl.patch
69049c53ffc4a403ccff3bba77e47793 fix-fileemu.patch
a769a0018f58cb4f5ea865dcabbe2bed fortify-source-fix.patch
cb116c5b55438222db308d4b6b7bc6ff remove-filewrap.patch
ed12b2515c259c87ea622e04df78dfe5 add-missing-includes.patch
deff09ba18d3bc4674d1c195a40ea399 set-default-stacksize.patch"
sha256sums="7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 16.1-Jarvis.tar.gz
0d4946220a64ab33efb1ec5c097976d0cb32844f90ba373eb9cfe933886b33d9 gcc6-fix.patch
c2da00fd415eb4b3d1146c3534aa4f36f68a21bd0efae41b2a36e717efec8ae8 fix-musl.patch
cd566ae87c0ecc3e7cbeee9d80b042ae937d4f243413293616bd31f24efffec7 fix-fileemu.patch
b5b6636e77dc11bd3a78d811e60cd98b6929e018b8f32ae2ee100a00e5535bea fortify-source-fix.patch
11f537c6d5a2089053c80600b4dc1d6530faaee2141eba1a7eb0b941385ba9f1 remove-filewrap.patch
0ea70141b3b80ac586e941c97806f819b562f1d5166d0fe045e28dff0b62d739 add-missing-includes.patch
212cb3d9861b2b57d9929c2046917c5789d4bacf7849ec3f7c5a4740693349b2 set-default-stacksize.patch"
sha512sums="fe7012ea899906d418faa19af5066e5976d092745e91030106ea4f75399ad67a4bb4e4f384605ab7b2d9e24174aab2e243531f31d79ff5ae33564361b25eb073 16.1-Jarvis.tar.gz
2b76f26088bf87ea1a904aa685e08e1ed271e7f272e3994be852c6d2ce23348ce5dfa9023d09f3f2b20e3719f426f7b4b26a824d9026352a7d1f57e5bf9f249d gcc6-fix.patch
3f3c5183f1b3181e60867d3749633e5e2bb435daf6dfd89c365ed40eea9d8f6d0af8e0d0599553a23a235b889eb3d8882872b38159edcfdfa40aa93d9f6b3fd6 fix-musl.patch
d2c284a7156a842e23a1089053cb28af1a825fddbeb5b5e8d4a8f2d8b37a7861a7082529e603cfe56eb2c7fd35c4ce1aa7e9f224690ab42689c9886d60dafbc7 fix-fileemu.patch
sha512sums="5093fe7dcdf22e2604ea93696c909028c00a8b0c858e7b25f55dade6c3423b4a68f5a49a8a0dd5238b10f4a7dd5e815a82251949ce7adb8a8f8cf5d58fc7bd41 17.1-Krypton.tar.gz
f225073ca75647581463094c0a9d1dd1fa3e1a58353292e1c99da30eb6f97026f4647853da2bbdc7777c6c1b13a16b368b09c93f5d4c1be13f8a11b4bbfbabbf fix-musl.patch
7dea044f77d9a38a4bccc9d542ba62d0146f2bf60f92999ddada1a4fc020b88e054c7f047ba9b8b21639889b31c3f117308f38aa50fab759f941cc014cb0e69d fix-fileemu.patch
5e972e6f6ad13f5dc8ac5e9d593171988e0cc93879178aa7621af44d41b89b5b86429af4d0c2e6516b626d042f247bcf0b1f957f647138a03ce73c5c7b3311b9 fortify-source-fix.patch
cdac558134441633a83a346c2d5f5d69a1dea10276d5a46d18433d5c94937528610a662749db0909685e6bf42277e1318726409b572390f3b8ebea61209ee5c9 remove-filewrap.patch
118a4e10ac5abdd9b6cfc87ad1b91cf03b3641023337571250beb5125c2c830e678eced1e42703253d66af61ec9fe3ce6c44cf7c0012d457f9bebc0ddfe992d2 remove-filewrap.patch
378a0e8fd9676dd76cfb30d62085b953625dd0185e2673de2331fc7ae0802dae4f56d0b74e878e4d313942fda8831e9669bff284dbe974db5ad16fe07af884d6 add-missing-includes.patch
3fd97e9fa22e59b3cd30fdad19474e177a9d062598765fa8ba4955f1da4e10581ff1463dd0794d3ee3cefebf753007a4d445b2bc47a257574d3927c1408b8876 set-default-stacksize.patch"
This diff is collapsed.
--- ./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);
diff --git a/configure.ac b/configure.ac
index 5d47a4a..3860e32 100644
index 9bd8d6e..205acfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -564,7 +564,7 @@ case $host in
@@ -526,7 +526,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-*)
target_platform=target_linux
CORE_SYSTEM_NAME=linux
ARCH="i486-linux"
if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then
@@ -586,7 +586,7 @@ case $host in
@@ -549,7 +549,7 @@ case $host in
fi
fi
;;
- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
+ x86_64-*-linux-*)
target_platform=target_linux
CORE_SYSTEM_NAME=linux
ARCH="x86_64-linux"
if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then
diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4
index 0b66a82..5198263 100644
index d28f263..6fb6210 100644
--- a/m4/xbmc_arch.m4
+++ b/m4/xbmc_arch.m4
@@ -2,10 +2,10 @@ AC_DEFUN([XBMC_SETUP_ARCH_DEFINES],[
......@@ -86,11 +75,11 @@ index 0b66a82..5198263 100644
+ powerpc-*-linux-*)
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC")
;;
- powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
+ powerpc64-*-linux-*)
- 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-gnu*|arm*-*-linux-uclibc*|aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*)
+ arm*-*-linux-*)
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
;;
......@@ -100,10 +89,10 @@ index 0b66a82..5198263 100644
;;
*-*linux-android*)
diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac
index 12935e3..fdd5bf3 100644
index 3626ea5..f178f7a 100644
--- a/tools/depends/configure.ac
+++ b/tools/depends/configure.ac
@@ -97,13 +97,13 @@ platform_cc=gcc
@@ -120,13 +120,13 @@ platform_cc=gcc
platform_cxx=g++
case $build in
......@@ -120,3 +109,16 @@ index 12935e3..fdd5bf3 100644
build_os="linux"
;;
*darwin*)
diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c
index 3fe6854..ca78612 100644
--- a/xbmc/cores/DllLoader/ldt_keeper.c
+++ b/xbmc/cores/DllLoader/ldt_keeper.c
@@ -48,7 +48,7 @@ extern "C" {
#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);
This diff is collapsed.
--- a/xbmc/utils/posix/PosixInterfaceForCLog.cpp.orig
diff --git a/xbmc/utils/posix/PosixInterfaceForCLog.cpp b/xbmc/utils/posix/PosixInterfaceForCLog.cpp
index a3d4983..8443024 100644
--- a/xbmc/utils/posix/PosixInterfaceForCLog.cpp
+++ b/xbmc/utils/posix/PosixInterfaceForCLog.cpp
@@ -28,10 +28,6 @@
#include "android/activity/XBMCApp.h"
@@ -29,10 +29,6 @@
#include "platform/android/activity/XBMCApp.h"
#endif // TARGET_ANDROID
-struct FILEWRAP : public FILE
......@@ -11,7 +13,7 @@
CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
m_file(NULL)
{ }
@@ -50,7 +46,7 @@
@@ -52,7 +48,7 @@ bool CPosixInterfaceForCLog::OpenLogFile(const std::string &logFilename, const s
(void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
(void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
......@@ -20,7 +22,9 @@
if (!m_file)
return false; // error, can't open log file
--- a/xbmc/utils/posix/PosixInterfaceForCLog.h.orig
diff --git a/xbmc/utils/posix/PosixInterfaceForCLog.h b/xbmc/utils/posix/PosixInterfaceForCLog.h
index c1e8ffe..9999ead 100644
--- a/xbmc/utils/posix/PosixInterfaceForCLog.h
+++ b/xbmc/utils/posix/PosixInterfaceForCLog.h
@@ -21,8 +21,6 @@
......@@ -31,9 +35,9 @@
class CPosixInterfaceForCLog
{
public:
@@ -34,5 +32,5 @@
@@ -34,5 +32,5 @@ public:
void PrintDebugString(const std::string& debugString);
static void GetCurrentLocalTime(int& hour, int& minute, int& second);
static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
private:
- FILEWRAP* m_file;
+ FILE * m_file;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment