From af707c2789d94f015dc6021a3625d37cfe58ffc8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 25 Jan 2010 23:08:25 +0100 Subject: [PATCH] xbmc-pvr: - update to xbmc-pvr-27135 --- packages/mediacenter/xbmc-pvr/build | 4 +- packages/mediacenter/xbmc-pvr/install | 3 +- .../patches/000-changeset_r27124.diff | 24 +++ .../patches/000-changeset_r27125.diff | 195 ++++++++++++++++++ .../patches/000-changeset_r27130.diff | 40 ++++ .../patches/000-changeset_r27134.diff | 57 +++++ ..._add_host_and_build_to_configures-0.2.diff | 113 +++++----- .../011_xbmc-let_select_XBMCProjectM-0.1.diff | 30 +-- .../013_xbmc-correct_lzo_include-0.1.diff | 16 +- ...14_xbmc-dont_hardcode_usr_include-0.1.diff | 36 ++-- .../patches/016_xmbc-let_select_HAL-0.1.diff | 24 +-- .../patches/074-xbmc-full_splash-0.1.diff | 8 +- .../091-xbmc-enable_yasm_in_ffmpeg-0.1.diff | 12 +- packages/mediacenter/xbmc-pvr/url | 2 +- 14 files changed, 449 insertions(+), 115 deletions(-) create mode 100644 packages/mediacenter/xbmc-pvr/patches/000-changeset_r27124.diff create mode 100644 packages/mediacenter/xbmc-pvr/patches/000-changeset_r27125.diff create mode 100644 packages/mediacenter/xbmc-pvr/patches/000-changeset_r27130.diff create mode 100644 packages/mediacenter/xbmc-pvr/patches/000-changeset_r27134.diff diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build index cd41929bbe..23ae3a09d8 100755 --- a/packages/mediacenter/xbmc-pvr/build +++ b/packages/mediacenter/xbmc-pvr/build @@ -45,7 +45,8 @@ $SCRIPTS/build libmms $SCRIPTS/build faac $SCRIPTS/build faad2 $SCRIPTS/build flac -# $SCRIPTS/build libmpeg2 +$SCRIPTS/build wavpack +$SCRIPTS/build libmpeg2 # $SCRIPTS/build musepack $SCRIPTS/build SDL #? @@ -114,7 +115,6 @@ cd - $XBMC_FFMPEG \ --disable-external-liba52 \ --disable-external-libdts \ - --disable-external-libmpeg2 \ --disable-external-libass \ --enable-external-libogg \ --enable-external-python \ diff --git a/packages/mediacenter/xbmc-pvr/install b/packages/mediacenter/xbmc-pvr/install index dd70ce586c..d5ace9f3b6 100755 --- a/packages/mediacenter/xbmc-pvr/install +++ b/packages/mediacenter/xbmc-pvr/install @@ -47,7 +47,8 @@ $SCRIPTS/install libmms $SCRIPTS/install faac $SCRIPTS/install faad2 $SCRIPTS/install flac -# $SCRIPTS/install libmpeg2 +$SCRIPTS/install wavpack +$SCRIPTS/install libmpeg2 # $SCRIPTS/install musepack [ "$FFMPEG" = external ] && $SCRIPTS/install ffmpeg diff --git a/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27124.diff b/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27124.diff new file mode 100644 index 0000000000..2a5dbe70bf --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27124.diff @@ -0,0 +1,24 @@ +diff -Naur xbmc-pvr-27135/xbmc/lib/libPython/xbmcmodule/player.cpp xbmc-pvr-27135.patch/xbmc/lib/libPython/xbmcmodule/player.cpp +--- xbmc-pvr-27135/xbmc/lib/libPython/xbmcmodule/player.cpp 2010-01-24 11:53:57.108631848 +0100 ++++ xbmc-pvr-27135.patch/xbmc/lib/libPython/xbmcmodule/player.cpp 2010-01-24 17:57:58.453446334 +0100 +@@ -470,12 +470,15 @@ + char *cLine = NULL; + if (!PyArg_ParseTuple(args, (char*)"s", &cLine)) return NULL; + +- int nStream = g_application.m_pPlayer->GetSubtitleCount(); ++ if (g_application.m_pPlayer) ++ { ++ int nStream = g_application.m_pPlayer->GetSubtitleCount(); + +- g_settings.m_currentVideoSettings.m_SubtitleOn = true; +- g_application.m_pPlayer->SetSubtitleVisible(true); +- g_application.m_pPlayer->AddSubtitle(cLine); +- g_application.m_pPlayer->SetSubtitle(nStream); ++ g_settings.m_currentVideoSettings.m_SubtitleOn = true; ++ g_application.m_pPlayer->SetSubtitleVisible(true); ++ g_application.m_pPlayer->AddSubtitle(cLine); ++ g_application.m_pPlayer->SetSubtitle(nStream); ++ } + + Py_INCREF(Py_None); + return Py_None; diff --git a/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27125.diff b/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27125.diff new file mode 100644 index 0000000000..f2e2e14e51 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27125.diff @@ -0,0 +1,195 @@ +diff -Naur xbmc-pvr-27135/configure.in xbmc-pvr-27135.patch/configure.in +--- xbmc-pvr-27135/configure.in 2010-01-24 11:53:00.868755115 +0100 ++++ xbmc-pvr-27135.patch/configure.in 2010-01-24 17:59:15.923594722 +0100 +@@ -55,8 +55,6 @@ + external_liba52_disabled="== Use of external liba52 disabled. ==" + external_libdts_enabled="== Use of external libdts enabled. ==" + external_libdts_disabled="== Use of external libdts disabled. ==" +-external_libmpeg2_enabled="== Use of external libmpeg2 enabled. ==" +-external_libmpeg2_disabled="== Use of external libmpeg2 disabled. ==" + external_libass_enabled="== Use of external libass enabled. ==" + external_libass_disabled="== Use of external libass disabled. ==" + external_libogg_enabled="== Use of external libogg enabled. ==" +@@ -218,12 +216,6 @@ + [use_external_libdts=$enableval], + [use_external_libdts=no]) + +-AC_ARG_ENABLE([external-libmpeg2], +- [AS_HELP_STRING([--enable-external-libmpeg2], +- [enable use of external libmpeg2 library (default is no) 'Linux only'])], +- [use_external_libmpeg2=$enableval], +- [use_external_libmpeg2=no]) +- + AC_ARG_ENABLE([external-libass], + [AS_HELP_STRING([--enable-external-libass], + [enable use of external libass library (default is no) 'Linux only'])], +@@ -328,6 +320,8 @@ + AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([wavpack], [main],, AC_MSG_ERROR($missing_library)) ++AC_CHECK_LIB([mpeg2], [main],, AC_MSG_ERROR($missing_library)) ++AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library)) + PKG_CHECK_MODULES([MAD], [mad], + [INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"], + AC_MSG_ERROR($missing_library)) +@@ -592,19 +586,6 @@ + USE_EXTERNAL_LIBDTS=0 + fi + +-# External libmpeg2 +-if test "$use_external_libraries" = "yes" || test "$use_external_libmpeg2" = "yes"; then +- AC_CHECK_LIB([mpeg2], [main],, AC_MSG_ERROR($missing_library)) +- AC_CHECK_LIB([mpeg2convert], [main],, AC_MSG_ERROR($missing_library)) +- +- AC_MSG_NOTICE($external_libmpeg2_enabled) +- USE_EXTERNAL_LIBMPEG2=1 +- AC_DEFINE([USE_EXTERNAL_LIBMPEG2], [1], [Whether to use external libmpeg2 library.]) +-else +- AC_MSG_NOTICE($external_libmpeg2_disabled) +- USE_EXTERNAL_LIBMPEG2=0 +-fi +- + # External libass + if test "$use_external_libraries" = "yes" || test "$use_external_libass" = "yes"; then + # We need libass >= 0.9.7. +@@ -984,11 +965,6 @@ + else + final_message="$final_message\n External libdts:\tNo" + fi +- if test "$use_external_libmpeg2" = "yes"; then +- final_message="$final_message\n External libmpeg2:\tYes" +- else +- final_message="$final_message\n External libmpeg2:\tNo" +- fi + if test "$use_external_libass" = "yes"; then + final_message="$final_message\n External libass:\tYes" + else +@@ -1354,27 +1330,6 @@ + fi + ], [$USE_EXTERNAL_LIBA52]) + +-XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libmpeg2], [ +- 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 \ +- --disable-static \ +- --enable-shared \ +- --disable-directx \ +- --disable-sdl \ +- --without-x +- else +- ./configure \ +- --with-pic \ +- --disable-static \ +- --enable-shared \ +- --disable-directx \ +- --disable-sdl \ +- --without-x +- fi +-], [$USE_EXTERNAL_LIBMPEG2]) +- + XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libmad], [ + if test "$host_vendor" = "apple" ; then + CFLAGS="-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \ +diff -Naur xbmc-pvr-27135/README.ubuntu xbmc-pvr-27135.patch/README.ubuntu +--- xbmc-pvr-27135/README.ubuntu 2010-01-24 11:53:28.003696562 +0100 ++++ xbmc-pvr-27135.patch/README.ubuntu 2010-01-24 17:59:15.923594722 +0100 +@@ -41,7 +41,7 @@ + + For Ubuntu (all versions >= 7.04): + +- # sudo aptitude install subversion make g++ gcc gawk pmount libtool nasm automake cmake gperf unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-openssl-dev x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbis-dev libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libfaac-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmms-dev libmpeg3-dev libfaad-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev ++ # sudo aptitude install subversion make g++ gcc gawk pmount libtool nasm automake cmake gperf unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-openssl-dev x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbis-dev libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libfaac-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmms-dev libmpeg3-dev libfaad-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev + + On 8.04 and older versions, libmms is outdated and thus XBMC will not compile properly. + In this case you will have to manually compile the latest version. +diff -Naur xbmc-pvr-27135/xbmc/cores/dvdplayer/Codecs/Makefile.in xbmc-pvr-27135.patch/xbmc/cores/dvdplayer/Codecs/Makefile.in +--- xbmc-pvr-27135/xbmc/cores/dvdplayer/Codecs/Makefile.in 2010-01-24 11:54:24.100638872 +0100 ++++ xbmc-pvr-27135.patch/xbmc/cores/dvdplayer/Codecs/Makefile.in 2010-01-24 17:59:15.921599160 +0100 +@@ -16,9 +16,6 @@ + ifneq (@USE_EXTERNAL_LIBDTS@,1) + DIRS+=libdts + endif +-ifneq (@USE_EXTERNAL_LIBMPEG2@,1) +- DIRS+=libmpeg2 +-endif + + LIBS= + ifneq (@USE_EXTERNAL_FFMPEG@,1) +@@ -35,9 +32,6 @@ + ifneq (@USE_EXTERNAL_LIBDTS@,1) + LIBS+=libdts-$(ARCH).so + endif +-ifneq (@USE_EXTERNAL_LIBMPEG2@,1) +- LIBS+=libmpeg2-$(ARCH).so +-endif + + ifeq ($(findstring osx,$(ARCH)),osx) + DIRS+=libmad +@@ -131,11 +125,6 @@ + liba52/libao/libao.a $(BUNDLE1_O) + #$(WRAPPER_OSX) $@;mv output.so $@ + +-$(SYSDIR)/libmpeg2-$(ARCH).so: $(WRAPPER_OSX) libmpeg2/libmpeg2/libmpeg2.la +- ld -bundle -flat_namespace -undefined suppress -o $@ \ +- libmpeg2/libmpeg2/.libs/*.o $(BUNDLE1_O) +- $(WRAPPER_OSX) $@;mv output.so $@ +- + libdts/libdts/libdts.a : libdts; + libdts: + $(MAKE) -C $@ +@@ -153,10 +142,6 @@ + liba52: + $(MAKE) -C $@ + +-libmpeg2/libmpeg2/libmpeg2.la: libmpeg2 +-libmpeg2: +- $(MAKE) -C $@ +- + else + + $(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so +@@ -203,10 +188,6 @@ + $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \ + -Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER) + +-$(SYSDIR)/libmpeg2-$(ARCH).so: $(WRAPPER) libmpeg2/libmpeg2/libmpeg2.la +- $(CC) -o $@ $(LDFLAGS) --soname,$@ libmpeg2/libmpeg2/.libs/*.o \ +- -Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER) +- + libdts/libdts/libdts.a : libdts; + libdts: + $(MAKE) -C $@ +@@ -216,10 +197,6 @@ + liba52: + $(MAKE) -C $@ + +-libmpeg2/libmpeg2/libmpeg2.la: libmpeg2 +-libmpeg2: +- $(MAKE) -C $@ +- + endif + + clean: +diff -Naur xbmc-pvr-27135/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h xbmc-pvr-27135.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h +--- xbmc-pvr-27135/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h 2010-01-24 11:54:33.299754754 +0100 ++++ xbmc-pvr-27135.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h 2010-01-24 17:59:15.921599160 +0100 +@@ -25,7 +25,7 @@ + #include "config.h" + #endif + extern "C" { +-#if (defined USE_EXTERNAL_LIBMPEG2) ++#if (!defined WIN32) + #include + #include + #else +@@ -54,7 +54,7 @@ + virtual void mpeg2_skip(mpeg2dec_t * mpeg2dec, int skip)=0; + }; + +-#if (defined USE_EXTERNAL_LIBMPEG2) ++#if (!defined WIN32) + + class DllLibMpeg2 : public DllDynamic, DllLibMpeg2Interface + { diff --git a/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27130.diff b/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27130.diff new file mode 100644 index 0000000000..ee5f1004b9 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27130.diff @@ -0,0 +1,40 @@ +diff -Naur xbmc-pvr-27135/xbmc/utils/SystemInfo.cpp xbmc-pvr-27135.patch/xbmc/utils/SystemInfo.cpp +--- xbmc-pvr-27135/xbmc/utils/SystemInfo.cpp 2010-01-24 11:54:23.303629749 +0100 ++++ xbmc-pvr-27135.patch/xbmc/utils/SystemInfo.cpp 2010-01-24 18:00:16.991476525 +0100 +@@ -577,9 +577,27 @@ + #if defined(_LINUX) && !defined(__APPLE__) + CStdString CSysInfo::GetLinuxDistro() + { +- CStdString result = ""; ++ static const char* release_file[] = { "/etc/debian_version", ++ "/etc/SuSE-release", ++ "/etc/mandrake-release", ++ "/etc/fedora-release", ++ "/etc/redhat-release", ++ "/etc/gentoo-release", ++ "/etc/slackware-version", ++ "/etc/arch-release", ++ NULL }; + + FILE* pipe = popen("unset PYTHONHOME; unset PYTHONPATH; lsb_release -d | cut -f2", "r"); ++ ++ for (int i = 0; !pipe && release_file[i]; i++) ++ { ++ CStdString cmd = "cat "; ++ cmd += release_file[i]; ++ ++ pipe = popen(cmd.c_str(), "r"); ++ } ++ ++ CStdString result = ""; + if (pipe) + { + char buffer[256] = {'\0'}; +@@ -589,7 +607,6 @@ + CLog::Log(LOGWARNING, "Unable to determine Linux distribution"); + pclose(pipe); + } +- + return result.Trim(); + } + #endif diff --git a/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27134.diff b/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27134.diff new file mode 100644 index 0000000000..50542e9275 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/000-changeset_r27134.diff @@ -0,0 +1,57 @@ +diff -Naur xbmc-pvr-27135/xbmc/FileItem.cpp xbmc-pvr-27135.patch/xbmc/FileItem.cpp +--- xbmc-pvr-27135/xbmc/FileItem.cpp 2010-01-24 11:53:29.580755057 +0100 ++++ xbmc-pvr-27135.patch/xbmc/FileItem.cpp 2010-01-24 18:02:09.346444342 +0100 +@@ -33,11 +33,9 @@ + #include "FileSystem/MultiPathDirectory.h" + #include "FileSystem/MusicDatabaseDirectory.h" + #include "FileSystem/VideoDatabaseDirectory.h" +-#include "FileSystem/IDirectory.h" + #include "FileSystem/FactoryDirectory.h" + #include "MusicInfoTagLoaderFactory.h" + #include "CueDocument.h" +-#include "utils/fstrcmp.h" + #include "VideoDatabase.h" + #include "MusicDatabase.h" + #include "SortFileItem.h" +@@ -57,7 +55,6 @@ + #include "GUISettings.h" + #include "AdvancedSettings.h" + #include "Settings.h" +-#include "utils/TimeUtils.h" + #include "utils/RegExp.h" + #include "utils/log.h" + #include "karaoke/karaokelyricsfactory.h" +diff -Naur xbmc-pvr-27135/xbmc/FileItem.cpp.orig xbmc-pvr-27135.patch/xbmc/FileItem.cpp.orig +diff -Naur xbmc-pvr-27135/xbmc/GUIWindowVideoBase.cpp xbmc-pvr-27135.patch/xbmc/GUIWindowVideoBase.cpp +--- xbmc-pvr-27135/xbmc/GUIWindowVideoBase.cpp 2010-01-24 11:54:22.566755297 +0100 ++++ xbmc-pvr-27135.patch/xbmc/GUIWindowVideoBase.cpp 2010-01-24 18:02:09.343444194 +0100 +@@ -36,7 +36,6 @@ + #include "Application.h" + #include "NfoFile.h" + #include "Picture.h" +-#include "utils/fstrcmp.h" + #include "PlayListPlayer.h" + #include "GUIPassword.h" + #include "FileSystem/ZipManager.h" +diff -Naur xbmc-pvr-27135/xbmc/ProgramDatabase.cpp xbmc-pvr-27135.patch/xbmc/ProgramDatabase.cpp +--- xbmc-pvr-27135/xbmc/ProgramDatabase.cpp 2010-01-24 11:53:30.581257422 +0100 ++++ xbmc-pvr-27135.patch/xbmc/ProgramDatabase.cpp 2010-01-24 18:02:09.344444453 +0100 +@@ -20,7 +20,6 @@ + */ + + #include "ProgramDatabase.h" +-#include "utils/fstrcmp.h" + #include "Util.h" + #include "GUIWindowFileManager.h" + #include "FileItem.h" +diff -Naur xbmc-pvr-27135/xbmc/VideoDatabase.cpp xbmc-pvr-27135.patch/xbmc/VideoDatabase.cpp +--- xbmc-pvr-27135/xbmc/VideoDatabase.cpp 2010-01-24 11:53:29.525632072 +0100 ++++ xbmc-pvr-27135.patch/xbmc/VideoDatabase.cpp 2010-01-24 18:02:09.342444075 +0100 +@@ -21,7 +21,6 @@ + + #include "VideoDatabase.h" + #include "GUIWindowVideoBase.h" +-#include "utils/fstrcmp.h" + #include "utils/RegExp.h" + #include "utils/GUIInfoManager.h" + #include "Util.h" diff --git a/packages/mediacenter/xbmc-pvr/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff b/packages/mediacenter/xbmc-pvr/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff index 9ba36a2d7c..65a491a205 100644 --- a/packages/mediacenter/xbmc-pvr/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff +++ b/packages/mediacenter/xbmc-pvr/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff @@ -1,7 +1,7 @@ -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 @@ +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 @@ XB_CONFIG_MODULE([xbmc/lib/libPython/Python], [ if test "$host_vendor" = "apple" ; then ./configure \ @@ -10,7 +10,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --enable-ipv6 \ --enable-unicode=ucs4 \ --without-cxx \ -@@ -1147,6 +1149,8 @@ +@@ -1120,6 +1122,8 @@ cp pyconfig.h Include else ./configure \ @@ -19,7 +19,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --enable-ipv6 \ --enable-unicode=ucs4 \ --without-cxx \ -@@ -1164,6 +1168,8 @@ +@@ -1137,6 +1141,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-26784/configure.in xbmc-26784.patch/configure.in --with-pic \ --disable-asm-optimizations \ --disable-xmms-plugin \ -@@ -1178,7 +1184,9 @@ +@@ -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" \ @@ -39,7 +39,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in else true fi -@@ -1187,7 +1195,9 @@ +@@ -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" \ @@ -50,7 +50,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in else true fi -@@ -1200,6 +1210,7 @@ +@@ -1173,6 +1183,7 @@ --disable-amd3dnow \ --disable-static \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ @@ -58,7 +58,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --disable-muxers \ --disable-encoders \ --disable-devices \ -@@ -1226,6 +1237,7 @@ +@@ -1199,6 +1210,7 @@ --disable-static \ --disable-ipv6 \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ @@ -66,7 +66,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --disable-muxers \ --disable-encoders \ --disable-decoder=mpeg_xvmc \ -@@ -1238,6 +1250,7 @@ +@@ -1211,6 +1223,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-26784/configure.in xbmc-26784.patch/configure.in --enable-libfaad \ --enable-protocol=http \ --enable-pthreads \ -@@ -1251,12 +1264,16 @@ +@@ -1224,12 +1237,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-26784/configure.in xbmc-26784.patch/configure.in --disable-oss \ --disable-solaris-audio \ --disable-al-audio \ -@@ -1269,11 +1286,15 @@ +@@ -1242,11 +1259,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-26784/configure.in xbmc-26784.patch/configure.in --disable-doc \ --enable-static \ --with-pic -@@ -1284,6 +1305,8 @@ +@@ -1257,6 +1278,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-26784/configure.in xbmc-26784.patch/configure.in --enable-static \ --disable-shared \ --cc="$CC" && -@@ -1293,6 +1316,8 @@ +@@ -1266,6 +1289,8 @@ else ./configure2 \ --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \ @@ -125,7 +125,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --enable-static \ --disable-shared \ --cc="$CC" && -@@ -1308,6 +1333,8 @@ +@@ -1281,6 +1306,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-26784/configure.in xbmc-26784.patch/configure.in --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ --enable-static \ --disable-shared \ -@@ -1316,6 +1343,8 @@ +@@ -1289,6 +1316,8 @@ ./configure2 \ --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \ --extra-ldflags="-L`pwd`/../libdvdread/obj" \ @@ -143,7 +143,16 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ --enable-static \ --disable-shared \ -@@ -1337,6 +1366,8 @@ +@@ -1300,6 +1329,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 +@@ -1310,6 +1341,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 \ @@ -152,7 +161,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1346,6 +1377,8 @@ +@@ -1319,6 +1352,8 @@ --disable-al-audio else ./configure \ @@ -161,25 +170,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -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 \ -+ --host=$host_alias \ -+ --build=$build_alias \ - --with-pic \ - --disable-static \ - --enable-shared \ -@@ -1369,6 +1404,8 @@ - --without-x - else - ./configure \ -+ --host=$host_alias \ -+ --build=$build_alias \ - --with-pic \ - --disable-static \ - --enable-shared \ -@@ -1382,6 +1419,8 @@ +@@ -1334,6 +1369,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 \ @@ -188,7 +179,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --with-pic else true -@@ -1392,17 +1431,23 @@ +@@ -1344,17 +1381,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" \ @@ -215,7 +206,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in fi ], [$USE_EXTERNAL_LIBASS]) -@@ -1411,12 +1456,16 @@ +@@ -1363,12 +1406,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 \ @@ -232,7 +223,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --disable-static \ --disable-debugging \ --with-pic -@@ -1434,6 +1483,8 @@ +@@ -1386,6 +1433,8 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ if test "$host_vendor" != "apple" ; then ./configure \ @@ -241,7 +232,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --disable-shared \ --enable-static \ --with-pic -@@ -1448,6 +1499,8 @@ +@@ -1400,6 +1449,8 @@ CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \ LDFLAGS="-L/opt/local/lib" \ LIBS="-lz" \ @@ -250,7 +241,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \ --without-xscreensaver \ --disable-sound \ -@@ -1463,6 +1516,8 @@ +@@ -1415,6 +1466,8 @@ ./configure \ CFLAGS="-fPIC" \ CXXFLAGS="-fPIC" \ @@ -259,7 +250,7 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in --without-xscreensaver \ --disable-sound \ --disable-cyclone \ -@@ -1478,9 +1533,13 @@ +@@ -1430,18 +1483,26 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ if test "$host_vendor" = "apple" ; then @@ -276,5 +267,35 @@ diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in fi ], [0]) -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 + XB_CONFIG_MODULE([xbmc/lib/libapetag], [ + if test "$host_vendor" = "apple" ; then + 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 \ ++ --host=$host_alias \ ++ --build=$build_alias + else +- ./configure ++ ./configure \ ++ --host=$host_alias \ ++ --build=$build_alias + fi + ], [0]) + +@@ -1449,9 +1510,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" \ +- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic --disable-shared --enable-static +- else +- ./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 \ ++ --host=$host_alias \ ++ --build=$build_alias + fi + ], [0]) + diff --git a/packages/mediacenter/xbmc-pvr/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff b/packages/mediacenter/xbmc-pvr/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff index 2d586fa8e0..05c18e31aa 100644 --- a/packages/mediacenter/xbmc-pvr/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff +++ b/packages/mediacenter/xbmc-pvr/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff @@ -1,6 +1,6 @@ -diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in ---- xbmc-pvr-26651/configure.in 2010-01-11 04:27:41.051347205 +0100 -+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:28:14.760345801 +0100 +diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in +--- xbmc-27135/configure.in 2010-01-24 13:04:51.758580580 +0100 ++++ xbmc-27135.patch/configure.in 2010-01-24 13:05:08.779612534 +0100 @@ -45,6 +45,8 @@ vdpau_disabled="== VDPAU support manually disabled. ==" crystalhd_not_found="== Could not find libldil. CrystalHD support disabled. ==" @@ -10,7 +10,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in # External library message strings external_libraries_enabled="== Use of all supported external libraries enabled. ==" -@@ -149,6 +151,12 @@ +@@ -145,6 +147,12 @@ [use_goom=$enableval], [use_goom=no]) @@ -23,7 +23,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in AC_PATH_PROG(CCACHE,ccache,none) AC_ARG_ENABLE([ccache], [AS_HELP_STRING([--enable-ccache], -@@ -512,6 +520,15 @@ +@@ -503,6 +511,15 @@ fi fi @@ -39,7 +39,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in ### External libraries checks if test "$use_external_libraries" = "yes"; then AC_MSG_NOTICE($external_libraries_enabled) -@@ -856,6 +873,12 @@ +@@ -835,6 +852,12 @@ final_message="$final_message\n GOOM:\t\tNo" fi @@ -52,7 +52,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in if test "$use_pcre" = "yes"; then final_message="$final_message\n PCRE Support:\tYes" else -@@ -1072,6 +1095,7 @@ +@@ -1054,6 +1077,7 @@ AC_SUBST(SDL_DEFINES) AC_SUBST(BUILD_DVDCSS) AC_SUBST(BUILD_GOOM) @@ -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_FFMPEG) AC_SUBST(USE_EXTERNAL_LIBA52) -@@ -1471,7 +1495,7 @@ +@@ -1428,7 +1452,7 @@ else rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF . fi @@ -69,11 +69,11 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ 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-26651/Makefile.in xbmc-pvr-26651.patch/Makefile.in ---- xbmc-pvr-26651/Makefile.in 2010-01-11 03:33:19.643343732 +0100 -+++ xbmc-pvr-26651.patch/Makefile.in 2010-01-11 04:28:14.771345022 +0100 -@@ -105,8 +105,10 @@ +diff -Naur xbmc-27135/configure.in.orig xbmc-27135.patch/configure.in.orig +diff -Naur xbmc-27135/Makefile.in xbmc-27135.patch/Makefile.in +--- xbmc-27135/Makefile.in 2010-01-24 11:46:42.037632392 +0100 ++++ xbmc-27135.patch/Makefile.in 2010-01-24 13:05:08.781706071 +0100 +@@ -101,8 +101,10 @@ VIS_DIRS=\ xbmc/visualizations/OpenGLSpectrum \ @@ -86,7 +86,7 @@ diff -Naur xbmc-pvr-26651/Makefile.in xbmc-pvr-26651.patch/Makefile.in ifneq (@BUILD_GOOM@,1) VIS_DIRS+=xbmc/visualizations/Goom endif -@@ -279,7 +281,9 @@ +@@ -274,7 +276,9 @@ visualizations: exports $(MAKE) -C xbmc/visualizations/OpenGLSpectrum $(MAKE) -C xbmc/visualizations/WaveForm @@ -96,4 +96,4 @@ diff -Naur xbmc-pvr-26651/Makefile.in xbmc-pvr-26651.patch/Makefile.in ifneq (@BUILD_GOOM@,1) ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(ARCH))),) $(MAKE) -C xbmc/visualizations/Goom -diff -Naur xbmc-pvr-26651/Makefile.in.orig xbmc-pvr-26651.patch/Makefile.in.orig +diff -Naur xbmc-27135/Makefile.in.orig xbmc-27135.patch/Makefile.in.orig diff --git a/packages/mediacenter/xbmc-pvr/patches/013_xbmc-correct_lzo_include-0.1.diff b/packages/mediacenter/xbmc-pvr/patches/013_xbmc-correct_lzo_include-0.1.diff index 28c77faf4c..4ccc715440 100644 --- a/packages/mediacenter/xbmc-pvr/patches/013_xbmc-correct_lzo_include-0.1.diff +++ b/packages/mediacenter/xbmc-pvr/patches/013_xbmc-correct_lzo_include-0.1.diff @@ -1,7 +1,7 @@ -diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in ---- xbmc-pvr-26651/configure.in 2010-01-11 04:36:31.629347857 +0100 -+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:36:52.004347732 +0100 -@@ -915,12 +915,6 @@ +diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in +--- xbmc-27135/configure.in 2010-01-24 13:07:18.024733190 +0100 ++++ xbmc-27135.patch/configure.in 2010-01-24 13:07:39.324609701 +0100 +@@ -894,12 +894,6 @@ final_message="$final_message\n MID Support:\tNo" fi @@ -14,10 +14,10 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.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-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig -diff -Naur xbmc-pvr-26651/tools/TexturePacker/XBMCTex.cpp xbmc-pvr-26651.patch/tools/TexturePacker/XBMCTex.cpp ---- xbmc-pvr-26651/tools/TexturePacker/XBMCTex.cpp 2010-01-11 03:50:23.030349137 +0100 -+++ xbmc-pvr-26651.patch/tools/TexturePacker/XBMCTex.cpp 2010-01-11 04:36:52.005347847 +0100 +diff -Naur xbmc-27135/configure.in.orig xbmc-27135.patch/configure.in.orig +diff -Naur xbmc-27135/tools/TexturePacker/XBMCTex.cpp xbmc-27135.patch/tools/TexturePacker/XBMCTex.cpp +--- xbmc-27135/tools/TexturePacker/XBMCTex.cpp 2010-01-24 11:48:16.696641003 +0100 ++++ xbmc-27135.patch/tools/TexturePacker/XBMCTex.cpp 2010-01-24 13:07:39.325705415 +0100 @@ -37,7 +37,7 @@ #endif diff --git a/packages/mediacenter/xbmc-pvr/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff b/packages/mediacenter/xbmc-pvr/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff index 63c4459e52..038e40e693 100644 --- a/packages/mediacenter/xbmc-pvr/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff +++ b/packages/mediacenter/xbmc-pvr/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff @@ -1,15 +1,15 @@ -diff -Naur xbmc-pvr-26925.patch/guilib/Makefile xbmc-pvr-26925/guilib/Makefile ---- xbmc-pvr-26925.patch/guilib/Makefile 2010-01-17 00:52:32.000000000 +0100 -+++ xbmc-pvr-26925/guilib/Makefile 2010-01-17 03:36:21.848605153 +0100 +diff -Naur xbmc-27135/guilib/Makefile.in xbmc-27135.patch/guilib/Makefile.in +--- xbmc-27135/guilib/Makefile.in 2010-01-24 11:46:42.066643776 +0100 ++++ xbmc-27135.patch/guilib/Makefile.in 2010-01-24 13:14:01.800579073 +0100 @@ -1,4 +1,4 @@ --INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores/dvdplayer/Codecs/ffmpeg -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish -+INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores/dvdplayer/Codecs/ffmpeg -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish - - SRCS=AnimatedGif.cpp \ - AudioContext.cpp \ -diff -Naur xbmc-pvr-26925.patch/xbmc/FileSystem/Makefile.in xbmc-pvr-26925/xbmc/FileSystem/Makefile.in ---- xbmc-pvr-26925.patch/xbmc/FileSystem/Makefile.in 2010-01-17 00:55:02.000000000 +0100 -+++ xbmc-pvr-26925/xbmc/FileSystem/Makefile.in 2010-01-17 03:37:31.530272600 +0100 +-INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish ++INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish + ifneq (@USE_EXTERNAL_FFMPEG@,1) + INCLUDES+=-I../xbmc/cores/dvdplayer/Codecs/ffmpeg + endif +diff -Naur xbmc-27135/xbmc/FileSystem/Makefile.in xbmc-27135.patch/xbmc/FileSystem/Makefile.in +--- xbmc-27135/xbmc/FileSystem/Makefile.in 2010-01-24 11:47:36.842631867 +0100 ++++ xbmc-27135.patch/xbmc/FileSystem/Makefile.in 2010-01-24 13:14:59.573578187 +0100 @@ -1,6 +1,6 @@ ARCH=@ARCH@ @@ -18,12 +18,12 @@ diff -Naur xbmc-pvr-26925.patch/xbmc/FileSystem/Makefile.in xbmc-pvr-26925/xbmc/ INCLUDES+=-I../lib/libcdio/libcdio/include ifeq ($(findstring osx,$(ARCH)), osx) INCLUDES+=-I../../lib/libcurl-OSX/include -diff -Naur xbmc-pvr-26925.patch/xbmc/Makefile xbmc-pvr-26925/xbmc/Makefile ---- xbmc-pvr-26925.patch/xbmc/Makefile 2010-01-17 00:53:34.000000000 +0100 -+++ xbmc-pvr-26925/xbmc/Makefile 2010-01-17 03:36:59.145199453 +0100 +diff -Naur xbmc-27135/xbmc/Makefile.in xbmc-27135.patch/xbmc/Makefile.in +--- xbmc-27135/xbmc/Makefile.in 2010-01-24 11:47:03.973632064 +0100 ++++ xbmc-27135.patch/xbmc/Makefile.in 2010-01-24 13:14:32.079579280 +0100 @@ -1,4 +1,4 @@ --INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg -+INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg +-INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer ++INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer - INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \ - -Ilib/libUPnP/Platinum/Source/Platinum \ + ifneq (@USE_EXTERNAL_FFMPEG@,1) + INCLUDES+=-Icores/dvdplayer/Codecs/ffmpeg diff --git a/packages/mediacenter/xbmc-pvr/patches/016_xmbc-let_select_HAL-0.1.diff b/packages/mediacenter/xbmc-pvr/patches/016_xmbc-let_select_HAL-0.1.diff index c818c082a7..97bf5ee95e 100644 --- a/packages/mediacenter/xbmc-pvr/patches/016_xmbc-let_select_HAL-0.1.diff +++ b/packages/mediacenter/xbmc-pvr/patches/016_xmbc-let_select_HAL-0.1.diff @@ -1,6 +1,6 @@ -diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in ---- xbmc-pvr-26651/configure.in 2010-01-11 04:39:36.433347449 +0100 -+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:39:55.195347999 +0100 +diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in +--- xbmc-27135/configure.in 2010-01-24 13:08:23.126603769 +0100 ++++ xbmc-27135.patch/configure.in 2010-01-24 13:16:12.459703838 +0100 @@ -39,6 +39,8 @@ faac_disabled="== FAAC support manually disabled. ==" dvdcss_enabled="== DVDCSS support enabled. ==" @@ -10,7 +10,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in avahi_not_found="== Could not find libavahi-common or libavahi-client. Avahi support disabled. ==" avahi_disabled="== Avahi support disabled. ==" vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. ==" -@@ -195,6 +197,11 @@ +@@ -191,6 +193,11 @@ [enable MID support (default is no)])], [use_mid=$enableval], [use_mid=no]) @@ -22,7 +22,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in AC_ARG_ENABLE([avahi], [AS_HELP_STRING([--disable-avahi], [disable Avahi support (default is enabled if libavahi-common and libavahi-client is found)])], -@@ -446,15 +453,9 @@ +@@ -437,15 +444,9 @@ PKG_CHECK_MODULES([DBUS], [dbus-1], [INCLUDES+=" $DBUS_CFLAGS"; LIBS+=" $DBUS_LIBS"], AC_MSG_ERROR($missing_library)) @@ -38,7 +38,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in fi # PulseAudio -@@ -483,6 +484,24 @@ +@@ -474,6 +475,24 @@ fi fi @@ -63,11 +63,11 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in # avahi if test "$host_vendor" = "apple" ; then use_avahi="no" -diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig -diff -Naur xbmc-pvr-26651/guilib/system.h xbmc-pvr-26651.patch/guilib/system.h ---- xbmc-pvr-26651/guilib/system.h 2010-01-11 03:33:19.672356894 +0100 -+++ xbmc-pvr-26651.patch/guilib/system.h 2010-01-11 04:39:55.196347910 +0100 -@@ -116,7 +116,6 @@ +diff -Naur xbmc-27135/configure.in.orig xbmc-27135.patch/configure.in.orig +diff -Naur xbmc-27135/guilib/system.h xbmc-27135.patch/guilib/system.h +--- xbmc-27135/guilib/system.h 2010-01-24 11:46:42.047669779 +0100 ++++ xbmc-27135.patch/guilib/system.h 2010-01-24 13:16:12.460703245 +0100 +@@ -117,7 +117,6 @@ #define HAS_AVAHI #endif #define HAS_LCD @@ -75,4 +75,4 @@ diff -Naur xbmc-pvr-26651/guilib/system.h xbmc-pvr-26651.patch/guilib/system.h #define HAS_DBUS #define HAS_DBUS_SERVER #define HAS_GL -diff -Naur xbmc-pvr-26651/guilib/system.h.orig xbmc-pvr-26651.patch/guilib/system.h.orig +diff -Naur xbmc-27135/guilib/system.h.orig xbmc-27135.patch/guilib/system.h.orig diff --git a/packages/mediacenter/xbmc-pvr/patches/074-xbmc-full_splash-0.1.diff b/packages/mediacenter/xbmc-pvr/patches/074-xbmc-full_splash-0.1.diff index e5ae02b167..89e958c522 100644 --- a/packages/mediacenter/xbmc-pvr/patches/074-xbmc-full_splash-0.1.diff +++ b/packages/mediacenter/xbmc-pvr/patches/074-xbmc-full_splash-0.1.diff @@ -1,8 +1,6 @@ -diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig -diff -Naur xbmc-pvr-26651/guilib/system.h.orig xbmc-pvr-26651.patch/guilib/system.h.orig -diff -Naur xbmc-pvr-26651/xbmc/utils/Splash.cpp xbmc-pvr-26651.patch/xbmc/utils/Splash.cpp ---- xbmc-pvr-26651/xbmc/utils/Splash.cpp 2010-01-11 03:41:56.067346735 +0100 -+++ xbmc-pvr-26651.patch/xbmc/utils/Splash.cpp 2010-01-11 04:40:54.868347693 +0100 +diff -Naur xbmc-24572/xbmc/utils/Splash.cpp xbmc-24572.patch/xbmc/utils/Splash.cpp +--- xbmc-24572/xbmc/utils/Splash.cpp 2009-11-13 18:19:48.374746147 +0100 ++++ xbmc-24572.patch/xbmc/utils/Splash.cpp 2009-11-14 16:58:52.677231191 +0100 @@ -53,9 +53,9 @@ g_graphicsContext.Clear(); diff --git a/packages/mediacenter/xbmc-pvr/patches/091-xbmc-enable_yasm_in_ffmpeg-0.1.diff b/packages/mediacenter/xbmc-pvr/patches/091-xbmc-enable_yasm_in_ffmpeg-0.1.diff index 6e55456606..8ad37ff7d2 100644 --- a/packages/mediacenter/xbmc-pvr/patches/091-xbmc-enable_yasm_in_ffmpeg-0.1.diff +++ b/packages/mediacenter/xbmc-pvr/patches/091-xbmc-enable_yasm_in_ffmpeg-0.1.diff @@ -1,7 +1,7 @@ -diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in ---- xbmc-pvr-26651/configure.in 2010-01-11 04:40:33.487469992 +0100 -+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:42:38.159472611 +0100 -@@ -770,6 +770,7 @@ +diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in +--- xbmc-23998/configure.in 2009-10-25 13:30:40.869660379 +0100 ++++ xbmc-23998.patch/configure.in 2009-10-25 13:33:30.376657368 +0100 +@@ -692,6 +692,7 @@ fi fi @@ -9,7 +9,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",) AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) -@@ -1290,6 +1291,7 @@ +@@ -1177,6 +1178,7 @@ --disable-ipv6 \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \ @@ -17,5 +17,3 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in --disable-muxers \ --disable-encoders \ --disable-decoder=mpeg_xvmc \ -diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig -diff -Naur xbmc-pvr-26651/guilib/system.h.orig xbmc-pvr-26651.patch/guilib/system.h.orig diff --git a/packages/mediacenter/xbmc-pvr/url b/packages/mediacenter/xbmc-pvr/url index 059d0c11d3..c494450796 100644 --- a/packages/mediacenter/xbmc-pvr/url +++ b/packages/mediacenter/xbmc-pvr/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-pvr-27023.tar.bz2 +http://sources.openelec.tv/svn/xbmc-pvr-27135.tar.bz2