123 lines
4.5 KiB
Diff
123 lines
4.5 KiB
Diff
--- ./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 <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
|
|
--- ./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 <cmath>
|
|
+#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 <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)
|
|
--- ./configure.ac.orig
|
|
+++ ./configure.ac
|
|
@@ -604,7 +604,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"
|
|
@@ -625,7 +625,7 @@
|
|
fi
|
|
fi
|
|
;;
|
|
- 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"
|
|
@@ -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-musl*)
|
|
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
|
|
@@ -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*)
|
|
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*)
|
|
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
|
;;
|
|
i386-*-freebsd*)
|
|
@@ -23,7 +23,7 @@ case $build in
|
|
powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
|
|
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-musl*)
|
|
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-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*)
|
|
@@ -60,7 +60,7 @@ case $host in
|
|
powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
|
|
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
|
|
;;
|
|
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
|
|
+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-linux-musl*)
|
|
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
|
;;
|
|
mips*-*-linux-gnu*|mips*-*-linux-uclibc*)
|