mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
xbmc:
- update patches
This commit is contained in:
parent
13c1951fc8
commit
5eba58edef
@ -1,6 +1,6 @@
|
|||||||
diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
diff -Naur xbmc-23883/configure.in xbmc-23883.patch/configure.in
|
||||||
--- xbmc-23782/configure.in 2009-10-17 07:13:04.000000000 +0200
|
--- xbmc-23883/configure.in 2009-10-21 08:23:00.441146464 +0200
|
||||||
+++ xbmc-23782.patch/configure.in 2009-10-18 04:39:04.288321342 +0200
|
+++ xbmc-23883.patch/configure.in 2009-10-21 10:44:56.239147190 +0200
|
||||||
@@ -69,6 +69,9 @@
|
@@ -69,6 +69,9 @@
|
||||||
i*86*-linux-gnu*)
|
i*86*-linux-gnu*)
|
||||||
ARCH="i486-linux"
|
ARCH="i486-linux"
|
||||||
@ -11,7 +11,16 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
x86_64-*-linux-gnu*)
|
x86_64-*-linux-gnu*)
|
||||||
ARCH="x86_64-linux"
|
ARCH="x86_64-linux"
|
||||||
;;
|
;;
|
||||||
@@ -1071,6 +1074,8 @@
|
@@ -1062,6 +1065,8 @@
|
||||||
|
XB_CONFIG_MODULE([xbmc/lib/libPython/Python], [
|
||||||
|
if test "$host_vendor" = "apple" ; then
|
||||||
|
./configure \
|
||||||
|
+ --host=$host_alias \
|
||||||
|
+ --build=$build_alias \
|
||||||
|
--enable-ipv6 \
|
||||||
|
--enable-unicode=ucs4 \
|
||||||
|
--without-cxx \
|
||||||
|
@@ -1084,6 +1089,8 @@
|
||||||
cp pyconfig.h Include
|
cp pyconfig.h Include
|
||||||
else
|
else
|
||||||
./configure \
|
./configure \
|
||||||
@ -20,7 +29,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--enable-ipv6 \
|
--enable-ipv6 \
|
||||||
--enable-unicode=ucs4 \
|
--enable-unicode=ucs4 \
|
||||||
--without-cxx \
|
--without-cxx \
|
||||||
@@ -1088,6 +1093,8 @@
|
@@ -1101,6 +1108,8 @@
|
||||||
if test "$host_vendor" = "apple" ; then
|
if test "$host_vendor" = "apple" ; then
|
||||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 -C \
|
./configure MACOSX_DEPLOYMENT_TARGET=10.4 -C \
|
||||||
@ -29,7 +38,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--with-pic \
|
--with-pic \
|
||||||
--disable-asm-optimizations \
|
--disable-asm-optimizations \
|
||||||
--disable-xmms-plugin \
|
--disable-xmms-plugin \
|
||||||
@@ -1102,7 +1109,9 @@
|
@@ -1115,7 +1124,9 @@
|
||||||
XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/libvorbis], [
|
XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/libvorbis], [
|
||||||
if test "$host_vendor" = "apple" ; then
|
if test "$host_vendor" = "apple" ; then
|
||||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
@ -40,7 +49,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
else
|
else
|
||||||
true
|
true
|
||||||
fi
|
fi
|
||||||
@@ -1111,7 +1120,9 @@
|
@@ -1124,7 +1135,9 @@
|
||||||
XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/ogg], [
|
XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/ogg], [
|
||||||
if test "$host_vendor" = "apple" ; then
|
if test "$host_vendor" = "apple" ; then
|
||||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
@ -51,23 +60,39 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
else
|
else
|
||||||
true
|
true
|
||||||
fi
|
fi
|
||||||
@@ -1120,6 +1131,7 @@
|
@@ -1137,6 +1150,7 @@
|
||||||
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/ffmpeg], [
|
--disable-amd3dnow \
|
||||||
if test "$host_vendor" = "apple" ; then
|
|
||||||
./configure \
|
|
||||||
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
|
|
||||||
--extra-cflags="-w -D_DARWIN_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk" \
|
|
||||||
--disable-static \
|
--disable-static \
|
||||||
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
||||||
@@ -1144,6 +1156,7 @@
|
|
||||||
|
|
||||||
else
|
|
||||||
./configure \
|
|
||||||
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
|
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
|
||||||
|
--disable-muxers \
|
||||||
|
--disable-encoders \
|
||||||
|
--disable-devices \
|
||||||
|
@@ -1148,6 +1162,7 @@
|
||||||
|
--disable-decoder=mpeg_xvmc \
|
||||||
|
--enable-postproc \
|
||||||
|
--enable-gpl \
|
||||||
|
+ --disable-vaapi \
|
||||||
|
--enable-protocol=http \
|
||||||
|
--enable-pthreads \
|
||||||
|
--as=/opt/local/bin/yasm \
|
||||||
|
@@ -1161,6 +1176,7 @@
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--disable-ipv6 \
|
--disable-ipv6 \
|
||||||
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
||||||
@@ -1171,12 +1184,16 @@
|
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
|
||||||
|
--disable-muxers \
|
||||||
|
--disable-encoders \
|
||||||
|
--disable-decoder=mpeg_xvmc \
|
||||||
|
@@ -1172,6 +1188,7 @@
|
||||||
|
--enable-postproc \
|
||||||
|
--enable-gpl \
|
||||||
|
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; fi` \
|
||||||
|
+ --disable-vaapi \
|
||||||
|
--enable-libfaad \
|
||||||
|
--enable-protocol=http \
|
||||||
|
--enable-pthreads \
|
||||||
|
@@ -1185,12 +1202,16 @@
|
||||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
./configure \
|
./configure \
|
||||||
@ -84,7 +109,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--disable-oss \
|
--disable-oss \
|
||||||
--disable-solaris-audio \
|
--disable-solaris-audio \
|
||||||
--disable-al-audio \
|
--disable-al-audio \
|
||||||
@@ -1189,11 +1206,15 @@
|
@@ -1203,11 +1224,15 @@
|
||||||
if test "$host_vendor" = "apple" ; then
|
if test "$host_vendor" = "apple" ; then
|
||||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||||
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
@ -100,7 +125,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--disable-doc \
|
--disable-doc \
|
||||||
--enable-static \
|
--enable-static \
|
||||||
--with-pic
|
--with-pic
|
||||||
@@ -1204,6 +1225,8 @@
|
@@ -1218,6 +1243,8 @@
|
||||||
if test "$host_vendor" = "apple" ; then
|
if test "$host_vendor" = "apple" ; then
|
||||||
./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
|
./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||||
--extra-cflags="$DVDREAD_CFLAGS -D__DARWIN__ -fPIC -DPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I`pwd`/../libdvdcss/src" \
|
--extra-cflags="$DVDREAD_CFLAGS -D__DARWIN__ -fPIC -DPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I`pwd`/../libdvdcss/src" \
|
||||||
@ -109,7 +134,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--enable-static \
|
--enable-static \
|
||||||
--disable-shared \
|
--disable-shared \
|
||||||
--cc="$CC" &&
|
--cc="$CC" &&
|
||||||
@@ -1213,6 +1236,8 @@
|
@@ -1227,6 +1254,8 @@
|
||||||
else
|
else
|
||||||
./configure2 \
|
./configure2 \
|
||||||
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
|
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
|
||||||
@ -118,25 +143,25 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--enable-static \
|
--enable-static \
|
||||||
--disable-shared \
|
--disable-shared \
|
||||||
--cc="$CC" &&
|
--cc="$CC" &&
|
||||||
@@ -1226,6 +1251,8 @@
|
@@ -1242,6 +1271,8 @@
|
||||||
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav], [
|
|
||||||
if test "$host_vendor" = "apple" ; then
|
|
||||||
./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
|
./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||||
+ --host=$host_alias \
|
|
||||||
+ --build=$build_alias \
|
|
||||||
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I`pwd`/../includes" \
|
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I`pwd`/../includes" \
|
||||||
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
|
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
|
||||||
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
|
|
||||||
@@ -1234,6 +1261,8 @@
|
|
||||||
--cc="$CC"
|
|
||||||
else
|
|
||||||
./configure2 \
|
|
||||||
+ --host=$host_alias \
|
+ --host=$host_alias \
|
||||||
+ --build=$build_alias \
|
+ --build=$build_alias \
|
||||||
|
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
|
||||||
|
--enable-static \
|
||||||
|
--disable-shared \
|
||||||
|
@@ -1250,6 +1281,8 @@
|
||||||
|
./configure2 \
|
||||||
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
|
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
|
||||||
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
|
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
|
||||||
|
+ --host=$host_alias \
|
||||||
|
+ --build=$build_alias \
|
||||||
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
|
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
|
||||||
@@ -1247,6 +1276,8 @@
|
--enable-static \
|
||||||
|
--disable-shared \
|
||||||
|
@@ -1261,6 +1294,8 @@
|
||||||
if test "$host_vendor" = "apple" ; then
|
if test "$host_vendor" = "apple" ; then
|
||||||
CFLAGS="-O3 -fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
CFLAGS="-O3 -fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||||
@ -145,7 +170,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--with-pic \
|
--with-pic \
|
||||||
--with-mp4v2
|
--with-mp4v2
|
||||||
else
|
else
|
||||||
@@ -1258,6 +1289,8 @@
|
@@ -1272,6 +1307,8 @@
|
||||||
if test "$host_vendor" = "apple" ; then
|
if test "$host_vendor" = "apple" ; then
|
||||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||||
@ -154,7 +179,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--with-pic \
|
--with-pic \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
@@ -1267,6 +1300,8 @@
|
@@ -1281,6 +1318,8 @@
|
||||||
--disable-al-audio
|
--disable-al-audio
|
||||||
else
|
else
|
||||||
./configure \
|
./configure \
|
||||||
@ -163,7 +188,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--with-pic \
|
--with-pic \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
@@ -1282,6 +1317,8 @@
|
@@ -1296,6 +1335,8 @@
|
||||||
if test "$host_vendor" = "apple" ; then
|
if test "$host_vendor" = "apple" ; then
|
||||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||||
@ -172,7 +197,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--with-pic \
|
--with-pic \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
@@ -1290,6 +1327,8 @@
|
@@ -1304,6 +1345,8 @@
|
||||||
--without-x
|
--without-x
|
||||||
else
|
else
|
||||||
./configure \
|
./configure \
|
||||||
@ -181,7 +206,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--with-pic \
|
--with-pic \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
@@ -1303,6 +1342,8 @@
|
@@ -1317,6 +1360,8 @@
|
||||||
if test "$host_vendor" = "apple" ; then
|
if test "$host_vendor" = "apple" ; then
|
||||||
CFLAGS="-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
CFLAGS="-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||||
@ -190,7 +215,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--with-pic
|
--with-pic
|
||||||
else
|
else
|
||||||
true
|
true
|
||||||
@@ -1313,17 +1354,23 @@
|
@@ -1327,17 +1372,23 @@
|
||||||
if test "$host_vendor" = "apple" ; then
|
if test "$host_vendor" = "apple" ; then
|
||||||
export MACOSX_DEPLOYMENT_TARGET=10.4
|
export MACOSX_DEPLOYMENT_TARGET=10.4
|
||||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
@ -217,7 +242,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
fi
|
fi
|
||||||
], [$USE_EXTERNAL_LIBASS])
|
], [$USE_EXTERNAL_LIBASS])
|
||||||
|
|
||||||
@@ -1332,12 +1379,16 @@
|
@@ -1346,12 +1397,16 @@
|
||||||
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
|
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
|
||||||
CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
|
CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
|
||||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||||
@ -234,7 +259,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--disable-static \
|
--disable-static \
|
||||||
--disable-debugging \
|
--disable-debugging \
|
||||||
--with-pic
|
--with-pic
|
||||||
@@ -1357,12 +1408,16 @@
|
@@ -1371,12 +1426,16 @@
|
||||||
./configure \
|
./configure \
|
||||||
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"\
|
CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"\
|
||||||
@ -251,16 +276,16 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
|||||||
--disable-shared \
|
--disable-shared \
|
||||||
--enable-static \
|
--enable-static \
|
||||||
--with-pic
|
--with-pic
|
||||||
@@ -1378,6 +1433,8 @@
|
@@ -1391,6 +1450,8 @@
|
||||||
|
CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||||
LDFLAGS="-L/opt/local/lib" \
|
LDFLAGS="-L/opt/local/lib" \
|
||||||
LIBS="-lz" \
|
LIBS="-lz" \
|
||||||
--x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
|
|
||||||
+ --host=$host_alias \
|
+ --host=$host_alias \
|
||||||
+ --build=$build_alias \
|
+ --build=$build_alias \
|
||||||
|
--x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
|
||||||
--without-xscreensaver \
|
--without-xscreensaver \
|
||||||
--disable-sound \
|
--disable-sound \
|
||||||
--disable-cyclone \
|
@@ -1406,6 +1467,8 @@
|
||||||
@@ -1392,6 +1449,8 @@
|
|
||||||
./configure \
|
./configure \
|
||||||
CFLAGS="-fPIC" \
|
CFLAGS="-fPIC" \
|
||||||
CXXFLAGS="-fPIC" \
|
CXXFLAGS="-fPIC" \
|
||||||
|
@ -1,64 +0,0 @@
|
|||||||
diff -Naur xbmc-23757/configure.in xbmc-23757.patch/configure.in
|
|
||||||
--- xbmc-23757/configure.in 2009-10-17 01:37:17.452517140 +0200
|
|
||||||
+++ xbmc-23757.patch/configure.in 2009-10-17 01:31:52.602517899 +0200
|
|
||||||
@@ -263,6 +263,25 @@
|
|
||||||
PASSED_CFLAGS=$CFLAGS # Hack to override autoconf default values
|
|
||||||
AC_PROG_CC
|
|
||||||
CFLAGS=$PASSED_CFLAGS
|
|
||||||
+
|
|
||||||
+if test x"$CC_FOR_BUILD" = x; then
|
|
||||||
+ if test x"$cross_compiling" = xyes; then
|
|
||||||
+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
|
|
||||||
+ else
|
|
||||||
+ CC_FOR_BUILD="$CC"
|
|
||||||
+ fi
|
|
||||||
+fi
|
|
||||||
+AC_SUBST([CC_FOR_BUILD])
|
|
||||||
+
|
|
||||||
+if test x"$CXX_FOR_BUILD" = x; then
|
|
||||||
+ if test x"$cross_compiling" = xyes; then
|
|
||||||
+ AC_CHECK_PROGS(CXX_FOR_BUILD, g++ cpp)
|
|
||||||
+ else
|
|
||||||
+ CXX_FOR_BUILD="$CXX"
|
|
||||||
+ fi
|
|
||||||
+fi
|
|
||||||
+AC_SUBST([CXX_FOR_BUILD])
|
|
||||||
+
|
|
||||||
AC_PROG_AWK
|
|
||||||
AC_PROG_LN_S
|
|
||||||
AC_PROG_MAKE_SET
|
|
||||||
diff -Naur xbmc-23757/Makefile.include.in xbmc-23757.patch/Makefile.include.in
|
|
||||||
--- xbmc-23757/Makefile.include.in 2009-10-16 18:45:26.000000000 +0200
|
|
||||||
+++ xbmc-23757.patch/Makefile.include.in 2009-10-17 03:52:35.461519121 +0200
|
|
||||||
@@ -5,8 +5,10 @@
|
|
||||||
ARCH=@ARCH@
|
|
||||||
abs_top_srcdir=@abs_top_srcdir@
|
|
||||||
prefix=@prefix@
|
|
||||||
-CXX=@CXX@
|
|
||||||
-CC=@CC@
|
|
||||||
+CXX?=@CXX@
|
|
||||||
+CC?=@CC@
|
|
||||||
+CXX_FOR_BUILD?=@CXX_FOR_BUILD@
|
|
||||||
+CC_FOR_BUILD?=@CC_FOR_BUILD@
|
|
||||||
CXXFLAGS+=@CXXFLAGS@
|
|
||||||
CXXFLAGS+=@DEBUG_FLAGS@
|
|
||||||
CFLAGS+=@CFLAGS@
|
|
||||||
diff -Naur xbmc-23757/tools/TexturePacker/Makefile.in xbmc-23757.patch/tools/TexturePacker/Makefile.in
|
|
||||||
--- xbmc-23757/tools/TexturePacker/Makefile.in 2009-10-16 18:45:41.000000000 +0200
|
|
||||||
+++ xbmc-23757.patch/tools/TexturePacker/Makefile.in 2009-10-17 03:54:09.299518353 +0200
|
|
||||||
@@ -7,6 +7,9 @@
|
|
||||||
LIBS = ../../xbmc/lib/libsquish/libsquish-@ARCH@.a -lSDL_image -lSDL -llzo2
|
|
||||||
endif
|
|
||||||
|
|
||||||
+CC=$(CC_FOR_BUILD)
|
|
||||||
+CXX=$(CXX_FOR_BUILD)
|
|
||||||
+
|
|
||||||
OBJS = \
|
|
||||||
SDL_anigif.o \
|
|
||||||
XBTFWriter.o \
|
|
||||||
@@ -21,4 +24,4 @@
|
|
||||||
include ../../Makefile.include
|
|
||||||
|
|
||||||
$(TARGET): $(OBJS)
|
|
||||||
- $(CXX) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARGET)
|
|
||||||
+ $(CXX_FOR_BUILD) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARGET)
|
|
@ -0,0 +1,36 @@
|
|||||||
|
diff -Naur xbmc-23841/xbmc/MathUtils.h xbmc-23841.patch/xbmc/MathUtils.h
|
||||||
|
--- xbmc-23841/xbmc/MathUtils.h 2009-10-18 22:20:52.000000000 +0200
|
||||||
|
+++ xbmc-23841.patch/xbmc/MathUtils.h 2009-10-20 08:58:35.131195343 +0200
|
||||||
|
@@ -30,8 +30,8 @@
|
||||||
|
// to assert in these functions
|
||||||
|
inline int round_int (double x)
|
||||||
|
{
|
||||||
|
- assert(x > static_cast<double>(INT_MIN / 2) - 1.0);
|
||||||
|
- assert(x < static_cast <double>(INT_MAX / 2) + 1.0);
|
||||||
|
+// assert(x > static_cast<double>(INT_MIN / 2) - 1.0);
|
||||||
|
+// assert(x < static_cast <double>(INT_MAX / 2) + 1.0);
|
||||||
|
const float round_to_nearest = 0.5f;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
@@ -62,8 +62,8 @@
|
||||||
|
|
||||||
|
inline int ceil_int (double x)
|
||||||
|
{
|
||||||
|
- assert(x > static_cast<double>(INT_MIN / 2) - 1.0);
|
||||||
|
- assert(x < static_cast <double>(INT_MAX / 2) + 1.0);
|
||||||
|
+// assert(x > static_cast<double>(INT_MIN / 2) - 1.0);
|
||||||
|
+// assert(x < static_cast <double>(INT_MAX / 2) + 1.0);
|
||||||
|
|
||||||
|
#if !defined(__powerpc__) && !defined(__ppc__)
|
||||||
|
const float round_towards_p_i = -0.5f;
|
||||||
|
@@ -97,8 +97,8 @@
|
||||||
|
|
||||||
|
inline int truncate_int(double x)
|
||||||
|
{
|
||||||
|
- assert(x > static_cast<double>(INT_MIN / 2) - 1.0);
|
||||||
|
- assert(x < static_cast <double>(INT_MAX / 2) + 1.0);
|
||||||
|
+// assert(x > static_cast<double>(INT_MIN / 2) - 1.0);
|
||||||
|
+// assert(x < static_cast <double>(INT_MAX / 2) + 1.0);
|
||||||
|
|
||||||
|
#if !defined(__powerpc__) && !defined(__ppc__)
|
||||||
|
const float round_towards_m_i = -0.5f;
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user