xbmc-pvr:

- update to xbmc-pvr-27686
This commit is contained in:
Stephan Raue 2010-02-12 10:18:56 +01:00
parent 811287f530
commit c306d09f86
4 changed files with 88 additions and 223 deletions

View File

@ -1,16 +1,7 @@
diff -Naur xbmc-27191/configure.in xbmc-27191.patch/configure.in diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
--- xbmc-27191/configure.in 2010-01-26 10:56:15.897804152 +0100 --- xbmc-pvr-27686/configure.in 2010-02-12 09:03:40.000000000 +0100
+++ xbmc-27191.patch/configure.in 2010-01-26 11:32:58.096953871 +0100 +++ xbmc-pvr-27686.patch/configure.in 2010-02-12 09:30:08.351016359 +0100
@@ -1073,6 +1073,8 @@ @@ -1121,6 +1121,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 \
@@ -1095,6 +1097,8 @@
cp pyconfig.h Include cp pyconfig.h Include
else else
./configure \ ./configure \
@ -19,32 +10,15 @@ diff -Naur xbmc-27191/configure.in xbmc-27191.patch/configure.in
--enable-ipv6 \ --enable-ipv6 \
--enable-unicode=ucs4 \ --enable-unicode=ucs4 \
--without-cxx \ --without-cxx \
@@ -1112,6 +1116,8 @@ @@ -1185,6 +1187,7 @@
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 \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-asm-optimizations \
--disable-xmms-plugin \
@@ -1130,6 +1136,7 @@
--disable-amd3dnow \
--disable-static \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
--disable-muxers \
--disable-encoders \
--disable-devices \
@@ -1156,6 +1163,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` \
+ `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-muxers \
--enable-muxer=spdif \
--disable-encoders \ --disable-encoders \
--disable-decoder=mpeg_xvmc \ @@ -1200,6 +1203,7 @@
@@ -1168,6 +1176,7 @@
--enable-postproc \ --enable-postproc \
--enable-gpl \ --enable-gpl \
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \ `if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
@ -52,15 +26,7 @@ diff -Naur xbmc-27191/configure.in xbmc-27191.patch/configure.in
--enable-libfaad \ --enable-libfaad \
--enable-protocol=http \ --enable-protocol=http \
--enable-pthreads \ --enable-pthreads \
@@ -1181,12 +1190,16 @@ @@ -1219,6 +1223,8 @@
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 \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \
--disable-win --disable-win
else else
./configure \ ./configure \
@ -69,14 +35,7 @@ diff -Naur xbmc-27191/configure.in xbmc-27191.patch/configure.in
--disable-oss \ --disable-oss \
--disable-solaris-audio \ --disable-solaris-audio \
--disable-al-audio \ --disable-al-audio \
@@ -1199,11 +1212,15 @@ @@ -1236,6 +1242,8 @@
if test "$host_vendor" = "apple" ; then
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-doc \
--enable-static \
--with-pic --with-pic
else else
./configure \ ./configure \
@ -85,61 +44,25 @@ diff -Naur xbmc-27191/configure.in xbmc-27191.patch/configure.in
--disable-doc \ --disable-doc \
--enable-static \ --enable-static \
--with-pic --with-pic
@@ -1214,6 +1231,8 @@ @@ -1254,6 +1262,8 @@
if test "$host_vendor" = "apple" ; then cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
./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" \
+ --host=$host_alias \
+ --build=$build_alias \
--enable-static \
--disable-shared \
--cc="$CC" &&
@@ -1223,6 +1242,8 @@
else else
./configure2 \ ./configure2 \
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
+ --host=$host_alias \ + --host=$host_alias \
+ --build=$build_alias \ + --build=$build_alias \
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--enable-static \ --enable-static \
--disable-shared \ @@ -1279,6 +1289,8 @@
--cc="$CC" && --cc="$CC"
@@ -1238,6 +1259,8 @@ else
./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" \
+ --host=$host_alias \
+ --build=$build_alias \
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
--enable-static \
--disable-shared \
@@ -1246,6 +1269,8 @@
./configure2 \ ./configure2 \
+ --host=$host_alias \
+ --build=$build_alias \
--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" \
--enable-static \ @@ -1311,6 +1323,8 @@
--disable-shared \
@@ -1257,6 +1282,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
@@ -1267,6 +1294,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 \
@@ -1276,6 +1305,8 @@
--disable-al-audio --disable-al-audio
else else
./configure \ ./configure \
@ -148,33 +71,8 @@ diff -Naur xbmc-27191/configure.in xbmc-27191.patch/configure.in
--with-pic \ --with-pic \
--disable-static \ --disable-static \
--enable-shared \ --enable-shared \
@@ -1291,6 +1322,8 @@ @@ -1346,7 +1360,9 @@
if test "$host_vendor" = "apple" ; then ./configure MACOSX_DEPLOYMENT_TARGET=10.4
CFLAGS="-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
@@ -1301,17 +1334,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" \
- ./configure
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])
XB_CONFIG_MODULE([xbmc/lib/libass], [
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
+ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
+ --host=$host_alias \
+ --build=$build_alias
else else
CFLAGS="$CFLAGS -fPIC" \ CFLAGS="$CFLAGS -fPIC" \
- ./configure - ./configure
@ -184,74 +82,50 @@ diff -Naur xbmc-27191/configure.in xbmc-27191.patch/configure.in
fi fi
], [$USE_EXTERNAL_LIBASS]) ], [$USE_EXTERNAL_LIBASS])
@@ -1320,12 +1359,16 @@ @@ -1360,6 +1376,8 @@
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 \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-static \
--disable-debugging \
--with-pic --with-pic
else else
CFLAGS=-O3 \
./configure \ ./configure \
+ --host=$host_alias \ + --host=$host_alias \
+ --build=$build_alias \ + --build=$build_alias \
--disable-static \ CPPFLAGS="$CPPFLAGS" \
--disable-debugging \ CFLAGS="$CFLAGS -fPIC" \
--with-pic CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1343,6 +1386,8 @@ @@ -1386,6 +1404,8 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then if test "$host_vendor" != "apple" ; then
./configure \ ./configure \
+ --host=$host_alias \ + --host=$host_alias \
+ --build=$build_alias \ + --build=$build_alias \
--disable-shared \ CPPFLAGS="$CPPFLAGS" \
--enable-static \ CFLAGS="$CFLAGS -fPIC" \
--with-pic CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1357,6 +1402,8 @@ @@ -1416,6 +1436,8 @@
CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \ --disable-skyrocket
LDFLAGS="-L/opt/local/lib" \ else
LIBS="-lz" \
+ --host=$host_alias \
+ --build=$build_alias \
--x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
--without-xscreensaver \
--disable-sound \
@@ -1372,6 +1419,8 @@
./configure \ ./configure \
CFLAGS="-fPIC" \
CXXFLAGS="-fPIC" \
+ --host=$host_alias \ + --host=$host_alias \
+ --build=$build_alias \ + --build=$build_alias \
--without-xscreensaver \ CPPFLAGS="$CPPFLAGS" \
--disable-sound \ CFLAGS="$CFLAGS -fPIC" \
--disable-cyclone \ CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1387,18 +1436,26 @@ @@ -1435,9 +1457,11 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then if test "$host_vendor" = "apple" ; then
- ./configure --with-ssl-dir=/opt/local/include - ./configure --with-ssl-dir=/opt/local/include
- else + ./configure --with-ssl-dir=/opt/local/include
else
- ./configure --without-openssl - ./configure --without-openssl
+ ./configure --with-ssl-dir=/opt/local/include \
+ --host=$host_alias \
+ --build=$build_alias
+ else
+ ./configure --without-openssl \ + ./configure --without-openssl \
+ --host=$host_alias \ + --host=$host_alias \
+ --build=$build_alias + --build=$build_alias
fi fi
], [0]) ], [0])
XB_CONFIG_MODULE([xbmc/lib/libapetag], [ @@ -1446,7 +1470,9 @@
if test "$host_vendor" = "apple" ; then
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" \
- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared
+ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared \
+ --host=$host_alias \
+ --build=$build_alias
else else
- ./configure - ./configure
+ ./configure \ + ./configure \
@ -260,17 +134,11 @@ diff -Naur xbmc-27191/configure.in xbmc-27191.patch/configure.in
fi fi
], [0]) ], [0])
@@ -1406,9 +1463,13 @@ @@ -1456,7 +1482,9 @@
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" \ 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 ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic --disable-shared --enable-static
- else else
- ./configure --with-pic --enable-static - ./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 \ + ./configure --with-pic --enable-static \
+ --host=$host_alias \ + --host=$host_alias \
+ --build=$build_alias + --build=$build_alias

View File

@ -1,16 +1,16 @@
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
--- xbmc-27135/configure.in 2010-01-24 13:04:51.758580580 +0100 --- xbmc-pvr-27686/configure.in 2010-02-12 09:50:39.599142980 +0100
+++ xbmc-27135.patch/configure.in 2010-01-24 13:05:08.779612534 +0100 +++ xbmc-pvr-27686.patch/configure.in 2010-02-12 10:01:04.437016432 +0100
@@ -45,6 +45,8 @@ @@ -33,6 +33,8 @@
vdpau_disabled="== VDPAU support manually disabled. ==" xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
crystalhd_not_found="== Could not find libldil. CrystalHD support disabled. ==" goom_enabled="== GOOM enabled. =="
crystalhd_disabled="== CrystalHD support manually disabled. ==" goom_disabled="== GOOM disabled. =="
+xbmcprojectm_enabled="== XBMCProjectM enabled. ==" +xbmcprojectm_enabled="== XBMCProjectM enabled. =="
+xbmxprojectm_disabled="== XBMCProjectM disabled. ==" +xbmxprojectm_disabled="== XBMCProjectM disabled. =="
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
# External library message strings pulse_disabled="== PulseAudio support manually disabled. =="
external_libraries_enabled="== Use of all supported external libraries enabled. ==" faac_not_found="== Could not find libfaac. FAAC support disabled. =="
@@ -145,6 +147,12 @@ @@ -143,6 +145,12 @@
[use_goom=$enableval], [use_goom=$enableval],
[use_goom=no]) [use_goom=no])
@ -23,7 +23,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
AC_PATH_PROG(CCACHE,ccache,none) AC_PATH_PROG(CCACHE,ccache,none)
AC_ARG_ENABLE([ccache], AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--enable-ccache], [AS_HELP_STRING([--enable-ccache],
@@ -503,6 +511,15 @@ @@ -505,6 +513,15 @@
fi fi
fi fi
@ -39,7 +39,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
### External libraries checks ### External libraries checks
if test "$use_external_libraries" = "yes"; then if test "$use_external_libraries" = "yes"; then
AC_MSG_NOTICE($external_libraries_enabled) AC_MSG_NOTICE($external_libraries_enabled)
@@ -835,6 +852,12 @@ @@ -827,6 +844,12 @@
final_message="$final_message\n GOOM:\t\tNo" final_message="$final_message\n GOOM:\t\tNo"
fi fi
@ -52,7 +52,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
if test "$use_pcre" = "yes"; then if test "$use_pcre" = "yes"; then
final_message="$final_message\n PCRE Support:\tYes" final_message="$final_message\n PCRE Support:\tYes"
else else
@@ -1054,6 +1077,7 @@ @@ -1057,6 +1080,7 @@
AC_SUBST(SDL_DEFINES) AC_SUBST(SDL_DEFINES)
AC_SUBST(BUILD_DVDCSS) AC_SUBST(BUILD_DVDCSS)
AC_SUBST(BUILD_GOOM) AC_SUBST(BUILD_GOOM)
@ -60,20 +60,19 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES) AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52) AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1428,7 +1452,7 @@ @@ -1399,7 +1423,7 @@
else -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF . set +x
fi fi
-], [0]) -], [0])
+], [$BUILD_XBMCPROJECTM]) +], [$BUILD_XBMCPROJECTM])
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then if test "$host_vendor" != "apple" ; then
diff -Naur xbmc-27135/configure.in.orig xbmc-27135.patch/configure.in.orig diff -Naur xbmc-pvr-27686/Makefile.in xbmc-pvr-27686.patch/Makefile.in
diff -Naur xbmc-27135/Makefile.in xbmc-27135.patch/Makefile.in --- xbmc-pvr-27686/Makefile.in 2010-02-12 09:03:40.000000000 +0100
--- xbmc-27135/Makefile.in 2010-01-24 11:46:42.037632392 +0100 +++ xbmc-pvr-27686.patch/Makefile.in 2010-02-12 09:55:09.275018043 +0100
+++ xbmc-27135.patch/Makefile.in 2010-01-24 13:05:08.781706071 +0100 @@ -106,8 +106,10 @@
@@ -101,8 +101,10 @@
VIS_DIRS=\ VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \ xbmc/visualizations/OpenGLSpectrum \
@ -86,7 +85,7 @@ diff -Naur xbmc-27135/Makefile.in xbmc-27135.patch/Makefile.in
ifneq (@BUILD_GOOM@,1) ifneq (@BUILD_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom VIS_DIRS+=xbmc/visualizations/Goom
endif endif
@@ -274,7 +276,9 @@ @@ -291,7 +293,9 @@
visualizations: exports visualizations: exports
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum $(MAKE) -C xbmc/visualizations/OpenGLSpectrum
$(MAKE) -C xbmc/visualizations/WaveForm $(MAKE) -C xbmc/visualizations/WaveForm
@ -96,4 +95,3 @@ diff -Naur xbmc-27135/Makefile.in xbmc-27135.patch/Makefile.in
ifneq (@BUILD_GOOM@,1) ifneq (@BUILD_GOOM@,1)
ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(ARCH))),) ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(ARCH))),)
$(MAKE) -C xbmc/visualizations/Goom $(MAKE) -C xbmc/visualizations/Goom
diff -Naur xbmc-27135/Makefile.in.orig xbmc-27135.patch/Makefile.in.orig

View File

@ -1,16 +1,16 @@
diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
--- xbmc-pvr-26651/configure.in 2010-01-11 04:32:20.242370124 +0100 --- xbmc-pvr-27686/configure.in 2010-02-12 10:07:39.181174683 +0100
+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:32:45.253470764 +0100 +++ xbmc-pvr-27686.patch/configure.in 2010-02-12 10:06:08.192017722 +0100
@@ -47,6 +47,8 @@ @@ -35,6 +35,8 @@
crystalhd_disabled="== CrystalHD support manually disabled. ==" goom_disabled="== GOOM disabled. =="
xbmcprojectm_enabled="== XBMCProjectM enabled. ==" xbmcprojectm_enabled="== XBMCProjectM enabled. =="
xbmxprojectm_disabled="== XBMCProjectM disabled. ==" xbmxprojectm_disabled="== XBMCProjectM disabled. =="
+rsxs_enabled="== RSXS enabled. ==" +rsxs_enabled="== RSXS enabled. =="
+rsxs_disabled="== RSXS disabled. ==" +rsxs_disabled="== RSXS disabled. =="
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
# External library message strings pulse_disabled="== PulseAudio support manually disabled. =="
external_libraries_enabled="== Use of all supported external libraries enabled. ==" faac_not_found="== Could not find libfaac. FAAC support disabled. =="
@@ -157,6 +159,12 @@ @@ -151,6 +153,12 @@
[use_xbmcprojectm=$enableval], [use_xbmcprojectm=$enableval],
[use_xbmcprojectm=yes]) [use_xbmcprojectm=yes])
@ -23,7 +23,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
AC_PATH_PROG(CCACHE,ccache,none) AC_PATH_PROG(CCACHE,ccache,none)
AC_ARG_ENABLE([ccache], AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--enable-ccache], [AS_HELP_STRING([--enable-ccache],
@@ -529,6 +537,15 @@ @@ -522,6 +530,15 @@
BUILD_XBMCPROJECTM=1 BUILD_XBMCPROJECTM=1
fi fi
@ -39,7 +39,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
### External libraries checks ### External libraries checks
if test "$use_external_libraries" = "yes"; then if test "$use_external_libraries" = "yes"; then
AC_MSG_NOTICE($external_libraries_enabled) AC_MSG_NOTICE($external_libraries_enabled)
@@ -879,6 +896,12 @@ @@ -850,6 +867,12 @@
final_message="$final_message\n XBMCProjectM:\tNo" final_message="$final_message\n XBMCProjectM:\tNo"
fi fi
@ -52,7 +52,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
if test "$use_pcre" = "yes"; then if test "$use_pcre" = "yes"; then
final_message="$final_message\n PCRE Support:\tYes" final_message="$final_message\n PCRE Support:\tYes"
else else
@@ -1096,6 +1119,7 @@ @@ -1081,6 +1104,7 @@
AC_SUBST(BUILD_DVDCSS) AC_SUBST(BUILD_DVDCSS)
AC_SUBST(BUILD_GOOM) AC_SUBST(BUILD_GOOM)
AC_SUBST(BUILD_XBMCPROJECTM) AC_SUBST(BUILD_XBMCPROJECTM)
@ -60,7 +60,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES) AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52) AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1546,7 +1570,7 @@ @@ -1477,7 +1501,7 @@
--disable-lattice \ --disable-lattice \
--disable-skyrocket --disable-skyrocket
fi fi
@ -69,13 +69,12 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig diff -Naur xbmc-pvr-27686/Makefile.in xbmc-pvr-27686.patch/Makefile.in
diff -Naur xbmc-pvr-26651/Makefile.in xbmc-pvr-26651.patch/Makefile.in --- xbmc-pvr-27686/Makefile.in 2010-02-12 10:07:39.182172289 +0100
--- xbmc-pvr-26651/Makefile.in 2010-01-11 04:32:20.302471949 +0100 +++ xbmc-pvr-27686.patch/Makefile.in 2010-02-12 10:03:25.738140979 +0100
+++ xbmc-pvr-26651.patch/Makefile.in 2010-01-11 04:34:20.323471765 +0100 @@ -101,8 +101,10 @@
@@ -100,8 +100,10 @@ lib/libmodplug \
xbmc/lib/libid3tag \ lib/xbmc-dll-symbols
xbmc/lib/libPython/linux
-SS_DIRS=\ -SS_DIRS=\
- xbmc/screensavers/rsxs-0.9/xbmc - xbmc/screensavers/rsxs-0.9/xbmc
@ -86,9 +85,9 @@ diff -Naur xbmc-pvr-26651/Makefile.in xbmc-pvr-26651.patch/Makefile.in
VIS_DIRS=\ VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \ xbmc/visualizations/OpenGLSpectrum \
@@ -292,7 +294,9 @@ @@ -305,7 +307,9 @@
pvrclients: exports $(MAKE) -C xbmc/pvrclients/vdr-streamdev
$(MAKE) -C xbmc/pvrclients/vdr $(MAKE) -C xbmc/pvrclients/tvheadend
screensavers: exports screensavers: exports
+ifneq (@BUILD_RSXS@,1) +ifneq (@BUILD_RSXS@,1)
$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc

View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-pvr-27665.tar.bz2 http://sources.openelec.tv/svn/xbmc-pvr-27686.tar.bz2