mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
xbmc:
- update to xbmc-27157
This commit is contained in:
parent
679265aea9
commit
22b0bb6f29
@ -45,7 +45,8 @@ $SCRIPTS/build libmms
|
||||
$SCRIPTS/build faac
|
||||
$SCRIPTS/build faad2
|
||||
$SCRIPTS/build flac
|
||||
# $SCRIPTS/build libmpeg2
|
||||
$SCRIPTS/build wavpack
|
||||
$SCRIPTS/build libmpeg2
|
||||
# $SCRIPTS/build musepack
|
||||
|
||||
$SCRIPTS/build SDL #?
|
||||
@ -114,7 +115,6 @@ cd -
|
||||
$XBMC_FFMPEG \
|
||||
--disable-external-liba52 \
|
||||
--disable-external-libdts \
|
||||
--disable-external-libmpeg2 \
|
||||
--disable-external-libass \
|
||||
--enable-external-libogg \
|
||||
--enable-external-python \
|
||||
|
@ -47,7 +47,8 @@ $SCRIPTS/install libmms
|
||||
$SCRIPTS/install faac
|
||||
$SCRIPTS/install faad2
|
||||
$SCRIPTS/install flac
|
||||
# $SCRIPTS/install libmpeg2
|
||||
$SCRIPTS/install wavpack
|
||||
$SCRIPTS/install libmpeg2
|
||||
# $SCRIPTS/install musepack
|
||||
[ "$FFMPEG" = external ] && $SCRIPTS/install ffmpeg
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--- xbmc-26784/configure.in 2010-01-14 06:01:36.002732210 +0100
|
||||
+++ xbmc-26784.patch/configure.in 2010-01-14 07:36:53.996945233 +0100
|
||||
@@ -1125,6 +1125,8 @@
|
||||
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
|
||||
--- xbmc-27135/configure.in 2010-01-24 11:46:42.037632392 +0100
|
||||
+++ xbmc-27135.patch/configure.in 2010-01-24 13:02:45.482579215 +0100
|
||||
@@ -1098,6 +1098,8 @@
|
||||
XB_CONFIG_MODULE([xbmc/lib/libPython/Python], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
./configure \
|
||||
@ -10,7 +10,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--enable-ipv6 \
|
||||
--enable-unicode=ucs4 \
|
||||
--without-cxx \
|
||||
@@ -1147,6 +1149,8 @@
|
||||
@@ -1120,6 +1122,8 @@
|
||||
cp pyconfig.h Include
|
||||
else
|
||||
./configure \
|
||||
@ -19,7 +19,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--enable-ipv6 \
|
||||
--enable-unicode=ucs4 \
|
||||
--without-cxx \
|
||||
@@ -1164,6 +1168,8 @@
|
||||
@@ -1137,6 +1141,8 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 -C \
|
||||
@ -28,7 +28,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--with-pic \
|
||||
--disable-asm-optimizations \
|
||||
--disable-xmms-plugin \
|
||||
@@ -1178,7 +1184,9 @@
|
||||
@@ -1151,7 +1157,9 @@
|
||||
XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/libvorbis], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
@ -39,7 +39,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
else
|
||||
true
|
||||
fi
|
||||
@@ -1187,7 +1195,9 @@
|
||||
@@ -1160,7 +1168,9 @@
|
||||
XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/ogg], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
@ -50,7 +50,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
else
|
||||
true
|
||||
fi
|
||||
@@ -1200,6 +1210,7 @@
|
||||
@@ -1173,6 +1183,7 @@
|
||||
--disable-amd3dnow \
|
||||
--disable-static \
|
||||
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
||||
@ -58,7 +58,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--disable-muxers \
|
||||
--disable-encoders \
|
||||
--disable-devices \
|
||||
@@ -1226,6 +1237,7 @@
|
||||
@@ -1199,6 +1210,7 @@
|
||||
--disable-static \
|
||||
--disable-ipv6 \
|
||||
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
||||
@ -66,7 +66,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--disable-muxers \
|
||||
--disable-encoders \
|
||||
--disable-decoder=mpeg_xvmc \
|
||||
@@ -1238,6 +1250,7 @@
|
||||
@@ -1211,6 +1223,7 @@
|
||||
--enable-postproc \
|
||||
--enable-gpl \
|
||||
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
|
||||
@ -74,7 +74,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--enable-libfaad \
|
||||
--enable-protocol=http \
|
||||
--enable-pthreads \
|
||||
@@ -1251,12 +1264,16 @@
|
||||
@@ -1224,12 +1237,16 @@
|
||||
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" \
|
||||
./configure \
|
||||
@ -91,7 +91,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--disable-oss \
|
||||
--disable-solaris-audio \
|
||||
--disable-al-audio \
|
||||
@@ -1269,11 +1286,15 @@
|
||||
@@ -1242,11 +1259,15 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
@ -107,7 +107,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--disable-doc \
|
||||
--enable-static \
|
||||
--with-pic
|
||||
@@ -1284,6 +1305,8 @@
|
||||
@@ -1257,6 +1278,8 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
./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" \
|
||||
@ -116,7 +116,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--cc="$CC" &&
|
||||
@@ -1293,6 +1316,8 @@
|
||||
@@ -1266,6 +1289,8 @@
|
||||
else
|
||||
./configure2 \
|
||||
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
|
||||
@ -125,7 +125,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--cc="$CC" &&
|
||||
@@ -1308,6 +1333,8 @@
|
||||
@@ -1281,6 +1306,8 @@
|
||||
./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
--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" \
|
||||
@ -134,7 +134,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
@@ -1316,6 +1343,8 @@
|
||||
@@ -1289,6 +1316,8 @@
|
||||
./configure2 \
|
||||
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
|
||||
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
|
||||
@ -143,7 +143,16 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
@@ -1337,6 +1366,8 @@
|
||||
@@ -1300,6 +1329,8 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-O3 -fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--with-pic
|
||||
else
|
||||
true
|
||||
@@ -1310,6 +1341,8 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
@ -152,7 +161,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1346,6 +1377,8 @@
|
||||
@@ -1319,6 +1352,8 @@
|
||||
--disable-al-audio
|
||||
else
|
||||
./configure \
|
||||
@ -161,25 +170,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1361,6 +1394,8 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1369,6 +1404,8 @@
|
||||
--without-x
|
||||
else
|
||||
./configure \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1382,6 +1419,8 @@
|
||||
@@ -1334,6 +1369,8 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
@ -188,7 +179,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--with-pic
|
||||
else
|
||||
true
|
||||
@@ -1392,17 +1431,23 @@
|
||||
@@ -1344,17 +1381,23 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.4
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
@ -215,7 +206,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
fi
|
||||
], [$USE_EXTERNAL_LIBASS])
|
||||
|
||||
@@ -1411,12 +1456,16 @@
|
||||
@@ -1363,12 +1406,16 @@
|
||||
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" \
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
@ -232,7 +223,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--disable-static \
|
||||
--disable-debugging \
|
||||
--with-pic
|
||||
@@ -1434,6 +1483,8 @@
|
||||
@@ -1386,6 +1433,8 @@
|
||||
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
|
||||
if test "$host_vendor" != "apple" ; then
|
||||
./configure \
|
||||
@ -241,7 +232,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--disable-shared \
|
||||
--enable-static \
|
||||
--with-pic
|
||||
@@ -1448,6 +1499,8 @@
|
||||
@@ -1400,6 +1449,8 @@
|
||||
CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
LDFLAGS="-L/opt/local/lib" \
|
||||
LIBS="-lz" \
|
||||
@ -250,7 +241,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
|
||||
--without-xscreensaver \
|
||||
--disable-sound \
|
||||
@@ -1463,6 +1516,8 @@
|
||||
@@ -1415,6 +1466,8 @@
|
||||
./configure \
|
||||
CFLAGS="-fPIC" \
|
||||
CXXFLAGS="-fPIC" \
|
||||
@ -259,7 +250,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--without-xscreensaver \
|
||||
--disable-sound \
|
||||
--disable-cyclone \
|
||||
@@ -1478,9 +1533,13 @@
|
||||
@@ -1430,18 +1483,26 @@
|
||||
|
||||
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
@ -276,5 +267,35 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
fi
|
||||
], [0])
|
||||
|
||||
diff -Naur xbmc-26784/configure.in.orig xbmc-26784.patch/configure.in.orig
|
||||
diff -Naur xbmc-26784/configure.in.rej xbmc-26784.patch/configure.in.rej
|
||||
XB_CONFIG_MODULE([xbmc/lib/libapetag], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
|
||||
- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared
|
||||
+ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias
|
||||
else
|
||||
- ./configure
|
||||
+ ./configure \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias
|
||||
fi
|
||||
], [0])
|
||||
|
||||
@@ -1449,9 +1510,13 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
|
||||
CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
|
||||
- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic --disable-shared --enable-static
|
||||
- else
|
||||
- ./configure --with-pic --enable-static
|
||||
+ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic --disable-shared --enable-static \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias
|
||||
+ else
|
||||
+ ./configure --with-pic --enable-static \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias
|
||||
fi
|
||||
], [0])
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
--- xbmc-26230/configure.in 2009-12-31 16:17:46.543195487 +0100
|
||||
+++ xbmc-26230.patch/configure.in 2009-12-31 16:19:06.864195517 +0100
|
||||
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
|
||||
--- xbmc-27135/configure.in 2010-01-24 13:04:51.758580580 +0100
|
||||
+++ xbmc-27135.patch/configure.in 2010-01-24 13:05:08.779612534 +0100
|
||||
@@ -45,6 +45,8 @@
|
||||
vdpau_disabled="== VDPAU support manually disabled. =="
|
||||
crystalhd_not_found="== Could not find libldil. CrystalHD support disabled. =="
|
||||
@ -10,7 +10,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
|
||||
# External library message strings
|
||||
external_libraries_enabled="== Use of all supported external libraries enabled. =="
|
||||
@@ -149,6 +151,12 @@
|
||||
@@ -145,6 +147,12 @@
|
||||
[use_goom=$enableval],
|
||||
[use_goom=no])
|
||||
|
||||
@ -23,7 +23,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
AC_PATH_PROG(CCACHE,ccache,none)
|
||||
AC_ARG_ENABLE([ccache],
|
||||
[AS_HELP_STRING([--enable-ccache],
|
||||
@@ -512,6 +520,15 @@
|
||||
@@ -503,6 +511,15 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -39,7 +39,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
### External libraries checks
|
||||
if test "$use_external_libraries" = "yes"; then
|
||||
AC_MSG_NOTICE($external_libraries_enabled)
|
||||
@@ -860,6 +877,12 @@
|
||||
@@ -835,6 +852,12 @@
|
||||
final_message="$final_message\n GOOM:\t\tNo"
|
||||
fi
|
||||
|
||||
@ -52,7 +52,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
if test "$use_pcre" = "yes"; then
|
||||
final_message="$final_message\n PCRE Support:\tYes"
|
||||
else
|
||||
@@ -1076,6 +1099,7 @@
|
||||
@@ -1054,6 +1077,7 @@
|
||||
AC_SUBST(SDL_DEFINES)
|
||||
AC_SUBST(BUILD_DVDCSS)
|
||||
AC_SUBST(BUILD_GOOM)
|
||||
@ -60,7 +60,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
AC_SUBST(USE_EXTERNAL_LIBRARIES)
|
||||
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
||||
AC_SUBST(USE_EXTERNAL_LIBA52)
|
||||
@@ -1476,7 +1500,7 @@
|
||||
@@ -1428,7 +1452,7 @@
|
||||
else
|
||||
rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
|
||||
fi
|
||||
@ -69,10 +69,11 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
|
||||
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
|
||||
if test "$host_vendor" != "apple" ; then
|
||||
diff -Naur xbmc-26230/Makefile.in xbmc-26230.patch/Makefile.in
|
||||
--- xbmc-26230/Makefile.in 2009-12-31 14:25:23.451197507 +0100
|
||||
+++ xbmc-26230.patch/Makefile.in 2009-12-31 16:18:18.016196094 +0100
|
||||
@@ -100,8 +100,10 @@
|
||||
diff -Naur xbmc-27135/configure.in.orig xbmc-27135.patch/configure.in.orig
|
||||
diff -Naur xbmc-27135/Makefile.in xbmc-27135.patch/Makefile.in
|
||||
--- xbmc-27135/Makefile.in 2010-01-24 11:46:42.037632392 +0100
|
||||
+++ xbmc-27135.patch/Makefile.in 2010-01-24 13:05:08.781706071 +0100
|
||||
@@ -101,8 +101,10 @@
|
||||
|
||||
VIS_DIRS=\
|
||||
xbmc/visualizations/OpenGLSpectrum \
|
||||
@ -85,7 +86,7 @@ diff -Naur xbmc-26230/Makefile.in xbmc-26230.patch/Makefile.in
|
||||
ifneq (@BUILD_GOOM@,1)
|
||||
VIS_DIRS+=xbmc/visualizations/Goom
|
||||
endif
|
||||
@@ -262,7 +264,9 @@
|
||||
@@ -274,7 +276,9 @@
|
||||
visualizations: exports
|
||||
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
|
||||
$(MAKE) -C xbmc/visualizations/WaveForm
|
||||
@ -95,3 +96,4 @@ diff -Naur xbmc-26230/Makefile.in xbmc-26230.patch/Makefile.in
|
||||
ifneq (@BUILD_GOOM@,1)
|
||||
ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(ARCH))),)
|
||||
$(MAKE) -C xbmc/visualizations/Goom
|
||||
diff -Naur xbmc-27135/Makefile.in.orig xbmc-27135.patch/Makefile.in.orig
|
||||
|
@ -1,6 +1,6 @@
|
||||
diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
--- xbmc-26230/configure.in 2009-12-31 16:20:04.273197409 +0100
|
||||
+++ xbmc-26230.patch/configure.in 2009-12-31 16:20:22.283196038 +0100
|
||||
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
|
||||
--- xbmc-27135/configure.in 2010-01-24 13:06:04.053736811 +0100
|
||||
+++ xbmc-27135.patch/configure.in 2010-01-24 13:06:32.203610970 +0100
|
||||
@@ -47,6 +47,8 @@
|
||||
crystalhd_disabled="== CrystalHD support manually disabled. =="
|
||||
xbmcprojectm_enabled="== XBMCProjectM enabled. =="
|
||||
@ -10,7 +10,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
|
||||
# External library message strings
|
||||
external_libraries_enabled="== Use of all supported external libraries enabled. =="
|
||||
@@ -157,6 +159,12 @@
|
||||
@@ -153,6 +155,12 @@
|
||||
[use_xbmcprojectm=$enableval],
|
||||
[use_xbmcprojectm=yes])
|
||||
|
||||
@ -23,7 +23,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
AC_PATH_PROG(CCACHE,ccache,none)
|
||||
AC_ARG_ENABLE([ccache],
|
||||
[AS_HELP_STRING([--enable-ccache],
|
||||
@@ -529,6 +537,15 @@
|
||||
@@ -520,6 +528,15 @@
|
||||
BUILD_XBMCPROJECTM=1
|
||||
fi
|
||||
|
||||
@ -39,7 +39,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
### External libraries checks
|
||||
if test "$use_external_libraries" = "yes"; then
|
||||
AC_MSG_NOTICE($external_libraries_enabled)
|
||||
@@ -883,6 +900,12 @@
|
||||
@@ -858,6 +875,12 @@
|
||||
final_message="$final_message\n XBMCProjectM:\tNo"
|
||||
fi
|
||||
|
||||
@ -52,7 +52,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
if test "$use_pcre" = "yes"; then
|
||||
final_message="$final_message\n PCRE Support:\tYes"
|
||||
else
|
||||
@@ -1100,6 +1123,7 @@
|
||||
@@ -1078,6 +1101,7 @@
|
||||
AC_SUBST(BUILD_DVDCSS)
|
||||
AC_SUBST(BUILD_GOOM)
|
||||
AC_SUBST(BUILD_XBMCPROJECTM)
|
||||
@ -60,7 +60,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
AC_SUBST(USE_EXTERNAL_LIBRARIES)
|
||||
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
||||
AC_SUBST(USE_EXTERNAL_LIBA52)
|
||||
@@ -1551,7 +1575,7 @@
|
||||
@@ -1503,7 +1527,7 @@
|
||||
--disable-lattice \
|
||||
--disable-skyrocket
|
||||
fi
|
||||
@ -69,13 +69,12 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
|
||||
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
diff -Naur xbmc-26230/configure.in.orig xbmc-26230.patch/configure.in.orig
|
||||
diff -Naur xbmc-26230/Makefile.in xbmc-26230.patch/Makefile.in
|
||||
--- xbmc-26230/Makefile.in 2009-12-31 16:20:04.273197409 +0100
|
||||
+++ xbmc-26230.patch/Makefile.in 2009-12-31 16:20:22.284195807 +0100
|
||||
@@ -95,8 +95,10 @@
|
||||
xbmc/lib/libid3tag \
|
||||
xbmc/lib/libPython/linux
|
||||
diff -Naur xbmc-27135/Makefile.in xbmc-27135.patch/Makefile.in
|
||||
--- xbmc-27135/Makefile.in 2010-01-24 13:06:04.055580383 +0100
|
||||
+++ xbmc-27135.patch/Makefile.in 2010-01-24 13:06:32.205705821 +0100
|
||||
@@ -96,8 +96,10 @@
|
||||
xbmc/lib/libPython/linux \
|
||||
lib/libmodplug
|
||||
|
||||
-SS_DIRS=\
|
||||
- xbmc/screensavers/rsxs-0.9/xbmc
|
||||
@ -86,7 +85,7 @@ diff -Naur xbmc-26230/Makefile.in xbmc-26230.patch/Makefile.in
|
||||
|
||||
VIS_DIRS=\
|
||||
xbmc/visualizations/OpenGLSpectrum \
|
||||
@@ -273,7 +275,9 @@
|
||||
@@ -285,7 +287,9 @@
|
||||
endif
|
||||
endif
|
||||
screensavers: exports
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
--- xbmc-26230/configure.in 2009-12-31 16:21:14.918195394 +0100
|
||||
+++ xbmc-26230.patch/configure.in 2009-12-31 16:22:02.708322440 +0100
|
||||
@@ -919,12 +919,6 @@
|
||||
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
|
||||
--- xbmc-27135/configure.in 2010-01-24 13:07:18.024733190 +0100
|
||||
+++ xbmc-27135.patch/configure.in 2010-01-24 13:07:39.324609701 +0100
|
||||
@@ -894,12 +894,6 @@
|
||||
final_message="$final_message\n MID Support:\tNo"
|
||||
fi
|
||||
|
||||
@ -14,10 +14,10 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in
|
||||
if test "$use_ccache" = "yes"; then
|
||||
if test "$ac_cv_path_CCACHE" = "none"; then
|
||||
echo "ccache not found. Falling back to default CC"
|
||||
diff -Naur xbmc-26230/configure.in.orig xbmc-26230.patch/configure.in.orig
|
||||
diff -Naur xbmc-26230/tools/TexturePacker/XBMCTex.cpp xbmc-26230.patch/tools/TexturePacker/XBMCTex.cpp
|
||||
--- xbmc-26230/tools/TexturePacker/XBMCTex.cpp 2009-12-31 14:28:41.435233446 +0100
|
||||
+++ xbmc-26230.patch/tools/TexturePacker/XBMCTex.cpp 2009-12-31 16:22:02.711322585 +0100
|
||||
diff -Naur xbmc-27135/configure.in.orig xbmc-27135.patch/configure.in.orig
|
||||
diff -Naur xbmc-27135/tools/TexturePacker/XBMCTex.cpp xbmc-27135.patch/tools/TexturePacker/XBMCTex.cpp
|
||||
--- xbmc-27135/tools/TexturePacker/XBMCTex.cpp 2010-01-24 11:48:16.696641003 +0100
|
||||
+++ xbmc-27135.patch/tools/TexturePacker/XBMCTex.cpp 2010-01-24 13:07:39.325705415 +0100
|
||||
@@ -37,7 +37,7 @@
|
||||
#endif
|
||||
|
||||
@ -27,4 +27,3 @@ diff -Naur xbmc-26230/tools/TexturePacker/XBMCTex.cpp xbmc-26230.patch/tools/Tex
|
||||
#else
|
||||
#include "../../xbmc/lib/liblzo/LZO1X.H"
|
||||
#endif
|
||||
diff -Naur xbmc-26230/tools/TexturePacker/XBMCTex.cpp.orig xbmc-26230.patch/tools/TexturePacker/XBMCTex.cpp.orig
|
||||
|
@ -1,15 +1,15 @@
|
||||
diff -Naur xbmc-26925/guilib/Makefile xbmc-26925.patch/guilib/Makefile
|
||||
--- xbmc-26925/guilib/Makefile 2010-01-17 00:46:52.136847980 +0100
|
||||
+++ xbmc-26925.patch/guilib/Makefile 2010-01-17 03:49:32.002148640 +0100
|
||||
diff -Naur xbmc-27135/guilib/Makefile.in xbmc-27135.patch/guilib/Makefile.in
|
||||
--- xbmc-27135/guilib/Makefile.in 2010-01-24 11:46:42.066643776 +0100
|
||||
+++ xbmc-27135.patch/guilib/Makefile.in 2010-01-24 13:14:01.800579073 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores/dvdplayer/Codecs/ffmpeg -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish
|
||||
+INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores/dvdplayer/Codecs/ffmpeg -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish
|
||||
|
||||
SRCS=AnimatedGif.cpp \
|
||||
AudioContext.cpp \
|
||||
diff -Naur xbmc-26925/xbmc/FileSystem/Makefile.in xbmc-26925.patch/xbmc/FileSystem/Makefile.in
|
||||
--- xbmc-26925/xbmc/FileSystem/Makefile.in 2010-01-17 00:48:14.996722616 +0100
|
||||
+++ xbmc-26925.patch/xbmc/FileSystem/Makefile.in 2010-01-17 03:49:57.202148904 +0100
|
||||
-INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish
|
||||
+INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish
|
||||
ifneq (@USE_EXTERNAL_FFMPEG@,1)
|
||||
INCLUDES+=-I../xbmc/cores/dvdplayer/Codecs/ffmpeg
|
||||
endif
|
||||
diff -Naur xbmc-27135/xbmc/FileSystem/Makefile.in xbmc-27135.patch/xbmc/FileSystem/Makefile.in
|
||||
--- xbmc-27135/xbmc/FileSystem/Makefile.in 2010-01-24 11:47:36.842631867 +0100
|
||||
+++ xbmc-27135.patch/xbmc/FileSystem/Makefile.in 2010-01-24 13:14:59.573578187 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
ARCH=@ARCH@
|
||||
|
||||
@ -18,12 +18,12 @@ diff -Naur xbmc-26925/xbmc/FileSystem/Makefile.in xbmc-26925.patch/xbmc/FileSyst
|
||||
INCLUDES+=-I../lib/libcdio/libcdio/include
|
||||
ifeq ($(findstring osx,$(ARCH)), osx)
|
||||
INCLUDES+=-I../../lib/libcurl-OSX/include
|
||||
diff -Naur xbmc-26925/xbmc/Makefile xbmc-26925.patch/xbmc/Makefile
|
||||
--- xbmc-26925/xbmc/Makefile 2010-01-17 00:47:31.173847479 +0100
|
||||
+++ xbmc-26925.patch/xbmc/Makefile 2010-01-17 03:50:20.319148465 +0100
|
||||
diff -Naur xbmc-27135/xbmc/Makefile.in xbmc-27135.patch/xbmc/Makefile.in
|
||||
--- xbmc-27135/xbmc/Makefile.in 2010-01-24 11:47:03.973632064 +0100
|
||||
+++ xbmc-27135.patch/xbmc/Makefile.in 2010-01-24 13:14:32.079579280 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg
|
||||
+INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg
|
||||
-INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer
|
||||
+INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer
|
||||
|
||||
INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \
|
||||
-Ilib/libUPnP/Platinum/Source/Platinum \
|
||||
ifneq (@USE_EXTERNAL_FFMPEG@,1)
|
||||
INCLUDES+=-Icores/dvdplayer/Codecs/ffmpeg
|
||||
|
@ -1,6 +1,6 @@
|
||||
diff -Naur xbmc-24572/configure.in xbmc-24572.patch/configure.in
|
||||
--- xbmc-24572/configure.in 2009-11-13 18:24:10.534620149 +0100
|
||||
+++ xbmc-24572.patch/configure.in 2009-11-17 22:31:58.527230919 +0100
|
||||
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
|
||||
--- xbmc-27135/configure.in 2010-01-24 13:08:23.126603769 +0100
|
||||
+++ xbmc-27135.patch/configure.in 2010-01-24 13:16:12.459703838 +0100
|
||||
@@ -39,6 +39,8 @@
|
||||
faac_disabled="== FAAC support manually disabled. =="
|
||||
dvdcss_enabled="== DVDCSS support enabled. =="
|
||||
@ -10,7 +10,7 @@ diff -Naur xbmc-24572/configure.in xbmc-24572.patch/configure.in
|
||||
avahi_not_found="== Could not find libavahi-common or libavahi-client. Avahi support disabled. =="
|
||||
avahi_disabled="== Avahi support disabled. =="
|
||||
vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. =="
|
||||
@@ -171,6 +173,11 @@
|
||||
@@ -191,6 +193,11 @@
|
||||
[enable MID support (default is no)])],
|
||||
[use_mid=$enableval],
|
||||
[use_mid=no])
|
||||
@ -22,7 +22,7 @@ diff -Naur xbmc-24572/configure.in xbmc-24572.patch/configure.in
|
||||
AC_ARG_ENABLE([avahi],
|
||||
[AS_HELP_STRING([--disable-avahi],
|
||||
[disable Avahi support (default is enabled if libavahi-common and libavahi-client is found)])],
|
||||
@@ -417,15 +424,9 @@
|
||||
@@ -437,15 +444,9 @@
|
||||
PKG_CHECK_MODULES([DBUS], [dbus-1],
|
||||
[INCLUDES+=" $DBUS_CFLAGS"; LIBS+=" $DBUS_LIBS"],
|
||||
AC_MSG_ERROR($missing_library))
|
||||
@ -38,7 +38,7 @@ diff -Naur xbmc-24572/configure.in xbmc-24572.patch/configure.in
|
||||
fi
|
||||
|
||||
# PulseAudio
|
||||
@@ -454,6 +455,24 @@
|
||||
@@ -474,6 +475,24 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -63,10 +63,11 @@ diff -Naur xbmc-24572/configure.in xbmc-24572.patch/configure.in
|
||||
# avahi
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
use_avahi="no"
|
||||
diff -Naur xbmc-24572/guilib/system.h xbmc-24572.patch/guilib/system.h
|
||||
--- xbmc-24572/guilib/system.h 2009-11-13 18:24:28.712620840 +0100
|
||||
+++ xbmc-24572.patch/guilib/system.h 2009-11-17 22:32:21.807233214 +0100
|
||||
@@ -110,7 +110,6 @@
|
||||
diff -Naur xbmc-27135/configure.in.orig xbmc-27135.patch/configure.in.orig
|
||||
diff -Naur xbmc-27135/guilib/system.h xbmc-27135.patch/guilib/system.h
|
||||
--- xbmc-27135/guilib/system.h 2010-01-24 11:46:42.047669779 +0100
|
||||
+++ xbmc-27135.patch/guilib/system.h 2010-01-24 13:16:12.460703245 +0100
|
||||
@@ -117,7 +117,6 @@
|
||||
#define HAS_AVAHI
|
||||
#endif
|
||||
#define HAS_LCD
|
||||
@ -74,3 +75,4 @@ diff -Naur xbmc-24572/guilib/system.h xbmc-24572.patch/guilib/system.h
|
||||
#define HAS_DBUS
|
||||
#define HAS_DBUS_SERVER
|
||||
#define HAS_GL
|
||||
diff -Naur xbmc-27135/guilib/system.h.orig xbmc-27135.patch/guilib/system.h.orig
|
||||
|
@ -1 +1 @@
|
||||
http://sources.openelec.tv/svn/xbmc-27023.tar.bz2
|
||||
http://sources.openelec.tv/svn/xbmc-27157.tar.bz2
|
||||
|
Loading…
x
Reference in New Issue
Block a user