From dca0c571e24318d7a09f3b786c1430b03b097f48 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 31 Dec 2009 18:10:38 +0100 Subject: [PATCH] xbmc: - update to xbmc-26230 - remove uClibc specific patches --- ..._add_host_and_build_to_configures-0.2.diff | 59 +++++++-------- .../011_xbmc-let_select_XBMCProjectM-0.1.diff | 28 +++---- .../patches/012_xbmc-let_select_RSXS-0.1.diff | 27 +++---- .../013_xbmc-correct_lzo_include-0.1.diff | 18 +++-- .../015_xbmc-crosscompile_libbdnav-0.1.diff | 12 +++ .../019_xbmc-crosscompile_libbdnav-0.1.diff | 12 --- .../020_xbmc-uclibc_has_no_fileno-0.2.diff | 19 ----- .../021_xbmc-check_yield_funcs-0.1.diff | 42 ----------- ...heck_pthread_get_cpuclockid_funcs-0.1.diff | 34 --------- ...-check_xstat64_and_lxstat64_funcs-0.1.diff | 74 ------------------- packages/mediacenter/xbmc/url | 2 +- 11 files changed, 81 insertions(+), 246 deletions(-) create mode 100644 packages/mediacenter/xbmc/patches/015_xbmc-crosscompile_libbdnav-0.1.diff delete mode 100644 packages/mediacenter/xbmc/patches/019_xbmc-crosscompile_libbdnav-0.1.diff delete mode 100644 packages/mediacenter/xbmc/patches/020_xbmc-uclibc_has_no_fileno-0.2.diff delete mode 100644 packages/mediacenter/xbmc/patches/021_xbmc-check_yield_funcs-0.1.diff delete mode 100644 packages/mediacenter/xbmc/patches/022_xbmc-check_pthread_get_cpuclockid_funcs-0.1.diff delete mode 100644 packages/mediacenter/xbmc/patches/023_xbmc-check_xstat64_and_lxstat64_funcs-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 6907486d71..577fae4458 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-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 18:43:37.636250496 +0100 -@@ -1093,6 +1093,8 @@ +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 @@ XB_CONFIG_MODULE([xbmc/lib/libPython/Python], [ if test "$host_vendor" = "apple" ; then ./configure \ @@ -10,7 +10,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --enable-ipv6 \ --enable-unicode=ucs4 \ --without-cxx \ -@@ -1115,6 +1117,8 @@ +@@ -1142,6 +1144,8 @@ cp pyconfig.h Include else ./configure \ @@ -19,7 +19,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --enable-ipv6 \ --enable-unicode=ucs4 \ --without-cxx \ -@@ -1132,6 +1136,8 @@ +@@ -1159,6 +1163,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-25850/configure.in xbmc-25850.patch/configure.in --with-pic \ --disable-asm-optimizations \ --disable-xmms-plugin \ -@@ -1146,7 +1152,9 @@ +@@ -1173,7 +1179,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-25850/configure.in xbmc-25850.patch/configure.in else true fi -@@ -1155,7 +1163,9 @@ +@@ -1182,7 +1190,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-25850/configure.in xbmc-25850.patch/configure.in else true fi -@@ -1168,6 +1178,7 @@ +@@ -1195,6 +1205,7 @@ --disable-amd3dnow \ --disable-static \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ @@ -58,7 +58,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --disable-muxers \ --disable-encoders \ --disable-devices \ -@@ -1194,6 +1205,7 @@ +@@ -1221,6 +1232,7 @@ --disable-static \ --disable-ipv6 \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ @@ -66,7 +66,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --disable-muxers \ --disable-encoders \ --disable-decoder=mpeg_xvmc \ -@@ -1206,6 +1218,7 @@ +@@ -1233,6 +1245,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-25850/configure.in xbmc-25850.patch/configure.in --enable-libfaad \ --enable-protocol=http \ --enable-pthreads \ -@@ -1219,12 +1232,16 @@ +@@ -1246,12 +1259,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-25850/configure.in xbmc-25850.patch/configure.in --disable-oss \ --disable-solaris-audio \ --disable-al-audio \ -@@ -1237,11 +1254,15 @@ +@@ -1264,11 +1281,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-25850/configure.in xbmc-25850.patch/configure.in --disable-doc \ --enable-static \ --with-pic -@@ -1252,6 +1273,8 @@ +@@ -1279,6 +1300,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-25850/configure.in xbmc-25850.patch/configure.in --enable-static \ --disable-shared \ --cc="$CC" && -@@ -1261,6 +1284,8 @@ +@@ -1288,6 +1311,8 @@ else ./configure2 \ --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \ @@ -125,7 +125,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --enable-static \ --disable-shared \ --cc="$CC" && -@@ -1276,6 +1301,8 @@ +@@ -1303,6 +1328,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-25850/configure.in xbmc-25850.patch/configure.in --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ --enable-static \ --disable-shared \ -@@ -1284,6 +1311,8 @@ +@@ -1311,6 +1338,8 @@ ./configure2 \ --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \ --extra-ldflags="-L`pwd`/../libdvdread/obj" \ @@ -143,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 +1324,8 @@ +@@ -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 \ @@ -152,7 +152,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --with-pic \ --with-mp4v2 else -@@ -1306,6 +1337,8 @@ +@@ -1333,6 +1364,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 +161,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1315,6 +1348,8 @@ +@@ -1342,6 +1375,8 @@ --disable-al-audio else ./configure \ @@ -170,7 +170,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1330,6 +1365,8 @@ +@@ -1357,6 +1392,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 +179,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1338,6 +1375,8 @@ +@@ -1365,6 +1402,8 @@ --without-x else ./configure \ @@ -188,7 +188,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1351,6 +1390,8 @@ +@@ -1378,6 +1417,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 +197,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --with-pic else true -@@ -1361,17 +1402,23 @@ +@@ -1388,17 +1429,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 +224,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in fi ], [$USE_EXTERNAL_LIBASS]) -@@ -1380,12 +1427,16 @@ +@@ -1407,12 +1454,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 +241,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --disable-static \ --disable-debugging \ --with-pic -@@ -1403,6 +1454,8 @@ +@@ -1430,6 +1481,8 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ if test "$host_vendor" != "apple" ; then ./configure \ @@ -250,7 +250,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --disable-shared \ --enable-static \ --with-pic -@@ -1417,6 +1470,8 @@ +@@ -1444,6 +1497,8 @@ CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \ LDFLAGS="-L/opt/local/lib" \ LIBS="-lz" \ @@ -259,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 +1487,8 @@ +@@ -1459,6 +1514,8 @@ ./configure \ CFLAGS="-fPIC" \ CXXFLAGS="-fPIC" \ @@ -268,7 +268,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in --without-xscreensaver \ --disable-sound \ --disable-cyclone \ -@@ -1447,9 +1504,13 @@ +@@ -1474,9 +1531,13 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ if test "$host_vendor" = "apple" ; then @@ -285,3 +285,4 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in fi ], [0]) +diff -Naur xbmc-26230/configure.in.orig xbmc-26230.patch/configure.in.orig diff --git a/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff b/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff index c653d7a423..4b18d2a564 100644 --- a/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff +++ b/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff @@ -1,16 +1,16 @@ -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. ==" +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 +@@ -45,6 +45,8 @@ vdpau_disabled="== VDPAU support manually disabled. ==" + crystalhd_not_found="== Could not find libldil. CrystalHD support disabled. ==" + crystalhd_disabled="== CrystalHD support manually disabled. ==" +xbmcprojectm_enabled="== XBMCProjectM enabled. ==" +xbmxprojectm_disabled="== XBMCProjectM disabled. ==" # External library message strings external_libraries_enabled="== Use of all supported external libraries enabled. ==" -@@ -141,6 +143,12 @@ +@@ -149,6 +151,12 @@ [use_goom=$enableval], [use_goom=no]) @@ -23,7 +23,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in AC_PATH_PROG(CCACHE,ccache,none) AC_ARG_ENABLE([ccache], [AS_HELP_STRING([--enable-ccache], -@@ -504,6 +512,15 @@ +@@ -512,6 +520,15 @@ fi fi @@ -39,7 +39,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in ### External libraries checks if test "$use_external_libraries" = "yes"; then AC_MSG_NOTICE($external_libraries_enabled) -@@ -833,6 +850,12 @@ +@@ -860,6 +877,12 @@ final_message="$final_message\n GOOM:\t\tNo" fi @@ -52,7 +52,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in if test "$use_pcre" = "yes"; then final_message="$final_message\n PCRE Support:\tYes" else -@@ -1049,6 +1072,7 @@ +@@ -1076,6 +1099,7 @@ AC_SUBST(SDL_DEFINES) AC_SUBST(BUILD_DVDCSS) AC_SUBST(BUILD_GOOM) @@ -60,7 +60,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in AC_SUBST(USE_EXTERNAL_LIBRARIES) AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_LIBA52) -@@ -1449,7 +1473,7 @@ +@@ -1476,7 +1500,7 @@ else rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF . fi @@ -69,9 +69,9 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ 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 +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 @@ VIS_DIRS=\ diff --git a/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff b/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff index 609e68d8f0..748592da48 100644 --- a/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff +++ b/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff @@ -1,8 +1,8 @@ -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. ==" +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 +@@ -47,6 +47,8 @@ + crystalhd_disabled="== CrystalHD support manually disabled. ==" xbmcprojectm_enabled="== XBMCProjectM enabled. ==" xbmxprojectm_disabled="== XBMCProjectM disabled. ==" +rsxs_enabled="== RSXS enabled. ==" @@ -10,7 +10,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in # External library message strings external_libraries_enabled="== Use of all supported external libraries enabled. ==" -@@ -149,6 +151,12 @@ +@@ -157,6 +159,12 @@ [use_xbmcprojectm=$enableval], [use_xbmcprojectm=yes]) @@ -23,7 +23,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in AC_PATH_PROG(CCACHE,ccache,none) AC_ARG_ENABLE([ccache], [AS_HELP_STRING([--enable-ccache], -@@ -521,6 +529,15 @@ +@@ -529,6 +537,15 @@ BUILD_XBMCPROJECTM=1 fi @@ -39,7 +39,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in ### External libraries checks if test "$use_external_libraries" = "yes"; then AC_MSG_NOTICE($external_libraries_enabled) -@@ -856,6 +873,12 @@ +@@ -883,6 +900,12 @@ final_message="$final_message\n XBMCProjectM:\tNo" fi @@ -52,7 +52,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in if test "$use_pcre" = "yes"; then final_message="$final_message\n PCRE Support:\tYes" else -@@ -1073,6 +1096,7 @@ +@@ -1100,6 +1123,7 @@ AC_SUBST(BUILD_DVDCSS) AC_SUBST(BUILD_GOOM) AC_SUBST(BUILD_XBMCPROJECTM) @@ -60,7 +60,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in AC_SUBST(USE_EXTERNAL_LIBRARIES) AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_LIBA52) -@@ -1524,7 +1548,7 @@ +@@ -1551,7 +1575,7 @@ --disable-lattice \ --disable-skyrocket fi @@ -69,9 +69,10 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in 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 +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 --git a/packages/mediacenter/xbmc/patches/013_xbmc-correct_lzo_include-0.1.diff b/packages/mediacenter/xbmc/patches/013_xbmc-correct_lzo_include-0.1.diff index 6932b4455a..1b4fdd4a8c 100644 --- a/packages/mediacenter/xbmc/patches/013_xbmc-correct_lzo_include-0.1.diff +++ b/packages/mediacenter/xbmc/patches/013_xbmc-correct_lzo_include-0.1.diff @@ -1,7 +1,7 @@ -diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in ---- xbmc-24229/configure.in 2009-11-03 12:13:55.310396669 +0100 -+++ xbmc-24229.patch/configure.in 2009-11-03 12:12:59.285522391 +0100 -@@ -886,12 +886,6 @@ +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 @@ final_message="$final_message\n MID Support:\tNo" fi @@ -14,10 +14,11 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.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-24229/tools/TexturePacker/XBMCTex.cpp xbmc-24229.patch/tools/TexturePacker/XBMCTex.cpp ---- xbmc-24229/tools/TexturePacker/XBMCTex.cpp 2009-11-03 10:52:18.058564764 +0100 -+++ xbmc-24229.patch/tools/TexturePacker/XBMCTex.cpp 2009-11-03 12:12:59.287521636 +0100 -@@ -36,7 +36,7 @@ +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 +@@ -37,7 +37,7 @@ #endif #ifdef _LINUX @@ -26,3 +27,4 @@ diff -Naur xbmc-24229/tools/TexturePacker/XBMCTex.cpp xbmc-24229.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 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 new file mode 100644 index 0000000000..fc0ec02fbb --- /dev/null +++ b/packages/mediacenter/xbmc/patches/015_xbmc-crosscompile_libbdnav-0.1.diff @@ -0,0 +1,12 @@ +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/patches/019_xbmc-crosscompile_libbdnav-0.1.diff b/packages/mediacenter/xbmc/patches/019_xbmc-crosscompile_libbdnav-0.1.diff deleted file mode 100644 index 661a19ea62..0000000000 --- a/packages/mediacenter/xbmc/patches/019_xbmc-crosscompile_libbdnav-0.1.diff +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/packages/mediacenter/xbmc/patches/020_xbmc-uclibc_has_no_fileno-0.2.diff b/packages/mediacenter/xbmc/patches/020_xbmc-uclibc_has_no_fileno-0.2.diff deleted file mode 100644 index ebb8e6efe6..0000000000 --- a/packages/mediacenter/xbmc/patches/020_xbmc-uclibc_has_no_fileno-0.2.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur xbmc-24229/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h xbmc-24229.patch/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h ---- xbmc-24229/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h 2009-11-03 10:51:21.827519184 +0100 -+++ xbmc-24229.patch/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h 2009-11-03 12:31:01.038437018 +0100 -@@ -29,10 +29,14 @@ - - class CMutex; - --#if defined(_LINUX) && !defined(__APPLE__) -+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__UCLIBC__) - #define _file _fileno - #endif - -+#if defined(__UCLIBC__) -+#define _file __filedes -+#endif -+ - #define MAX_EMULATED_FILES 50 - #define FILE_WRAPPER_OFFSET 0x00000100 - diff --git a/packages/mediacenter/xbmc/patches/021_xbmc-check_yield_funcs-0.1.diff b/packages/mediacenter/xbmc/patches/021_xbmc-check_yield_funcs-0.1.diff deleted file mode 100644 index 7a6ff8916c..0000000000 --- a/packages/mediacenter/xbmc/patches/021_xbmc-check_yield_funcs-0.1.diff +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur xbmc-24572/configure.in xbmc-24572.patch/configure.in ---- xbmc-24572/configure.in 2009-11-13 20:37:01.756638545 +0100 -+++ xbmc-24572.patch/configure.in 2009-11-13 20:41:14.259621759 +0100 -@@ -352,6 +352,12 @@ - AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) -+AC_CHECK_LIB([pthread], [pthread_yield], -+ AC_DEFINE([HAVE_PTHREAD_YIELD], [1], -+ [Define to 1 if you have the 'pthread_yield' function])) -+AC_CHECK_LIB([pthread], [sched_yield], -+ AC_DEFINE([HAVE_SCHED_YIELD], [1], -+ [Define to 1 if you have the 'sched_yield' function])) - PKG_CHECK_MODULES([MAD], [mad], - [INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"], - AC_MSG_ERROR($missing_library)) -diff -Naur xbmc-24572/xbmc/FileSystem/FileCurl.cpp xbmc-24572.patch/xbmc/FileSystem/FileCurl.cpp ---- xbmc-24572/xbmc/FileSystem/FileCurl.cpp 2009-11-13 18:19:50.000000000 +0100 -+++ xbmc-24572.patch/xbmc/FileSystem/FileCurl.cpp 2009-11-13 20:38:20.330748551 +0100 -@@ -19,6 +19,8 @@ - * - */ - -+#include "config.h" -+ - #include "FileCurl.h" - #include "Util.h" - #include "URL.h" -@@ -1179,10 +1181,10 @@ - // happens especially on ftp during initial connection - #ifndef _LINUX - SwitchToThread(); --#elif __APPLE__ -- sched_yield(); --#else -+#elif HAVE_PTHREAD_YIELD - pthread_yield(); -+#elif HAVE_SCHED_YIELD -+ sched_yield(); - #endif - - FD_ZERO(&fdread); diff --git a/packages/mediacenter/xbmc/patches/022_xbmc-check_pthread_get_cpuclockid_funcs-0.1.diff b/packages/mediacenter/xbmc/patches/022_xbmc-check_pthread_get_cpuclockid_funcs-0.1.diff deleted file mode 100644 index cdd1b08917..0000000000 --- a/packages/mediacenter/xbmc/patches/022_xbmc-check_pthread_get_cpuclockid_funcs-0.1.diff +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in ---- xbmc-24229/configure.in 2009-11-03 12:39:23.963428747 +0100 -+++ xbmc-24229.patch/configure.in 2009-11-03 12:39:40.036396583 +0100 -@@ -336,6 +336,9 @@ - AC_CHECK_LIB([SDL_gfx], [main]) - fi - -+AC_CHECK_LIB([pthread],[pthread_getcpuclockid], -+ AC_DEFINE([HAVE_PTHREAD_GETCPUCLOCKID], [1], -+ [Define to 1 if you have the 'pthread_getcpuclockid' function])) - - # platform independent libraries - AC_CHECK_HEADER([mad.h],, AC_MSG_ERROR($missing_library)) -diff -Naur xbmc-24229/xbmc/linux/XThreadUtils.cpp xbmc-24229.patch/xbmc/linux/XThreadUtils.cpp ---- xbmc-24229/xbmc/linux/XThreadUtils.cpp 2009-11-03 10:50:11.248527059 +0100 -+++ xbmc-24229.patch/xbmc/linux/XThreadUtils.cpp 2009-11-03 12:39:40.038397087 +0100 -@@ -19,6 +19,8 @@ - * - */ - -+#include "config.h" -+ - #include "PlatformDefs.h" - #include "XHandle.h" - #include "XThreadUtils.h" -@@ -189,7 +191,7 @@ - if (lpKernelTime) - lpKernelTime->dwLowDateTime = lpKernelTime->dwHighDateTime = 0; - } --#elif _POSIX_THREAD_CPUTIME != -1 -+#elif HAVE_PTHREAD_GETCPUCLOCKID && _POSIX_THREAD_CPUTIME != -1 - if(lpUserTime) - { - lpUserTime->dwLowDateTime = 0; diff --git a/packages/mediacenter/xbmc/patches/023_xbmc-check_xstat64_and_lxstat64_funcs-0.1.diff b/packages/mediacenter/xbmc/patches/023_xbmc-check_xstat64_and_lxstat64_funcs-0.1.diff deleted file mode 100644 index c588c4f2ff..0000000000 --- a/packages/mediacenter/xbmc/patches/023_xbmc-check_xstat64_and_lxstat64_funcs-0.1.diff +++ /dev/null @@ -1,74 +0,0 @@ -diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in ---- xbmc-24229/configure.in 2009-11-03 12:40:25.588436224 +0100 -+++ xbmc-24229.patch/configure.in 2009-11-03 12:43:02.056519683 +0100 -@@ -359,6 +359,12 @@ - AC_CHECK_LIB([pthread], [sched_yield], - AC_DEFINE([HAVE_SCHED_YIELD], [1], - [Define to 1 if you have the 'sched_yield' function])) -+AC_CHECK_LIB([c], [__xstat64], -+ AC_DEFINE([HAVE_XSTAT64], [1], -+ [Define to 1 if you have the '__xstat64' function])) -+AC_CHECK_LIB([c], [__lxstat64], -+ AC_DEFINE([HAVE_LXSTAT64], [1], -+ [Define to 1 if you have the '__lxstat64' function])) - PKG_CHECK_MODULES([MAD], [mad], - [INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"], - AC_MSG_ERROR($missing_library)) -diff -Naur xbmc-24229/xbmc/cores/DllLoader/exports/exports_python_linux.cpp xbmc-24229.patch/xbmc/cores/DllLoader/exports/exports_python_linux.cpp ---- xbmc-24229/xbmc/cores/DllLoader/exports/exports_python_linux.cpp 2009-11-03 10:51:21.801520187 +0100 -+++ xbmc-24229.patch/xbmc/cores/DllLoader/exports/exports_python_linux.cpp 2009-11-03 12:40:50.204524744 +0100 -@@ -19,6 +19,8 @@ - * - */ - -+#include "config.h" -+ - #include "system.h" - #include - #include -@@ -224,32 +226,32 @@ - return opendir(strName.c_str()); - } - --#ifdef __APPLE__ -+#ifdef HAVE_XSTAT64 && HAVE_LXSTAT64 - --int xbp_stat(const char * path, struct stat * buf) -+int xbp__xstat64(int ver, const char *filename, struct stat64 *stat_buf) - { -- CStdString strName = _P(path); -- return stat(strName.c_str(), buf); -+ CStdString strName = _P(filename); -+ return __xstat64(ver, strName.c_str(), stat_buf); - } - --int xbp_lstat(const char * path, struct stat * buf) -+int xbp__lxstat64(int ver, const char *filename, struct stat64 *stat_buf) - { -- CStdString strName = _P(path); -- return lstat(strName.c_str(), buf); -+ CStdString strName = _P(filename); -+ return __lxstat64(ver, strName.c_str(), stat_buf); - } - - #else - --int xbp__xstat64(int ver, const char *filename, struct stat64 *stat_buf) -+int xbp_stat(const char * path, struct stat * buf) - { -- CStdString strName = _P(filename); -- return __xstat64(ver, strName.c_str(), stat_buf); -+ CStdString strName = _P(path); -+ return stat(strName.c_str(), buf); - } - --int xbp__lxstat64(int ver, const char *filename, struct stat64 *stat_buf) -+int xbp_lstat(const char * path, struct stat * buf) - { -- CStdString strName = _P(filename); -- return __lxstat64(ver, strName.c_str(), stat_buf); -+ CStdString strName = _P(path); -+ return lstat(strName.c_str(), buf); - } - - #endif diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index 86f71aaf9d..3631fb8907 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-26057.tar.bz2 +http://sources.openelec.tv/svn/xbmc-26230.tar.bz2