- fix some patches for new svn
- adding patch for crosscompile libbdnav
This commit is contained in:
Stephan Raue 2009-12-19 19:26:23 +01:00
parent e56089b2f0
commit be12cbce55
4 changed files with 84 additions and 65 deletions

View File

@ -1,17 +1,7 @@
diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--- xbmc-25850/configure.in 2009-12-19 13:34:46.000000000 +0100
+++ xbmc-25850.patch/configure.in 2009-12-19 16:29:54.133125479 +0100
@@ -69,6 +69,9 @@
i*86*-linux-gnu*)
ARCH="i486-linux"
;;
+ i*86*-linux-uclibc*)
+ ARCH="i486-uclibc"
+ ;;
x86_64-*-linux-gnu*)
ARCH="x86_64-linux"
;;
@@ -1093,6 +1096,8 @@
+++ xbmc-25850.patch/configure.in 2009-12-19 18:43:37.636250496 +0100
@@ -1093,6 +1093,8 @@
XB_CONFIG_MODULE([xbmc/lib/libPython/Python], [
if test "$host_vendor" = "apple" ; then
./configure \
@ -20,7 +10,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--enable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
@@ -1115,6 +1120,8 @@
@@ -1115,6 +1117,8 @@
cp pyconfig.h Include
else
./configure \
@ -29,7 +19,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--enable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
@@ -1132,6 +1139,8 @@
@@ -1132,6 +1136,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 \
@ -38,7 +28,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--with-pic \
--disable-asm-optimizations \
--disable-xmms-plugin \
@@ -1146,7 +1155,9 @@
@@ -1146,7 +1152,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" \
@ -49,7 +39,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
else
true
fi
@@ -1155,7 +1166,9 @@
@@ -1155,7 +1163,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" \
@ -60,7 +50,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
else
true
fi
@@ -1168,6 +1181,7 @@
@@ -1168,6 +1178,7 @@
--disable-amd3dnow \
--disable-static \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
@ -68,7 +58,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--disable-muxers \
--disable-encoders \
--disable-devices \
@@ -1194,6 +1208,7 @@
@@ -1194,6 +1205,7 @@
--disable-static \
--disable-ipv6 \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
@ -76,7 +66,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--disable-muxers \
--disable-encoders \
--disable-decoder=mpeg_xvmc \
@@ -1206,6 +1221,7 @@
@@ -1206,6 +1218,7 @@
--enable-postproc \
--enable-gpl \
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; fi` \
@ -84,7 +74,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--enable-libfaad \
--enable-protocol=http \
--enable-pthreads \
@@ -1219,12 +1235,16 @@
@@ -1219,12 +1232,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 \
@ -101,7 +91,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \
@@ -1237,11 +1257,15 @@
@@ -1237,11 +1254,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" \
@ -117,7 +107,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--disable-doc \
--enable-static \
--with-pic
@@ -1252,6 +1276,8 @@
@@ -1252,6 +1273,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" \
@ -126,7 +116,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--enable-static \
--disable-shared \
--cc="$CC" &&
@@ -1261,6 +1287,8 @@
@@ -1261,6 +1284,8 @@
else
./configure2 \
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
@ -135,7 +125,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--enable-static \
--disable-shared \
--cc="$CC" &&
@@ -1276,6 +1304,8 @@
@@ -1276,6 +1301,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" \
@ -144,7 +134,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
--enable-static \
--disable-shared \
@@ -1284,6 +1314,8 @@
@@ -1284,6 +1311,8 @@
./configure2 \
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
@ -153,7 +143,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
--enable-static \
--disable-shared \
@@ -1295,6 +1327,8 @@
@@ -1295,6 +1324,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 \
@ -162,7 +152,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--with-pic \
--with-mp4v2
else
@@ -1306,6 +1340,8 @@
@@ -1306,6 +1337,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 \
@ -171,7 +161,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--with-pic \
--disable-static \
--enable-shared \
@@ -1315,6 +1351,8 @@
@@ -1315,6 +1348,8 @@
--disable-al-audio
else
./configure \
@ -180,7 +170,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--with-pic \
--disable-static \
--enable-shared \
@@ -1330,6 +1368,8 @@
@@ -1330,6 +1365,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 \
@ -189,7 +179,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--with-pic \
--disable-static \
--enable-shared \
@@ -1338,6 +1378,8 @@
@@ -1338,6 +1375,8 @@
--without-x
else
./configure \
@ -198,7 +188,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--with-pic \
--disable-static \
--enable-shared \
@@ -1351,6 +1393,8 @@
@@ -1351,6 +1390,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 \
@ -207,7 +197,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--with-pic
else
true
@@ -1361,17 +1405,23 @@
@@ -1361,17 +1402,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" \
@ -234,7 +224,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
fi
], [$USE_EXTERNAL_LIBASS])
@@ -1380,12 +1430,16 @@
@@ -1380,12 +1427,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 \
@ -251,7 +241,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--disable-static \
--disable-debugging \
--with-pic
@@ -1403,6 +1457,8 @@
@@ -1403,6 +1454,8 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
./configure \
@ -260,7 +250,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--disable-shared \
--enable-static \
--with-pic
@@ -1417,6 +1473,8 @@
@@ -1417,6 +1470,8 @@
CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
LDFLAGS="-L/opt/local/lib" \
LIBS="-lz" \
@ -269,7 +259,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
--without-xscreensaver \
--disable-sound \
@@ -1432,6 +1490,8 @@
@@ -1432,6 +1487,8 @@
./configure \
CFLAGS="-fPIC" \
CXXFLAGS="-fPIC" \
@ -278,3 +268,20 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--without-xscreensaver \
--disable-sound \
--disable-cyclone \
@@ -1447,9 +1504,13 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
- ./configure --with-ssl-dir=/opt/local/include
- else
- ./configure
+ ./configure --with-ssl-dir=/opt/local/include \
+ --host=$host_alias \
+ --build=$build_alias
+ else
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])

View File

@ -1,6 +1,6 @@
diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
--- xbmc-24229/configure.in 2009-11-03 12:09:52.172520636 +0100
+++ xbmc-24229.patch/configure.in 2009-11-03 12:10:09.146521883 +0100
diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--- xbmc-25850/configure.in 2009-12-19 18:47:15.600276781 +0100
+++ xbmc-25850.patch/configure.in 2009-12-19 18:45:16.404157176 +0100
@@ -43,6 +43,8 @@
avahi_disabled="== Avahi support disabled. =="
vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. =="
@ -10,7 +10,7 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
# External library message strings
external_libraries_enabled="== Use of all supported external libraries enabled. =="
@@ -144,6 +146,12 @@
@@ -141,6 +143,12 @@
[use_goom=$enableval],
[use_goom=no])
@ -23,7 +23,7 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
AC_PATH_PROG(CCACHE,ccache,none)
AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--enable-ccache],
@@ -501,6 +509,15 @@
@@ -504,6 +512,15 @@
fi
fi
@ -39,7 +39,7 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
### External libraries checks
if test "$use_external_libraries" = "yes"; then
AC_MSG_NOTICE($external_libraries_enabled)
@@ -827,6 +844,12 @@
@@ -833,6 +850,12 @@
final_message="$final_message\n GOOM:\t\tNo"
fi
@ -52,7 +52,7 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
if test "$use_pcre" = "yes"; then
final_message="$final_message\n PCRE Support:\tYes"
else
@@ -1031,6 +1054,7 @@
@@ -1049,6 +1072,7 @@
AC_SUBST(SDL_DEFINES)
AC_SUBST(BUILD_DVDCSS)
AC_SUBST(BUILD_GOOM)
@ -60,7 +60,7 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1428,7 +1452,7 @@
@@ -1449,7 +1473,7 @@
else
rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
fi
@ -68,11 +68,11 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
+], [$BUILD_XBMCPROJECTM])
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-24229/Makefile.in xbmc-24229.patch/Makefile.in
--- xbmc-24229/Makefile.in 2009-11-03 10:52:38.481395092 +0100
+++ xbmc-24229.patch/Makefile.in 2009-11-03 12:10:09.154522004 +0100
@@ -94,8 +94,10 @@
if test "$host_vendor" != "apple" ; then
diff -Naur xbmc-25850/Makefile.in xbmc-25850.patch/Makefile.in
--- xbmc-25850/Makefile.in 2009-12-19 13:34:46.000000000 +0100
+++ xbmc-25850.patch/Makefile.in 2009-12-19 18:45:16.406251838 +0100
@@ -100,8 +100,10 @@
VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \
@ -85,7 +85,7 @@ diff -Naur xbmc-24229/Makefile.in xbmc-24229.patch/Makefile.in
ifneq (@BUILD_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom
endif
@@ -252,7 +254,9 @@
@@ -262,7 +264,9 @@
visualizations: exports
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
$(MAKE) -C xbmc/visualizations/WaveForm

View File

@ -1,6 +1,6 @@
diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
--- xbmc-24229/configure.in 2009-11-03 12:10:59.770522186 +0100
+++ xbmc-24229.patch/configure.in 2009-11-03 12:11:20.955408376 +0100
diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--- xbmc-25850/configure.in 2009-12-19 18:49:03.642251529 +0100
+++ xbmc-25850.patch/configure.in 2009-12-19 18:50:12.144125523 +0100
@@ -45,6 +45,8 @@
vdpau_disabled="== VDPAU support manually disabled. =="
xbmcprojectm_enabled="== XBMCProjectM enabled. =="
@ -10,7 +10,7 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
# External library message strings
external_libraries_enabled="== Use of all supported external libraries enabled. =="
@@ -152,6 +154,12 @@
@@ -149,6 +151,12 @@
[use_xbmcprojectm=$enableval],
[use_xbmcprojectm=yes])
@ -23,7 +23,7 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
AC_PATH_PROG(CCACHE,ccache,none)
AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--enable-ccache],
@@ -518,6 +526,15 @@
@@ -521,6 +529,15 @@
BUILD_XBMCPROJECTM=1
fi
@ -39,7 +39,7 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
### External libraries checks
if test "$use_external_libraries" = "yes"; then
AC_MSG_NOTICE($external_libraries_enabled)
@@ -850,6 +867,12 @@
@@ -856,6 +873,12 @@
final_message="$final_message\n XBMCProjectM:\tNo"
fi
@ -52,7 +52,7 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
if test "$use_pcre" = "yes"; then
final_message="$final_message\n PCRE Support:\tYes"
else
@@ -1055,6 +1078,7 @@
@@ -1073,6 +1096,7 @@
AC_SUBST(BUILD_DVDCSS)
AC_SUBST(BUILD_GOOM)
AC_SUBST(BUILD_XBMCPROJECTM)
@ -60,19 +60,19 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1513,7 +1537,7 @@
@@ -1524,7 +1548,7 @@
--disable-lattice \
--disable-skyrocket
fi
-], [0])
+], [$BUILD_RSXS])
AC_OUTPUT
diff -Naur xbmc-24229/Makefile.in xbmc-24229.patch/Makefile.in
--- xbmc-24229/Makefile.in 2009-11-03 12:10:59.773521297 +0100
+++ xbmc-24229.patch/Makefile.in 2009-11-03 12:11:20.957521394 +0100
@@ -89,8 +89,10 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-25850/Makefile.in xbmc-25850.patch/Makefile.in
--- xbmc-25850/Makefile.in 2009-12-19 18:49:03.643251508 +0100
+++ xbmc-25850.patch/Makefile.in 2009-12-19 18:49:21.996125767 +0100
@@ -95,8 +95,10 @@
xbmc/lib/libid3tag \
xbmc/lib/libPython/linux
@ -85,7 +85,7 @@ diff -Naur xbmc-24229/Makefile.in xbmc-24229.patch/Makefile.in
VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \
@@ -263,7 +265,9 @@
@@ -273,7 +275,9 @@
endif
endif
screensavers: exports

View File

@ -0,0 +1,12 @@
diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in
--- xbmc-25850/configure.in 2009-12-19 19:08:26.227140824 +0100
+++ xbmc-25850.patch/configure.in 2009-12-19 19:08:01.262251286 +0100
@@ -1556,6 +1556,7 @@
--host=$host_alias \
--build=$build_alias
else
./configure \
+ `if test "$cross_compiling" = "yes"; then echo ac_cv_openssl_linker_option=no; fi` \
--host=$host_alias \
--build=$build_alias
diff -Naur xbmc-25850/xbmc/cores/dvdplayer/Codecs/libbdnav/config.log xbmc-25850.patch/xbmc/cores/dvdplayer/Codecs/libbdnav/config.log