diff options
Diffstat (limited to 'main/xbmc/fix-musl.patch')
-rw-r--r-- | main/xbmc/fix-musl.patch | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/main/xbmc/fix-musl.patch b/main/xbmc/fix-musl.patch deleted file mode 100644 index 61b3571b07..0000000000 --- a/main/xbmc/fix-musl.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -ru xbmc-12.3-Frodo.orig/configure.in xbmc-12.3-Frodo/configure.in -diff -ru xbmc-12.3-Frodo.orig/lib/SlingboxLib/SlingboxLib.cpp xbmc-12.3-Frodo/lib/SlingboxLib/SlingboxLib.cpp ---- xbmc-12.3-Frodo.orig/lib/SlingboxLib/SlingboxLib.cpp 2013-12-12 21:47:49.000000000 +0000 -+++ xbmc-12.3-Frodo/lib/SlingboxLib/SlingboxLib.cpp 2014-04-15 06:07:15.746789122 +0000 -@@ -29,7 +29,9 @@ - #include <time.h> - #include <netinet/in.h> - #include <arpa/inet.h> -+#include <sys/time.h> - #include <sys/socket.h> -+#include <sys/select.h> - #define INVALID_SOCKET (SOCKET)(~0) - #define SOCKET_ERROR (-1) - #endif -diff -ru xbmc-12.3-Frodo.orig/lib/libXDAAP/thread.h xbmc-12.3-Frodo/lib/libXDAAP/thread.h ---- xbmc-12.3-Frodo.orig/lib/libXDAAP/thread.h 2013-12-12 21:47:49.000000000 +0000 -+++ xbmc-12.3-Frodo/lib/libXDAAP/thread.h 2014-04-15 06:11:09.940947997 +0000 -@@ -37,7 +37,7 @@ - #define ts_mutex pthread_mutex_t - #define ts_condition pthread_cond_t - --#if defined(__APPLE__) || defined(__FreeBSD__) -+#if !defined(PTHREAD_MUTEX_RECURSIVE_NP) - #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE - #endif - -diff -ru xbmc-12.3-Frodo.orig/xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp xbmc-12.3-Frodo/xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp ---- xbmc-12.3-Frodo.orig/xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp 2014-04-15 05:52:42.214313750 +0000 -+++ xbmc-12.3-Frodo/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 <cmath> -+#include "math.h" - #include "BeatDetect.hpp" - - #ifdef _WIN32 ---- ./configure.in.orig -+++ ./configure.in -@@ -628,7 +628,7 @@ - use_x11=no - build_shared_lib=yes - ;; -- i*86*-linux-gnu*|i*86*-*-linux-uclibc*) -+ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-linux-musl*) - ARCH="i486-linux" - if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then - use_arch="x86" -@@ -636,7 +636,7 @@ - fi - use_static_ffmpeg=yes - ;; -- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) -+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*) - ARCH="x86_64-linux" - if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then - use_arch="x86_64" -@@ -688,7 +688,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" - ffmpeg_target_os=linux ---- ./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/TexturePacker/XBTFWriter.cpp.orig -+++ ./tools/TexturePacker/XBTFWriter.cpp -@@ -23,11 +23,7 @@ - #include <inttypes.h> - #include "guilib/XBTF.h" - #include "utils/EndianSwap.h" --#if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN) - #include <stdlib.h> --#elif !defined(TARGET_DARWIN) --#include <malloc.h> --#endif - #include <memory.h> - - #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*) |