diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 23ae3a09d8..876d123d29 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -116,7 +116,6 @@ cd - --disable-external-liba52 \ --disable-external-libdts \ --disable-external-libass \ - --enable-external-libogg \ --enable-external-python \ make externals 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 65a491a205..fe6493c2ec 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-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 @@ +diff -Naur xbmc-27191/configure.in xbmc-27191.patch/configure.in +--- xbmc-27191/configure.in 2010-01-26 10:56:15.897804152 +0100 ++++ xbmc-27191.patch/configure.in 2010-01-26 11:32:58.096953871 +0100 +@@ -1073,6 +1073,8 @@ XB_CONFIG_MODULE([xbmc/lib/libPython/Python], [ if test "$host_vendor" = "apple" ; then ./configure \ @@ -10,7 +10,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --enable-ipv6 \ --enable-unicode=ucs4 \ --without-cxx \ -@@ -1120,6 +1122,8 @@ +@@ -1095,6 +1097,8 @@ cp pyconfig.h Include else ./configure \ @@ -19,7 +19,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --enable-ipv6 \ --enable-unicode=ucs4 \ --without-cxx \ -@@ -1137,6 +1141,8 @@ +@@ -1112,6 +1116,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,29 +28,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --with-pic \ --disable-asm-optimizations \ --disable-xmms-plugin \ -@@ -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" \ -- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic -+ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic \ -+ --host=$host_alias \ -+ --build=$build_alias - else - true - fi -@@ -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" \ -- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic -+ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic \ -+ --host=$host_alias \ -+ --build=$build_alias - else - true - fi -@@ -1173,6 +1183,7 @@ +@@ -1130,6 +1136,7 @@ --disable-amd3dnow \ --disable-static \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ @@ -58,7 +36,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --disable-muxers \ --disable-encoders \ --disable-devices \ -@@ -1199,6 +1210,7 @@ +@@ -1156,6 +1163,7 @@ --disable-static \ --disable-ipv6 \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ @@ -66,7 +44,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --disable-muxers \ --disable-encoders \ --disable-decoder=mpeg_xvmc \ -@@ -1211,6 +1223,7 @@ +@@ -1168,6 +1176,7 @@ --enable-postproc \ --enable-gpl \ `if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \ @@ -74,7 +52,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --enable-libfaad \ --enable-protocol=http \ --enable-pthreads \ -@@ -1224,12 +1237,16 @@ +@@ -1181,12 +1190,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 +69,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --disable-oss \ --disable-solaris-audio \ --disable-al-audio \ -@@ -1242,11 +1259,15 @@ +@@ -1199,11 +1212,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 +85,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --disable-doc \ --enable-static \ --with-pic -@@ -1257,6 +1278,8 @@ +@@ -1214,6 +1231,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 +94,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --enable-static \ --disable-shared \ --cc="$CC" && -@@ -1266,6 +1289,8 @@ +@@ -1223,6 +1242,8 @@ else ./configure2 \ --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \ @@ -125,7 +103,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --enable-static \ --disable-shared \ --cc="$CC" && -@@ -1281,6 +1306,8 @@ +@@ -1238,6 +1259,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 +112,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ --enable-static \ --disable-shared \ -@@ -1289,6 +1316,8 @@ +@@ -1246,6 +1269,8 @@ ./configure2 \ --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \ --extra-ldflags="-L`pwd`/../libdvdread/obj" \ @@ -143,7 +121,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ --enable-static \ --disable-shared \ -@@ -1300,6 +1329,8 @@ +@@ -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 \ @@ -152,7 +130,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --with-pic else true -@@ -1310,6 +1341,8 @@ +@@ -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 \ @@ -161,7 +139,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1319,6 +1352,8 @@ +@@ -1276,6 +1305,8 @@ --disable-al-audio else ./configure \ @@ -170,7 +148,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1334,6 +1369,8 @@ +@@ -1291,6 +1322,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 \ @@ -179,7 +157,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --with-pic else true -@@ -1344,17 +1381,23 @@ +@@ -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" \ @@ -206,7 +184,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in fi ], [$USE_EXTERNAL_LIBASS]) -@@ -1363,12 +1406,16 @@ +@@ -1320,12 +1359,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 \ @@ -223,7 +201,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --disable-static \ --disable-debugging \ --with-pic -@@ -1386,6 +1433,8 @@ +@@ -1343,6 +1386,8 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ if test "$host_vendor" != "apple" ; then ./configure \ @@ -232,7 +210,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --disable-shared \ --enable-static \ --with-pic -@@ -1400,6 +1449,8 @@ +@@ -1357,6 +1402,8 @@ CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \ LDFLAGS="-L/opt/local/lib" \ LIBS="-lz" \ @@ -241,7 +219,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \ --without-xscreensaver \ --disable-sound \ -@@ -1415,6 +1466,8 @@ +@@ -1372,6 +1419,8 @@ ./configure \ CFLAGS="-fPIC" \ CXXFLAGS="-fPIC" \ @@ -250,7 +228,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in --without-xscreensaver \ --disable-sound \ --disable-cyclone \ -@@ -1430,18 +1483,26 @@ +@@ -1387,18 +1436,26 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ if test "$host_vendor" = "apple" ; then @@ -282,7 +260,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in fi ], [0]) -@@ -1449,9 +1510,13 @@ +@@ -1406,9 +1463,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" \ diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index a3a9cdc144..1cbfff8eff 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-27157.tar.bz2 +http://sources.openelec.tv/svn/xbmc-27192.tar.bz2