From d7681734d8e29f334463b2e66dccc4173cc00ea1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 14 Jan 2010 08:43:14 +0100 Subject: [PATCH] xbmc: - update to xbmc-26784 --- ..._add_host_and_build_to_configures-0.2.diff | 74 +++++++++---------- .../015_xbmc-crosscompile_libbdnav-0.1.diff | 12 --- packages/mediacenter/xbmc/url | 2 +- 3 files changed, 34 insertions(+), 54 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/015_xbmc-crosscompile_libbdnav-0.1.diff diff --git a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff index 577fae4458..9ba36a2d7c 100644 --- a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff +++ b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff @@ -1,7 +1,7 @@ -diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in ---- xbmc-26230/configure.in 2009-12-31 14:25:23.451197507 +0100 -+++ xbmc-26230.patch/configure.in 2009-12-31 16:16:48.359195211 +0100 -@@ -1120,6 +1120,8 @@ +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 @@ XB_CONFIG_MODULE([xbmc/lib/libPython/Python], [ if test "$host_vendor" = "apple" ; then ./configure \ @@ -10,7 +10,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --enable-ipv6 \ --enable-unicode=ucs4 \ --without-cxx \ -@@ -1142,6 +1144,8 @@ +@@ -1147,6 +1149,8 @@ cp pyconfig.h Include else ./configure \ @@ -19,7 +19,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --enable-ipv6 \ --enable-unicode=ucs4 \ --without-cxx \ -@@ -1159,6 +1163,8 @@ +@@ -1164,6 +1168,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-26230/configure.in xbmc-26230.patch/configure.in --with-pic \ --disable-asm-optimizations \ --disable-xmms-plugin \ -@@ -1173,7 +1179,9 @@ +@@ -1178,7 +1184,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-26230/configure.in xbmc-26230.patch/configure.in else true fi -@@ -1182,7 +1190,9 @@ +@@ -1187,7 +1195,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-26230/configure.in xbmc-26230.patch/configure.in else true fi -@@ -1195,6 +1205,7 @@ +@@ -1200,6 +1210,7 @@ --disable-amd3dnow \ --disable-static \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ @@ -58,7 +58,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --disable-muxers \ --disable-encoders \ --disable-devices \ -@@ -1221,6 +1232,7 @@ +@@ -1226,6 +1237,7 @@ --disable-static \ --disable-ipv6 \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ @@ -66,7 +66,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --disable-muxers \ --disable-encoders \ --disable-decoder=mpeg_xvmc \ -@@ -1233,6 +1245,7 @@ +@@ -1238,6 +1250,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-26230/configure.in xbmc-26230.patch/configure.in --enable-libfaad \ --enable-protocol=http \ --enable-pthreads \ -@@ -1246,12 +1259,16 @@ +@@ -1251,12 +1264,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-26230/configure.in xbmc-26230.patch/configure.in --disable-oss \ --disable-solaris-audio \ --disable-al-audio \ -@@ -1264,11 +1281,15 @@ +@@ -1269,11 +1286,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-26230/configure.in xbmc-26230.patch/configure.in --disable-doc \ --enable-static \ --with-pic -@@ -1279,6 +1300,8 @@ +@@ -1284,6 +1305,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-26230/configure.in xbmc-26230.patch/configure.in --enable-static \ --disable-shared \ --cc="$CC" && -@@ -1288,6 +1311,8 @@ +@@ -1293,6 +1316,8 @@ else ./configure2 \ --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \ @@ -125,7 +125,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --enable-static \ --disable-shared \ --cc="$CC" && -@@ -1303,6 +1328,8 @@ +@@ -1308,6 +1333,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-26230/configure.in xbmc-26230.patch/configure.in --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ --enable-static \ --disable-shared \ -@@ -1311,6 +1338,8 @@ +@@ -1316,6 +1343,8 @@ ./configure2 \ --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \ --extra-ldflags="-L`pwd`/../libdvdread/obj" \ @@ -143,16 +143,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ --enable-static \ --disable-shared \ -@@ -1322,6 +1351,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 \ - --with-mp4v2 - else -@@ -1333,6 +1364,8 @@ +@@ -1337,6 +1366,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 \ @@ -161,7 +152,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1342,6 +1375,8 @@ +@@ -1346,6 +1377,8 @@ --disable-al-audio else ./configure \ @@ -170,7 +161,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1357,6 +1392,8 @@ +@@ -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 \ @@ -179,7 +170,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1365,6 +1402,8 @@ +@@ -1369,6 +1404,8 @@ --without-x else ./configure \ @@ -188,7 +179,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1378,6 +1417,8 @@ +@@ -1382,6 +1419,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 \ @@ -197,7 +188,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --with-pic else true -@@ -1388,17 +1429,23 @@ +@@ -1392,17 +1431,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" \ @@ -224,7 +215,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in fi ], [$USE_EXTERNAL_LIBASS]) -@@ -1407,12 +1454,16 @@ +@@ -1411,12 +1456,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 \ @@ -241,7 +232,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --disable-static \ --disable-debugging \ --with-pic -@@ -1430,6 +1481,8 @@ +@@ -1434,6 +1483,8 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ if test "$host_vendor" != "apple" ; then ./configure \ @@ -250,7 +241,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --disable-shared \ --enable-static \ --with-pic -@@ -1444,6 +1497,8 @@ +@@ -1448,6 +1499,8 @@ CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \ LDFLAGS="-L/opt/local/lib" \ LIBS="-lz" \ @@ -259,7 +250,7 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \ --without-xscreensaver \ --disable-sound \ -@@ -1459,6 +1514,8 @@ +@@ -1463,6 +1516,8 @@ ./configure \ CFLAGS="-fPIC" \ CXXFLAGS="-fPIC" \ @@ -268,21 +259,22 @@ diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in --without-xscreensaver \ --disable-sound \ --disable-cyclone \ -@@ -1474,9 +1531,13 @@ +@@ -1478,9 +1533,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 \ +- ./configure --without-openssl ++ ./configure --with-ssl-dir=/opt/local/include \ + --host=$host_alias \ + --build=$build_alias + else -+ ./configure \ ++ ./configure --without-openssl \ + --host=$host_alias \ + --build=$build_alias fi ], [0]) -diff -Naur xbmc-26230/configure.in.orig xbmc-26230.patch/configure.in.orig +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 diff --git a/packages/mediacenter/xbmc/patches/015_xbmc-crosscompile_libbdnav-0.1.diff b/packages/mediacenter/xbmc/patches/015_xbmc-crosscompile_libbdnav-0.1.diff deleted file mode 100644 index fc0ec02fbb..0000000000 --- a/packages/mediacenter/xbmc/patches/015_xbmc-crosscompile_libbdnav-0.1.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xbmc-26230/configure.in xbmc-26230.patch/configure.in ---- xbmc-26230/configure.in 2009-12-31 16:31:24.629197420 +0100 -+++ xbmc-26230.patch/configure.in 2009-12-31 16:33:49.712198006 +0100 -@@ -1578,6 +1578,7 @@ - --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 - fi -diff -Naur xbmc-26230/configure.in.orig xbmc-26230.patch/configure.in.orig diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index 9f0af4b6f4..19d3b72755 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-26650.tar.bz2 +http://sources.openelec.tv/svn/xbmc-26784.tar.bz2