From 3b609b2af6252cce1714bfb2f86b16ffbec1533f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 25 Apr 2011 07:07:26 +0200 Subject: [PATCH] xbmc-pvr: update to xbmc-pvr-3513480 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-pvr/build | 13 +- packages/mediacenter/xbmc-pvr/meta | 5 +- ...002-arm_remove_forced_python2.5-0.1.patch} | 0 ...-3513480-011-add_xbmcvfs_module-0.1.patch} | 0 ...7593-201-let_select_XBMCProjectM-0.1.patch | 97 -------------- ...-pvr-7647593-202-let_select_RSXS-0.1.patch | 99 -------------- ...-7647593-301-correct_lzo_include-0.1.patch | 28 ---- ...93-302-dont_hardcode_usr_include-0.1.patch | 29 ---- ...593-303-WiiRemote_crosscompiling-0.1.patch | 53 -------- ...vr-7647593-303-fix_libdvd_xFLAGS-0.1.patch | 119 ----------------- ...3-321-CrystalHD_use_yuy2_to_yv12-0.1.patch | 12 -- ...593-401-we_dont_need_libXinerama-0.1.patch | 13 -- ...647593-402-enable_yasm_in_ffmpeg-0.1.patch | 19 --- ..._only_needed_for_internal_python-0.1.patch | 21 --- ...arma-pvr-7647593-451-full_splash-0.1.patch | 16 --- ...eam_mode_improperly_set-Ticket-10981.patch | 12 -- ...ttings_videolibrary.flattenmoviesets.patch | 24 ---- ...1-add_support_to_specify_GIT_REV-0.1.patch | 39 ++++++ ...513480-101-strip_confluence_skin-0.1.patch | 42 ++++++ ...3480-201-let_select_XBMCProjectM-0.1.patch | 88 ++++++++++++ ...-pvr-3513480-202-let_select_RSXS-0.1.patch | 98 ++++++++++++++ ...vr-3513480-303-fix_libdvd_xFLAGS-0.1.patch | 119 +++++++++++++++++ ...0-321-CrystalHD_use_yuy2_to_yv12-0.1.patch | 12 ++ ...513480-402-enable_yasm_in_ffmpeg-0.1.patch | 21 +++ ...c-pvr-3513480-404-add_lame_check-0.6.patch | 125 ++++++++++++++++++ ...-3513480-452-change_lcd_content-0.1.patch} | 8 +- ...80-453-ps3_remote_be_more_quiet-0.1.patch} | 6 +- ...-add_remote_irtrans_mediacenter-0.1.patch} | 12 +- ...3513480-463-add_remote_devinput-0.1.patch} | 10 +- ...advancedsettings_alwaysextractflags.patch} | 16 +-- tools/mkpkg/mkpkg_xbmc-pvr | 59 ++++----- 31 files changed, 608 insertions(+), 607 deletions(-) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch => .old/xbmc-pvr-3513480-002-arm_remove_forced_python2.5-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-011-add_xbmcvfs_module-0.1.patch => .old/xbmc-pvr-3513480-011-add_xbmcvfs_module-0.1.patch} (100%) delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-001-add_support_to_specify_GIT_REV-0.1.patch create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-101-strip_confluence_skin-0.1.patch create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-201-let_select_XBMCProjectM-0.1.patch create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-202-let_select_RSXS-0.1.patch create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-303-fix_libdvd_xFLAGS-0.1.patch create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-321-CrystalHD_use_yuy2_to_yv12-0.1.patch create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-402-enable_yasm_in_ffmpeg-0.1.patch create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-404-add_lame_check-0.6.patch rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch => xbmc-pvr-3513480-452-change_lcd_content-0.1.patch} (55%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch => xbmc-pvr-3513480-453-ps3_remote_be_more_quiet-0.1.patch} (72%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-pvr-3513480-462-add_remote_irtrans_mediacenter-0.1.patch} (76%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch => xbmc-pvr-3513480-463-add_remote_devinput-0.1.patch} (86%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch => xbmc-pvr-3513480-901-advancedsettings_alwaysextractflags.patch} (60%) diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build index a204715ec7..46c5c512aa 100755 --- a/packages/mediacenter/xbmc-pvr/build +++ b/packages/mediacenter/xbmc-pvr/build @@ -105,11 +105,12 @@ cd $PKG_BUILD do_autoreconf do_autoreconf lib/cpluff -[ -d lib/libass ] && do_autoreconf lib/libass -[ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss -do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread -do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav -do_autoreconf xbmc/lib/libid3tag/libid3tag +[ -d lib/libdvd/libdvdcss ] && do_autoreconf lib/libdvd/libdvdcss +do_autoreconf lib/libdvd/libdvdread +do_autoreconf lib/libdvd/libdvdnav + +# Clean the generated files +find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \; ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ @@ -153,7 +154,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag --enable-external-python \ # setup default skin inside the sources - sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/Settings.h + sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/settings/Settings.h make externals make xbmc.bin diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index 660cf36fc1..f449f9372b 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -19,13 +19,12 @@ ################################################################################ PKG_NAME="xbmc-pvr" -PKG_VERSION="10.0-Dharma-pvr-7647593" +PKG_VERSION="3513480" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" -#PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="http://gujs.openelec.tv/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" PKG_PRIORITY="optional" diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/.old/xbmc-pvr-3513480-002-arm_remove_forced_python2.5-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/.old/xbmc-pvr-3513480-002-arm_remove_forced_python2.5-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-011-add_xbmcvfs_module-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/.old/xbmc-pvr-3513480-011-add_xbmcvfs_module-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-011-add_xbmcvfs_module-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/.old/xbmc-pvr-3513480-011-add_xbmcvfs_module-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch deleted file mode 100644 index 8da9696e60..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in ---- xbmc-31903/configure.in 2010-07-17 16:25:37.000000000 +0200 -+++ xbmc-31903.patch/configure.in 2010-07-17 16:46:16.387376489 +0200 -@@ -23,6 +23,8 @@ - xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. ==" - goom_enabled="== GOOM enabled. ==" - goom_disabled="== GOOM disabled. ==" -+xbmcprojectm_enabled="== XBMCProjectM enabled. ==" -+xbmxprojectm_disabled="== XBMCProjectM disabled. ==" - pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" - pulse_disabled="== PulseAudio support manually disabled. ==" - faac_not_found="== Could not find libfaac. FAAC support disabled. ==" -@@ -161,6 +163,12 @@ - [use_goom=$enableval], - [use_goom=no]) - -+AC_ARG_ENABLE([xbmcprojectm], -+ [AS_HELP_STRING([--enable-xbmcprojectm], -+ [enable XBMCProjectM visualisation (default is yes)])], -+ [use_xbmcprojectm=$enableval], -+ [use_xbmcprojectm=yes]) -+ - AC_ARG_ENABLE([ccache], - [AS_HELP_STRING([--enable-ccache], - [enable building with ccache feature (default is auto)])], -@@ -725,6 +733,15 @@ - AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],use_librtmp=yes, - use_librtmp=no;AC_MSG_RESULT($librtmp_not_found)) - -+# XBMCPROJECTM -+if test "$use_xbmcprojectm" = "yes"; then -+ AC_MSG_NOTICE($xbmcprojectm_enabled) -+ BUILD_XBMCPROJECTM=0 -+else -+ AC_MSG_NOTICE($xbmcprojectm_disabled) -+ BUILD_XBMCPROJECTM=1 -+fi -+ - ### External libraries checks - # External FFmpeg - if test "$use_external_ffmpeg" = "yes"; then -@@ -1132,6 +1149,12 @@ - final_message="$final_message\n GOOM:\t\tNo" - fi - -+if test "$use_xbmcprojectm" = "yes"; then -+ final_message="$final_message\n XBMCProjectM:\tYes" -+else -+ final_message="$final_message\n XBMCProjectM:\tNo" -+fi -+ - if test "$use_mid" = "yes"; then - final_message="$final_message\n MID Support:\tYes" - SDL_DEFINES="$SDL_DEFINES -DMID" -@@ -1401,6 +1424,7 @@ - AC_SUBST(SDL_DEFINES) - AC_SUBST(BUILD_DVDCSS) - AC_SUBST(BUILD_GOOM) -+AC_SUBST(BUILD_XBMCPROJECTM) - AC_SUBST(USE_EXTERNAL_FFMPEG) - AC_SUBST(USE_EXTERNAL_LIBA52) - AC_SUBST(USE_INTERNAL_LIBA52) -@@ -1788,7 +1812,7 @@ - -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" . - set +x - fi --], [0]) -+], [$BUILD_XBMCPROJECTM]) - - XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ - if test "$host_vendor" != "apple" ; then -diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in ---- xbmc-31903/Makefile.in 2010-07-17 16:25:37.000000000 +0200 -+++ xbmc-31903.patch/Makefile.in 2010-07-17 16:46:16.391376663 +0200 -@@ -108,8 +108,10 @@ - - VIS_DIRS=\ - xbmc/visualizations/OpenGLSpectrum \ -- xbmc/visualizations/WaveForm \ -- xbmc/visualizations/XBMCProjectM -+ xbmc/visualizations/WaveForm -+ifneq (@BUILD_XBMCPROJECTM@,1) -+VIS_DIRS+=xbmc/visualizations/XBMCProjectM -+endif - ifeq ($(findstring osx,$(ARCH)), osx) - VIS_DIRS+=xbmc/visualizations/iTunes - endif -@@ -307,7 +309,9 @@ - ifneq (arm, $(ARCH)) - $(MAKE) -C xbmc/visualizations/OpenGLSpectrum - $(MAKE) -C xbmc/visualizations/WaveForm -+ifneq (@BUILD_XBMCPROJECTM@,1) - $(MAKE) -C xbmc/visualizations/XBMCProjectM -+endif - ifeq ($(findstring osx,$(ARCH)), osx) - $(MAKE) -C xbmc/visualizations/iTunes - endif diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch deleted file mode 100644 index 378eb81c50..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in ---- xbmc-31903/configure.in 2010-07-17 16:47:46.246501133 +0200 -+++ xbmc-31903.patch/configure.in 2010-07-17 16:47:17.801376519 +0200 -@@ -25,6 +25,8 @@ - goom_disabled="== GOOM disabled. ==" - xbmcprojectm_enabled="== XBMCProjectM enabled. ==" - xbmxprojectm_disabled="== XBMCProjectM disabled. ==" -+rsxs_enabled="== RSXS enabled. ==" -+rsxs_disabled="== RSXS disabled. ==" - pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" - pulse_disabled="== PulseAudio support manually disabled. ==" - faac_not_found="== Could not find libfaac. FAAC support disabled. ==" -@@ -169,6 +171,12 @@ - [use_xbmcprojectm=$enableval], - [use_xbmcprojectm=yes]) - -+AC_ARG_ENABLE([rsxs], -+ [AS_HELP_STRING([--enable-rsxs], -+ [enable RSXS Screensaver (default is yes)])], -+ [use_rsxs=$enableval], -+ [use_rsxs=yes]) -+ - AC_ARG_ENABLE([ccache], - [AS_HELP_STRING([--enable-ccache], - [enable building with ccache feature (default is auto)])], -@@ -742,6 +750,15 @@ - BUILD_XBMCPROJECTM=1 - fi - -+# RSXS -+if test "$use_rsxs" = "yes"; then -+ AC_MSG_NOTICE($rsxs_enabled) -+ BUILD_RSXS=0 -+else -+ AC_MSG_NOTICE($rsxs_disabled) -+ BUILD_RSXS=1 -+fi -+ - ### External libraries checks - # External FFmpeg - if test "$use_external_ffmpeg" = "yes"; then -@@ -1155,6 +1172,12 @@ - final_message="$final_message\n XBMCProjectM:\tNo" - fi - -+if test "$use_rsxs" = "yes"; then -+ final_message="$final_message\n RSXS:\t\tYes" -+else -+ final_message="$final_message\n RSXS:\t\tNo" -+fi -+ - if test "$use_mid" = "yes"; then - final_message="$final_message\n MID Support:\tYes" - SDL_DEFINES="$SDL_DEFINES -DMID" -@@ -1425,6 +1448,7 @@ - AC_SUBST(BUILD_DVDCSS) - AC_SUBST(BUILD_GOOM) - AC_SUBST(BUILD_XBMCPROJECTM) -+AC_SUBST(BUILD_RSXS) - AC_SUBST(USE_EXTERNAL_FFMPEG) - AC_SUBST(USE_EXTERNAL_LIBA52) - AC_SUBST(USE_INTERNAL_LIBA52) -@@ -1866,7 +1890,7 @@ - --disable-skyrocket - fi - fi --], [0]) -+], [$BUILD_RSXS]) - - XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ - if test "$host_vendor" = "apple" ; then -diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in ---- xbmc-31903/Makefile.in 2010-07-17 16:47:46.258501239 +0200 -+++ xbmc-31903.patch/Makefile.in 2010-07-17 16:47:17.803376676 +0200 -@@ -103,8 +103,10 @@ - lib/xbmc-dll-symbols \ - lib/jsoncpp/jsoncpp/src/lib_json - --SS_DIRS=\ -- xbmc/screensavers/rsxs-0.9/xbmc -+SS_DIRS= -+ifneq (@BUILD_RSXS@,1) -+SS_DIRS=+xbmc/screensavers/rsxs-0.9/xbmc -+endif - - VIS_DIRS=\ - xbmc/visualizations/OpenGLSpectrum \ -@@ -323,8 +325,10 @@ - $(MAKE) -C xbmc/pvrclients/tvheadend - screensavers: exports - ifneq (arm, $(ARCH)) -+ifneq (@BUILD_RSXS@,1) - $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc - endif -+endif - libaddon: exports - $(MAKE) -C lib/addons/library.xbmc.addon - $(MAKE) -C lib/addons/library.xbmc.gui - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch deleted file mode 100644 index d9b5732f81..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in ---- xbmc-31903/configure.in 2010-07-17 16:50:02.838501479 +0200 -+++ xbmc-31903.patch/configure.in 2010-07-17 16:50:20.633376618 +0200 -@@ -1205,12 +1205,6 @@ - final_message="$final_message\n MID Support:\tNo" - fi - --if test -d "/usr/include/lzo"; then -- INCLUDES="$INCLUDES -I/usr/include/lzo" --else -- INCLUDES="$INCLUDES" --fi -- - if test "x$use_ccache" != "xno"; then - AC_PATH_PROG(CCACHE,ccache,none) - if test "$ac_cv_path_CCACHE" = "none"; then -diff -Naur xbmc-31903/tools/TexturePacker/XBMCTex.cpp xbmc-31903.patch/tools/TexturePacker/XBMCTex.cpp ---- xbmc-31903/tools/TexturePacker/XBMCTex.cpp 2010-07-17 16:28:40.000000000 +0200 -+++ xbmc-31903.patch/tools/TexturePacker/XBMCTex.cpp 2010-07-17 16:50:20.634375824 +0200 -@@ -37,7 +37,7 @@ - #endif - - #ifdef _LINUX --#include -+#include - #else - #include "../../xbmc/lib/liblzo/LZO1X.H" - #endif diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch deleted file mode 100644 index 33af095f6e..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur xbmc-28910/guilib/Makefile.in xbmc-28910.patch/guilib/Makefile.in ---- xbmc-28910/guilib/Makefile.in 2010-03-28 17:12:32.000000000 +0200 -+++ xbmc-28910.patch/guilib/Makefile.in 2010-03-28 19:13:23.816629379 +0200 -@@ -1,4 +1,4 @@ --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-28910/xbmc/FileSystem/Makefile.in xbmc-28910.patch/xbmc/FileSystem/Makefile.in ---- xbmc-28910/xbmc/FileSystem/Makefile.in 2010-03-28 17:14:55.000000000 +0200 -+++ xbmc-28910.patch/xbmc/FileSystem/Makefile.in 2010-03-28 19:13:23.834753245 +0200 -@@ -1,6 +1,6 @@ - ARCH=@ARCH@ - --INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I../lib -+INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I../lib - INCLUDES+=-I../lib/libcdio/libcdio/include - ifeq ($(findstring osx,$(ARCH)), osx) - INCLUDES+=-I../../lib/libcurl-OSX/include -diff -Naur xbmc-28910/xbmc/Makefile.in xbmc-28910.patch/xbmc/Makefile.in ---- xbmc-28910/xbmc/Makefile.in 2010-03-28 17:13:35.000000000 +0200 -+++ xbmc-28910.patch/xbmc/Makefile.in 2010-03-28 19:13:23.837752973 +0200 -@@ -1,4 +1,4 @@ --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 - - ifneq (@USE_EXTERNAL_FFMPEG@,1) - INCLUDES+=-Icores/dvdplayer/Codecs/ffmpeg diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch deleted file mode 100644 index e63840a6da..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/Makefile ---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/Makefile 2010-09-19 14:54:08.000000000 +0200 -+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/Makefile 2010-09-21 20:31:58.649299449 +0200 -@@ -1,3 +1,4 @@ -+CXX ?= g++ - CFLAGS = -Wall -pipe -fPIC -funroll-loops - OBJ_DIR = release-$(shell $(CC) -v 2>&1|grep ^Target:|cut -d' ' -f2) - OBJS = wiiuse_v0.12/src/$(OBJ_DIR)/libwiiuse.so -@@ -6,7 +7,7 @@ - - all: - @$(MAKE) -C wiiuse_$(VERSION)/src $@ -- g++ $(CFLAGS) WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN) -+ $(CXX) $(CFLAGS) -I./wiiuse_$(VERSION)/src WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN) - wiiuse: - @$(MAKE) -C wiiuse_$(VERSION)/src - clean: -diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile ---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile 2010-09-19 14:54:08.000000000 +0200 -+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile 2010-09-21 20:28:15.388265664 +0200 -@@ -5,7 +5,7 @@ - # - # Change this to your GCC version. - # --CC = gcc -+CC ?= gcc - - #################################################### - # -diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile ---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile 2010-09-19 14:54:08.000000000 +0200 -+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile 2010-09-21 20:28:22.476390252 +0200 -@@ -5,7 +5,7 @@ - # - # Change this to your GCC version. - # --CC = gcc -+CC ?= gcc - - #################################################### - # -diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile ---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile 2010-09-19 14:54:08.000000000 +0200 -+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile 2010-09-21 20:28:32.447265813 +0200 -@@ -5,7 +5,7 @@ - # - # Change this to your GCC version. - # --CC = gcc -+CC ?= gcc - - #################################################### - # diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch deleted file mode 100644 index d3155b02bc..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in 2010-09-04 04:22:52.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in 2010-09-06 00:34:45.247116875 +0200 -@@ -6,5 +6,5 @@ - Name: libdvdcss - Description: DVD access and decryption library. - Version: @VERSION@ --Libs: -L${libdir} -ldvdcss --Cflags: -I{includedir} -I${includedir}/@PACKAGE@ -+Libs: -ldvdcss -+Cflags: -I. -diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh 2010-09-04 04:22:50.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh 2010-09-06 00:30:38.943396556 +0200 -@@ -56,17 +56,17 @@ - fi - - if test "$echo_cflags" = "yes"; then -- echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags -+ echo $dvdread_cflags $extracflags $threadcflags - fi - - if test "$echo_minicflags" = "yes"; then -- echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags -+ echo $extracflags $threadcflags - fi - - if test "$echo_libs" = "yes"; then -- echo -L$libdir -ldvdnav $dvdread_libs $threadlib -+ echo -ldvdnav $dvdread_libs $threadlib - fi - - if test "$echo_minilibs" = "yes"; then -- echo -L$libdir -ldvdnavmini $threadlib -+ echo -ldvdnavmini $threadlib - fi -diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in 2010-09-04 04:22:50.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in 2010-09-06 00:31:04.643116783 +0200 -@@ -76,13 +76,13 @@ - fi - - if test "$echo_cflags" = "yes"; then -- echo -I@includedir@ -I@includedir@/libdvdread @THREAD_CFLAGS@ -+ echo @THREAD_CFLAGS@ - fi - - if test "$echo_libs" = "yes"; then -- echo -L@libdir@ -ldvdnav -ldvdread @THREAD_LIBS@ -+ echo -ldvdnav -ldvdread @THREAD_LIBS@ - fi - - if test "$echo_minilibs" = "yes"; then -- echo -L@libdir@ -ldvdnavmini @THREAD_LIBS@ -+ echo -ldvdnavmini @THREAD_LIBS@ - fi -diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2010-09-04 04:22:50.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2010-09-06 00:31:31.665116765 +0200 -@@ -7,5 +7,5 @@ - Description: DVD Navigation mini library - Version: @VERSION@ - --Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@ --Libs: -L${libdir} -ldvdnav @THREAD_LIBS@ -+Cflags: @DVDREAD_CFLAGS@ @THREAD_CFLAGS@ -+Libs: -ldvdnav @THREAD_LIBS@ -diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in 2010-09-04 04:22:50.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in 2010-09-06 00:31:18.193116906 +0200 -@@ -8,5 +8,5 @@ - Version: @VERSION@ - - Requires.private: dvdread >= 4.1.2 --Cflags: -I${includedir} @THREAD_CFLAGS@ --Libs: -L${libdir} -ldvdnav @THREAD_LIBS@ -+Cflags: @THREAD_CFLAGS@ -+Libs: -ldvdnav @THREAD_LIBS@ -diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in 2010-09-04 04:22:51.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in 2010-09-06 00:32:18.255991830 +0200 -@@ -72,9 +72,9 @@ - fi - - if test "$echo_cflags" = "yes"; then -- echo -I@includedir@ -+ echo "" - fi - - if test "$echo_libs" = "yes"; then -- echo -L@libdir@ -ldvdread -+ echo -ldvdread - fi -diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh 2010-09-04 04:22:51.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh 2010-09-06 00:32:35.283991243 +0200 -@@ -48,9 +48,9 @@ - fi - - if test "$echo_cflags" = "yes"; then -- echo -I$prefix/include $extracflags -+ echo $extracflags - fi - - if test "$echo_libs" = "yes"; then -- echo -L$libdir $dvdreadlib -+ echo $dvdreadlib - fi -diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in 2010-09-04 04:22:51.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in 2010-09-06 00:32:57.831991741 +0200 -@@ -7,5 +7,5 @@ - Description: Low level DVD access library - Version: @VERSION@ - --Cflags: -I${includedir} --Libs: -L${libdir} -ldvdread -+Cflags: -I. -+Libs: -ldvdread diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch deleted file mode 100644 index 2526f8e3ba..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xbmc-10.0-Dharma/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp ---- xbmc-10.0-Dharma/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2010-12-17 20:14:04.000000000 +0100 -+++ xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-01-21 13:52:11.238550146 +0100 -@@ -773,7 +773,7 @@ - if (!pBuffer) - { - // No free pre-allocated buffers so make one --#ifdef _WIN32 -+#if 1 - // force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability. - pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height); - #else diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch deleted file mode 100644 index c3e6dea659..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in ---- xbmc-31903/configure.in 2010-07-17 16:50:57.045376680 +0200 -+++ xbmc-31903.patch/configure.in 2010-07-17 16:52:57.912501212 +0200 -@@ -585,9 +585,6 @@ - PKG_CHECK_MODULES([XMU], [xmu], - [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"], - AC_MSG_ERROR($missing_library)) -- PKG_CHECK_MODULES([XINERAMA],[xinerama], -- [INCLUDES="$INCLUDES $XINERAMA_CFLAGS"; LIBS="$LIBS $XINERAMA_LIBS"], -- AC_MSG_ERROR($missing_library)) - PKG_CHECK_MODULES([CURL], [libcurl], - [INCLUDES="$INCLUDES $CURL_CFLAGS"; LIBS="$LIBS $CURL_LIBS"], - AC_MSG_ERROR($missing_library)) diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch deleted file mode 100644 index f2db6fd5a2..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in ---- xbmc-31903/configure.in 2010-07-17 16:53:28.281376543 +0200 -+++ xbmc-31903.patch/configure.in 2010-07-17 16:55:45.481375135 +0200 -@@ -1045,6 +1045,7 @@ - fi - fi - -+AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",) - AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",) - AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) - -@@ -1639,6 +1640,7 @@ - `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\ - `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\ - --target-os=$(tolower $(uname -s)) \ -+ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \ - --disable-muxers \ - --enable-muxer=spdif \ - --enable-muxer=adts \ diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch deleted file mode 100644 index f914bcde7b..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur xbmc-10.0-Dharma/configure.in xbmc-10.0-Dharma.patch/configure.in ---- xbmc-10.0-Dharma/configure.in 2010-12-17 20:30:53.000000000 +0100 -+++ xbmc-10.0-Dharma.patch/configure.in 2011-01-06 03:41:05.387941174 +0100 -@@ -546,8 +546,6 @@ - AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library)) - 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([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)) -@@ -940,6 +938,8 @@ - USE_EXTERNAL_PYTHON=1 - AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.]) - else -+ AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) -+ AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) - AC_MSG_NOTICE($external_python_disabled) - USE_EXTERNAL_PYTHON=0 - fi diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch deleted file mode 100644 index 0d66158268..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur xbmc-28910/xbmc/utils/Splash.cpp xbmc-28910.patch/xbmc/utils/Splash.cpp ---- xbmc-28910/xbmc/utils/Splash.cpp 2010-03-28 17:14:58.000000000 +0200 -+++ xbmc-28910.patch/xbmc/utils/Splash.cpp 2010-03-28 19:29:51.138661142 +0200 -@@ -53,9 +53,9 @@ - g_graphicsContext.Clear(); - - g_graphicsContext.SetCameraPosition(CPoint(0, 0)); -- float w = g_graphicsContext.GetWidth() * 0.5f; -- float h = g_graphicsContext.GetHeight() * 0.5f; -- CGUIImage* image = new CGUIImage(0, 0, w*0.5f, h*0.5f, w, h, m_ImageName); -+ float w = g_graphicsContext.GetWidth(); -+ float h = g_graphicsContext.GetHeight(); -+ CGUIImage* image = new CGUIImage(0, 0, 0, 0, w, h, m_ImageName); - image->SetAspectRatio(CAspectRatio::AR_KEEP); - image->AllocResources(); - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch deleted file mode 100644 index a77ad31d11..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xbmc-10.0-Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c ---- xbmc-10.0-Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c 2010-12-17 20:13:36.000000000 +0100 -+++ xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c 2011-01-07 01:19:48.721555949 +0100 -@@ -108,7 +108,7 @@ - static int spdif_header_ac3(AVFormatContext *s, AVPacket *pkt) - { - IEC958Context *ctx = s->priv_data; -- int bitstream_mode = pkt->data[6] & 0x7; -+ int bitstream_mode = pkt->data[5] & 0x7; - - ctx->data_type = IEC958_AC3 | (bitstream_mode << 8); - ctx->pkt_offset = AC3_FRAME_SIZE << 2; diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch deleted file mode 100644 index a22d3acb65..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/GUISettings.cpp ---- xbmc-dharma-35003/xbmc/GUISettings.cpp 2010-10-25 23:37:10.165043528 +0200 -+++ xbmc-dharma-35003.patch/xbmc/GUISettings.cpp 2010-10-25 23:37:27.888251923 +0200 -@@ -528,6 +528,7 @@ - AddBool(NULL, "videolibrary.seasonthumbs", 20382, true); - AddBool(vdl, "videolibrary.actorthumbs", 20402, true); - AddInt(vdl, "videolibrary.flattentvshows", 20412, 1, 0, 1, 2, SPIN_CONTROL_TEXT); -+ AddBool(NULL, "videolibrary.flattenmoviesets", 22002, false); - AddBool(vdl, "videolibrary.updateonstartup", 22000, false); - AddBool(vdl, "videolibrary.backgroundupdate", 22001, false); - AddSeparator(vdl, "videolibrary.sep3"); -diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp ---- xbmc-dharma-35003/xbmc/VideoDatabase.cpp 2010-10-25 15:36:19.000000000 +0200 -+++ xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp 2010-10-25 23:37:27.887251911 +0200 -@@ -4394,7 +4394,7 @@ - if (NULL == m_pDS.get()) return false; - - CStdString strSQL = "select * from movieview "; -- if (fetchSets) -+ if (fetchSets && !g_guiSettings.GetBool("videolibrary.flattenmoviesets")) - { - // not getting a set, so grab all sets that match this where clause first - CStdString setsWhere; -diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp.orig xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp.orig diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-001-add_support_to_specify_GIT_REV-0.1.patch new file mode 100644 index 0000000000..89a229d0d0 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-001-add_support_to_specify_GIT_REV-0.1.patch @@ -0,0 +1,39 @@ +diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in +--- xbmc-pvr-3513480/configure.in 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 03:05:04.609266887 +0200 +@@ -380,6 +380,14 @@ + esac + AC_SUBST([ARCH]) + ++AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) ++if test "$HAVE_GIT" = "yes" -a "$GIT_REV" = ""; then ++ GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}') ++elif test "$GIT_REV" = ""; then ++ GIT_REV="Unknown" ++fi ++final_message="$final_message\n git Rev.:\t${GIT_REV}" ++ + # platform debug flags + if test "$use_debug" = "yes"; then + final_message="$final_message\n Debugging:\tYes" +@@ -1090,7 +1098,6 @@ + fi + fi + +-AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) + + # Checks for header files. + AC_HEADER_DIRENT +@@ -1279,12 +1286,6 @@ + final_message="$final_message\n Avahi:\tNo" + fi + +-if test "$HAVE_GIT" = "yes"; then +- GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}') +-fi +-if test "$GIT_REV" = ""; then +- GIT_REV="Unknown" +-fi + if test "$host_vendor" = "apple"; then + echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h + else diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-101-strip_confluence_skin-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-101-strip_confluence_skin-0.1.patch new file mode 100644 index 0000000000..36fcae9749 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-101-strip_confluence_skin-0.1.patch @@ -0,0 +1,42 @@ +diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in +--- xbmc-pvr-3513480/configure.in 2011-04-25 03:24:35.056907267 +0200 ++++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 04:31:28.068476385 +0200 +@@ -1368,7 +1368,6 @@ + + OUTPUT_FILES="Makefile \ + Makefile.include \ +- addons/skin.confluence/media/Makefile \ + xbmc/Makefile \ + xbmc/cdrip/Makefile \ + xbmc/cores/Makefile \ +diff -Naur xbmc-pvr-3513480/Makefile.in xbmc-pvr-3513480.patch/Makefile.in +--- xbmc-pvr-3513480/Makefile.in 2011-04-25 03:15:20.988746910 +0200 ++++ xbmc-pvr-3513480.patch/Makefile.in 2011-04-25 04:23:50.615799946 +0200 +@@ -166,13 +166,8 @@ + lib/addons/library.xbmc.pvr \ + lib/addons/library.xbmc.gui \ + +-CONFLUENCE_MEDIA=addons/skin.confluence/media +- +-SKIN_DIRS=\ +- $(CONFLUENCE_MEDIA) +- + DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \ +- $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(PVR_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) ++ $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(PVR_DIRS) $(LIBADDON_DIRS) + + LIBS=@LIBS@ + CFLAGS=@CFLAGS@ +@@ -209,12 +204,7 @@ + @./bootstrap + + # skin textures +-ifneq ($(findstring arm,@ARCH@), arm) +-skins: tools/TexturePacker/TexturePacker force +- $(MAKE) -C $(CONFLUENCE_MEDIA) +-else + skins: +-endif + + + xbmc/guilib/guilib.a: force diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-201-let_select_XBMCProjectM-0.1.patch new file mode 100644 index 0000000000..6372b9e3b0 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-201-let_select_XBMCProjectM-0.1.patch @@ -0,0 +1,88 @@ +diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in +--- xbmc-pvr-3513480/configure.in 2011-04-25 03:08:17.936138616 +0200 ++++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 03:24:35.056907267 +0200 +@@ -66,6 +66,8 @@ + xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. ==" + goom_enabled="== GOOM enabled. ==" + goom_disabled="== GOOM disabled. ==" ++xbmcprojectm_enabled="== XBMCProjectM enabled. ==" ++xbmxprojectm_disabled="== XBMCProjectM disabled. ==" + pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" + pulse_disabled="== PulseAudio support manually disabled. ==" + dvdcss_enabled="== DVDCSS support enabled. ==" +@@ -204,6 +206,12 @@ + [use_goom=$enableval], + [use_goom=no]) + ++AC_ARG_ENABLE([xbmcprojectm], ++ [AS_HELP_STRING([--enable-xbmcprojectm], ++ [enable XBMCProjectM visualisation (default is yes)])], ++ [use_xbmcprojectm=$enableval], ++ [use_xbmcprojectm=yes]) ++ + AC_ARG_ENABLE([ccache], + [AS_HELP_STRING([--enable-ccache], + [enable building with ccache feature (default is auto)])], +@@ -807,6 +815,15 @@ + fi + fi + ++# XBMCPROJECTM ++if test "$use_xbmcprojectm" = "yes" && test "use_gl" == "yes"; then ++ AC_MSG_NOTICE($xbmcprojectm_enabled) ++ DISABLE_XBMCPROJECTM=0 ++else ++ AC_MSG_NOTICE($xbmcprojectm_disabled) ++ DISABLE_XBMCPROJECTM=1 ++fi ++ + # libRTMP + if test "$use_librtmp" != "no"; then + AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],, +@@ -1216,6 +1233,12 @@ + final_message="$final_message\n GOOM:\t\tNo" + fi + ++if test "$use_xbmcprojectm" = "yes"; then ++ final_message="$final_message\n XBMCProjectM:\tYes" ++else ++ final_message="$final_message\n XBMCProjectM:\tNo" ++fi ++ + if test "$use_libbluray" = "yes"; then + final_message="$final_message\n Bluray:\tYes" + else +@@ -1422,6 +1445,7 @@ + AC_SUBST(SDL_DEFINES) + AC_SUBST(BUILD_DVDCSS) + AC_SUBST(DISABLE_GOOM) ++AC_SUBST(DISABLE_XBMCPROJECTM) + AC_SUBST(USE_EXTERNAL_FFMPEG) + AC_SUBST(PYTHON_VERSION) + AC_SUBST(OUTPUT_FILES) +@@ -1647,7 +1671,7 @@ + -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" . + set +x + fi +-], [0]) ++], [$DISABLE_XBMCPROJECTM]) + + XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ + ./configure \ +diff -Naur xbmc-pvr-3513480/Makefile.in xbmc-pvr-3513480.patch/Makefile.in +--- xbmc-pvr-3513480/Makefile.in 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/Makefile.in 2011-04-25 03:15:20.988746910 +0200 +@@ -140,8 +140,11 @@ + ifeq (@USE_OPENGL@,1) + VIS_DIRS+=\ + xbmc/visualizations/OpenGLSpectrum \ +- xbmc/visualizations/WaveForm \ +- xbmc/visualizations/XBMCProjectM \ ++ xbmc/visualizations/WaveForm ++ ++ifneq (@DISABLE_XBMCPROJECTM@,1) ++VIS_DIRS+=xbmc/visualizations/XBMCProjectM ++endif + + endif + ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1)) diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-202-let_select_RSXS-0.1.patch new file mode 100644 index 0000000000..78553d6ca6 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-202-let_select_RSXS-0.1.patch @@ -0,0 +1,98 @@ +diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in +--- xbmc-pvr-3513480/configure.in 2011-04-25 04:31:28.000000000 +0200 ++++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 04:45:06.195606164 +0200 +@@ -68,6 +68,8 @@ + goom_disabled="== GOOM disabled. ==" + xbmcprojectm_enabled="== XBMCProjectM enabled. ==" + xbmxprojectm_disabled="== XBMCProjectM disabled. ==" ++rsxs_enabled="== RSXS enabled. ==" ++rsxs_disabled="== RSXS disabled. ==" + pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" + pulse_disabled="== PulseAudio support manually disabled. ==" + dvdcss_enabled="== DVDCSS support enabled. ==" +@@ -212,6 +214,12 @@ + [use_xbmcprojectm=$enableval], + [use_xbmcprojectm=yes]) + ++AC_ARG_ENABLE([rsxs], ++ [AS_HELP_STRING([--enable-rsxs], ++ [enable RSXS Screensaver (default is yes)])], ++ [use_rsxs=$enableval], ++ [use_rsxs=yes]) ++ + AC_ARG_ENABLE([ccache], + [AS_HELP_STRING([--enable-ccache], + [enable building with ccache feature (default is auto)])], +@@ -824,6 +832,15 @@ + DISABLE_XBMCPROJECTM=1 + fi + ++# RSXS ++if test "$use_rsxs" = "yes" && test "use_gl" == "yes"; then ++ AC_MSG_NOTICE($rsxs_enabled) ++ DISABLE_RSXS=0 ++else ++ AC_MSG_NOTICE($rsxs_disabled) ++ DISABLE_RSXS=1 ++fi ++ + # libRTMP + if test "$use_librtmp" != "no"; then + AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],, +@@ -1239,6 +1256,12 @@ + final_message="$final_message\n XBMCProjectM:\tNo" + fi + ++if test "$use_rsxs" = "yes"; then ++ final_message="$final_message\n RSXS:\t\tYes" ++else ++ final_message="$final_message\n RSXS:\t\tNo" ++fi ++ + if test "$use_libbluray" = "yes"; then + final_message="$final_message\n Bluray:\tYes" + else +@@ -1445,6 +1468,7 @@ + AC_SUBST(BUILD_DVDCSS) + AC_SUBST(DISABLE_GOOM) + AC_SUBST(DISABLE_XBMCPROJECTM) ++AC_SUBST(DISABLE_RSXS) + AC_SUBST(USE_EXTERNAL_FFMPEG) + AC_SUBST(PYTHON_VERSION) + AC_SUBST(OUTPUT_FILES) +@@ -1708,7 +1732,7 @@ + --disable-lattice \ + --disable-skyrocket + fi +-], [0]) ++], [$DISABLE_RSXS]) + + XB_CONFIG_MODULE([lib/libapetag], [ + ./configure \ +diff -Naur xbmc-pvr-3513480/Makefile.in xbmc-pvr-3513480.patch/Makefile.in +--- xbmc-pvr-3513480/Makefile.in 2011-04-25 04:23:50.000000000 +0200 ++++ xbmc-pvr-3513480.patch/Makefile.in 2011-04-25 04:40:31.819562758 +0200 +@@ -133,8 +133,10 @@ + lib/xbmc-dll-symbols \ + lib/jsoncpp/src/lib_json + +-SS_DIRS=\ +- xbmc/screensavers/rsxs-0.9/xbmc ++SS_DIRS= ++ifneq (@DISABLE_RSXS@,1) ++SS_DIRS=+xbmc/screensavers/rsxs-0.9/xbmc ++endif + + VIS_DIRS= + ifeq (@USE_OPENGL@,1) +@@ -421,8 +423,10 @@ + $(MAKE) -C xbmc/pvrclients/tvheadend + screensavers: exports + ifeq (@USE_OPENGL@,1) ++ifneq (@DISABLE_RSXS@,1) + $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc + endif ++endif + libaddon: exports + $(MAKE) -C lib/addons/library.xbmc.addon + $(MAKE) -C lib/addons/library.xbmc.gui diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-303-fix_libdvd_xFLAGS-0.1.patch new file mode 100644 index 0000000000..5e76acefe4 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-303-fix_libdvd_xFLAGS-0.1.patch @@ -0,0 +1,119 @@ +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdcss/src/libdvdcss.pc.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-04-25 05:01:20.091837122 +0200 +@@ -6,5 +6,5 @@ + Name: libdvdcss + Description: DVD access and decryption library. + Version: @VERSION@ +-Libs: -L${libdir} -ldvdcss +-Cflags: -I{includedir} -I${includedir}/@PACKAGE@ ++Libs: -ldvdcss ++Cflags: -I. +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh +--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-04-25 05:01:20.549828701 +0200 +@@ -56,17 +56,17 @@ + fi + + if test "$echo_cflags" = "yes"; then +- echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags ++ echo $dvdread_cflags $extracflags $threadcflags + fi + + if test "$echo_minicflags" = "yes"; then +- echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags ++ echo $extracflags $threadcflags + fi + + if test "$echo_libs" = "yes"; then +- echo -L$libdir -ldvdnav $dvdread_libs $threadlib ++ echo -ldvdnav $dvdread_libs $threadlib + fi + + if test "$echo_minilibs" = "yes"; then +- echo -L$libdir -ldvdnavmini $threadlib ++ echo -ldvdnavmini $threadlib + fi +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config.in 2011-04-25 05:01:20.624827321 +0200 +@@ -76,13 +76,13 @@ + fi + + if test "$echo_cflags" = "yes"; then +- echo -I@includedir@ -I@includedir@/libdvdread @THREAD_CFLAGS@ ++ echo @THREAD_CFLAGS@ + fi + + if test "$echo_libs" = "yes"; then +- echo -L@libdir@ -ldvdnav -ldvdread @THREAD_LIBS@ ++ echo -ldvdnav -ldvdread @THREAD_LIBS@ + fi + + if test "$echo_minilibs" = "yes"; then +- echo -L@libdir@ -ldvdnavmini @THREAD_LIBS@ ++ echo -ldvdnavmini @THREAD_LIBS@ + fi +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-04-25 05:01:21.042819641 +0200 +@@ -7,5 +7,5 @@ + Description: DVD Navigation mini library + Version: @VERSION@ + +-Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@ +-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@ ++Cflags: @DVDREAD_CFLAGS@ @THREAD_CFLAGS@ ++Libs: -ldvdnav @THREAD_LIBS@ +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav.pc.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-04-25 05:01:21.262815601 +0200 +@@ -8,5 +8,5 @@ + Version: @VERSION@ + + Requires.private: dvdread >= 4.1.2 +-Cflags: -I${includedir} @THREAD_CFLAGS@ +-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@ ++Cflags: @THREAD_CFLAGS@ ++Libs: -ldvdnav @THREAD_LIBS@ +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.in 2011-04-25 05:01:21.278815307 +0200 +@@ -72,9 +72,9 @@ + fi + + if test "$echo_cflags" = "yes"; then +- echo -I@includedir@ ++ echo "" + fi + + if test "$echo_libs" = "yes"; then +- echo -L@libdir@ -ldvdread ++ echo -ldvdread + fi +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.sh xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.sh +--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.sh 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.sh 2011-04-25 05:01:21.278815307 +0200 +@@ -48,9 +48,9 @@ + fi + + if test "$echo_cflags" = "yes"; then +- echo -I$prefix/include $extracflags ++ echo $extracflags + fi + + if test "$echo_libs" = "yes"; then +- echo -L$libdir $dvdreadlib ++ echo $dvdreadlib + fi +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread.pc.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread.pc.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread.pc.in 2011-04-25 05:01:21.279815289 +0200 +@@ -7,5 +7,5 @@ + Description: Low level DVD access library + Version: @VERSION@ + +-Cflags: -I${includedir} +-Libs: -L${libdir} -ldvdread ++Cflags: -I. ++Libs: -ldvdread diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-321-CrystalHD_use_yuy2_to_yv12-0.1.patch new file mode 100644 index 0000000000..f925e03246 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-321-CrystalHD_use_yuy2_to_yv12-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur xbmc-pvr-3513480/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-pvr-3513480.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp +--- xbmc-pvr-3513480/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-04-25 05:07:26.043098079 +0200 +@@ -771,7 +771,7 @@ + if (!pBuffer) + { + // No free pre-allocated buffers so make one +-#ifdef _WIN32 ++#if 1 + // force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability. + pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height); + #else diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-402-enable_yasm_in_ffmpeg-0.1.patch new file mode 100644 index 0000000000..b8f5b8afcf --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-402-enable_yasm_in_ffmpeg-0.1.patch @@ -0,0 +1,21 @@ +diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in +--- xbmc-pvr-3513480/configure.in 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 05:14:49.220848143 +0200 +@@ -885,6 +885,9 @@ + AC_MSG_NOTICE($external_ffmpeg_disabled) + USE_EXTERNAL_FFMPEG=0 + AC_DEFINE([PIX_FMT_VDPAU_MPEG4_IN_AVUTIL], [1], [Whether AVUtil defines PIX_FMT_VDPAU_MPEG4.]) ++ ++ # check for yasm ++ AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",) + fi + + # Python +@@ -1547,6 +1550,7 @@ + `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\ + `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\ + --target-os=$(tolower $(uname -s)) \ ++ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \ + --disable-muxers \ + --enable-muxer=spdif \ + --enable-muxer=adts \ diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-404-add_lame_check-0.6.patch new file mode 100644 index 0000000000..a459219108 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-404-add_lame_check-0.6.patch @@ -0,0 +1,125 @@ +diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in +--- xbmc-pvr-3513480/configure.in 2011-04-25 05:46:35.000000000 +0200 ++++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 05:50:02.982401390 +0200 +@@ -72,6 +72,8 @@ + rsxs_disabled="== RSXS disabled. ==" + pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" + pulse_disabled="== PulseAudio support manually disabled. ==" ++lame_not_found="== Could not find libmp3lame. LAME support disabled. ==" ++lame_disabled="== LAME support manually disabled. ==" + dvdcss_enabled="== DVDCSS support enabled. ==" + dvdcss_disabled="== DVDCSS support disabled. ==" + hal_not_found="== Could not find hal. HAL support disabled. ==" +@@ -244,6 +246,12 @@ + [use_ffmpeg_libvorbis=$enableval], + [use_ffmpeg_libvorbis=no]) + ++AC_ARG_ENABLE([lame], ++ [AS_HELP_STRING([--enable-lame], ++ [enable lame support (default is yes)])], ++ [use_lame=$enableval], ++ [use_lame=yes]) ++ + AC_ARG_ENABLE([dvdcss], + [AS_HELP_STRING([--enable-dvdcss], + [enable DVDCSS support (default is yes)])], +@@ -758,6 +766,20 @@ + USE_PULSE=0 + fi + ++# LAME ++if test "$use_lame" = "yes"; then ++ AC_CHECK_LIB([mp3lame], [main], ++ AC_DEFINE([HAVE_LIBMP3LAME], [1], [Define to 1 if you have the 'libmp3lame' library (-lmp3lame).]), ++ use_lame=no;AC_MSG_RESULT($lame_not_found)) ++else ++ AC_MSG_RESULT($lame_disabled) ++fi ++if test "$use_lame" = "yes"; then ++ AC_SUBST([HAVE_LIBMP3LAME], 1) ++else ++ AC_SUBST([HAVE_LIBMP3LAME], 0) ++fi ++ + # HAL + if test "$host_vendor" = "apple" ; then + use_hal="no" +@@ -1311,6 +1333,12 @@ + final_message="$final_message\n HAL Support:\tNo" + fi + ++if test "$use_lame" = "yes"; then ++ final_message="$final_message\n LAME:\t\tYes" ++else ++ final_message="$final_message\n LAME:\t\tNo" ++fi ++ + # DVDCSS + if test "$use_dvdcss" = "yes"; then + AC_MSG_NOTICE($dvdcss_enabled) +diff -Naur xbmc-pvr-3513480/configure.in.orig xbmc-pvr-3513480.patch/configure.in.orig +diff -Naur xbmc-pvr-3513480/Makefile.in.orig xbmc-pvr-3513480.patch/Makefile.in.orig +diff -Naur xbmc-pvr-3513480/xbmc/cdrip/CDDARipper.cpp xbmc-pvr-3513480.patch/xbmc/cdrip/CDDARipper.cpp +--- xbmc-pvr-3513480/xbmc/cdrip/CDDARipper.cpp 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/xbmc/cdrip/CDDARipper.cpp 2011-04-25 05:48:10.487548571 +0200 +@@ -27,7 +27,11 @@ + #include "CDDAReader.h" + #include "utils/StringUtils.h" + #include "Util.h" ++ ++#ifdef HAVE_LIBMP3LAME + #include "EncoderLame.h" ++#endif ++ + #include "EncoderWav.h" + #include "EncoderVorbis.h" + #include "EncoderFFmpeg.h" +@@ -78,9 +82,16 @@ + case CDDARIP_ENCODER_FLAC: + m_pEncoder = new CEncoderFlac(); + break; +- default: ++#ifdef HAVE_LIBMP3LAME ++ case CDDARIP_ENCODER_LAME: + m_pEncoder = new CEncoderLame(); + break; ++#else ++ default: ++ CLog::Log(LOGERROR,"invalid encoder selected"); ++ return false; ++ break; ++#endif + } + + // we have to set the tags before we init the Encoder +diff -Naur xbmc-pvr-3513480/xbmc/cdrip/Makefile.in xbmc-pvr-3513480.patch/xbmc/cdrip/Makefile.in +--- xbmc-pvr-3513480/xbmc/cdrip/Makefile.in 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/xbmc/cdrip/Makefile.in 2011-04-25 05:51:13.013064387 +0200 +@@ -3,10 +3,13 @@ + Encoder.cpp \ + EncoderFFmpeg.cpp \ + EncoderFlac.cpp \ +- EncoderLame.cpp \ + EncoderVorbis.cpp \ + EncoderWav.cpp \ + ++ifeq (@HAVE_LIBMP3LAME@,1) ++ SRCS+=EncoderLame.cpp ++endif ++ + LIB=cdrip.a + + include @abs_top_srcdir@/Makefile.include +diff -Naur xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp +--- xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp 2011-04-25 05:47:12.000000000 +0200 ++++ xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp 2011-04-25 05:48:47.956833472 +0200 +@@ -324,7 +324,9 @@ + AddPath(acd,"audiocds.recordingpath",20000,"select writable folder",BUTTON_CONTROL_PATH_INPUT,false,657); + AddString(acd, "audiocds.trackpathformat", 13307, "%A - %B/[%N. ][%A - ]%T", EDIT_CONTROL_INPUT, false, 16016); + map encoders; ++#ifdef HAVE_LIBMP3LAME + encoders.insert(make_pair(34000,CDDARIP_ENCODER_LAME)); ++#endif + encoders.insert(make_pair(34001,CDDARIP_ENCODER_VORBIS)); + encoders.insert(make_pair(34002,CDDARIP_ENCODER_WAV)); + encoders.insert(make_pair(34005,CDDARIP_ENCODER_FLAC)); diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-452-change_lcd_content-0.1.patch similarity index 55% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-452-change_lcd_content-0.1.patch index d9c54b3756..0427b534f9 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-452-change_lcd_content-0.1.patch @@ -1,12 +1,12 @@ -diff -Naur xbmc-29490/userdata/LCD.xml xbmc-29490.patch/userdata/LCD.xml ---- xbmc-29490/userdata/LCD.xml 2010-04-24 22:42:45.000000000 +0200 -+++ xbmc-29490.patch/userdata/LCD.xml 2010-04-27 17:26:02.946045110 +0200 +diff -Naur xbmc-pvr-3513480/userdata/LCD.xml xbmc-pvr-3513480.patch/userdata/LCD.xml +--- xbmc-pvr-3513480/userdata/LCD.xml 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/userdata/LCD.xml 2011-04-25 05:27:34.956125133 +0200 @@ -21,7 +21,7 @@ Freemem: $INFO[System.FreeMemory] - XBMC running... -+ *** OpenELEC.tv *** ++ *** OpenELEC *** $INFO[System.Time] $INFO[System.Date] Freemem: $INFO[System.FreeMemory] $INFO[System.ScreenWidth]x$INFO[System.ScreenHeight] $INFO[System.ScreenMode] diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-453-ps3_remote_be_more_quiet-0.1.patch similarity index 72% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-453-ps3_remote_be_more_quiet-0.1.patch index 4bbd0f3b1f..6b2f879e1c 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-453-ps3_remote_be_more_quiet-0.1.patch @@ -1,6 +1,6 @@ -diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py xbmc-dharma-33971.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py ---- xbmc-dharma-33971/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2010-09-19 14:54:08.000000000 +0200 -+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2010-09-25 22:30:55.174281890 +0200 +diff -Naur xbmc-pvr-3513480/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py xbmc-pvr-3513480.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py +--- xbmc-pvr-3513480/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-04-25 05:30:03.870260596 +0200 @@ -59,9 +59,6 @@ target_connected = False target_address = None diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 76% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-462-add_remote_irtrans_mediacenter-0.1.patch index 2b969b601e..0edef5a7a5 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-462-add_remote_irtrans_mediacenter-0.1.patch @@ -1,9 +1,9 @@ -diff -Naur xbmc-29490/system/Lircmap.xml xbmc-29490.patch/system/Lircmap.xml ---- xbmc-29490/system/Lircmap.xml 2010-04-24 22:45:26.000000000 +0200 -+++ xbmc-29490.patch/system/Lircmap.xml 2010-04-28 22:00:13.734656322 +0200 -@@ -362,4 +362,48 @@ - recordlist - teletext +diff -Naur xbmc-pvr-3513480/system/Lircmap.xml xbmc-pvr-3513480.patch/system/Lircmap.xml +--- xbmc-pvr-3513480/system/Lircmap.xml 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/system/Lircmap.xml 2011-04-25 05:31:39.632429078 +0200 +@@ -409,4 +409,48 @@ + KEY_YELLOW + KEY_BLUE + + pause diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-463-add_remote_devinput-0.1.patch similarity index 86% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-463-add_remote_devinput-0.1.patch index 8b0ef3b6b2..5c42a38424 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-463-add_remote_devinput-0.1.patch @@ -1,7 +1,7 @@ -diff -Naur xbmc-dharma-35248/system/Lircmap.xml xbmc-dharma-35248.patch/system/Lircmap.xml ---- xbmc-dharma-35248/system/Lircmap.xml 2010-11-12 13:25:11.464538074 +0100 -+++ xbmc-dharma-35248.patch/system/Lircmap.xml 2010-11-12 13:26:26.486568902 +0100 -@@ -365,7 +365,6 @@ +diff -Naur xbmc-pvr-3513480/system/Lircmap.xml xbmc-pvr-3513480.patch/system/Lircmap.xml +--- xbmc-pvr-3513480/system/Lircmap.xml 2011-04-25 05:32:22.105621042 +0200 ++++ xbmc-pvr-3513480.patch/system/Lircmap.xml 2011-04-25 05:32:42.799227308 +0200 +@@ -366,7 +366,6 @@ cx23885_remote @@ -9,7 +9,7 @@ diff -Naur xbmc-dharma-35248/system/Lircmap.xml xbmc-dharma-35248.patch/system/L KEY_LEFT KEY_RIGHT KEY_UP -@@ -452,4 +451,57 @@ +@@ -453,4 +452,57 @@ yellow blue diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-901-advancedsettings_alwaysextractflags.patch similarity index 60% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-901-advancedsettings_alwaysextractflags.patch index de16d8ec29..126207b081 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-3513480-901-advancedsettings_alwaysextractflags.patch @@ -1,7 +1,7 @@ -diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/GUISettings.cpp ---- xbmc-dharma-35003/xbmc/GUISettings.cpp 2010-10-25 15:36:18.000000000 +0200 -+++ xbmc-dharma-35003.patch/xbmc/GUISettings.cpp 2010-10-25 23:34:14.131974258 +0200 -@@ -618,6 +618,7 @@ +diff -Naur xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp +--- xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp 2011-04-25 05:34:56.319686149 +0200 +@@ -651,6 +651,7 @@ AddInt(vid, "myvideos.selectaction", 22079, SELECT_ACTION_PLAY_OR_RESUME, SELECT_ACTION_CHOOSE, 1, SELECT_ACTION_INFO, SPIN_CONTROL_TEXT); AddBool(NULL, "myvideos.treatstackasfile", 20051, true); AddBool(vid, "myvideos.extractflags",20433, true); @@ -9,10 +9,10 @@ diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/G AddBool(vid, "myvideos.cleanstrings", 20418, false); AddBool(NULL, "myvideos.extractthumb",20433, true); -diff -Naur xbmc-dharma-35003/xbmc/ThumbLoader.cpp xbmc-dharma-35003.patch/xbmc/ThumbLoader.cpp ---- xbmc-dharma-35003/xbmc/ThumbLoader.cpp 2010-10-25 15:37:06.000000000 +0200 -+++ xbmc-dharma-35003.patch/xbmc/ThumbLoader.cpp 2010-10-25 23:34:04.223857821 +0200 -@@ -148,7 +148,7 @@ +diff -Naur xbmc-pvr-3513480/xbmc/ThumbLoader.cpp xbmc-pvr-3513480.patch/xbmc/ThumbLoader.cpp +--- xbmc-pvr-3513480/xbmc/ThumbLoader.cpp 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/xbmc/ThumbLoader.cpp 2011-04-25 05:34:56.320686130 +0200 +@@ -146,7 +146,7 @@ m_item.SetThumbnailImage(m_target); } } diff --git a/tools/mkpkg/mkpkg_xbmc-pvr b/tools/mkpkg/mkpkg_xbmc-pvr index 0905ff010e..de983197d1 100755 --- a/tools/mkpkg/mkpkg_xbmc-pvr +++ b/tools/mkpkg/mkpkg_xbmc-pvr @@ -19,59 +19,58 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ +PKG_NAME="xbmc-pvr" +GIT_REPO="-b pvr-ppa git://github.com/opdenkamp/xbmc.git" +DEST_DIR="$PKG_NAME" + echo "getting sources..." - svn co http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2 xbmc-pvr-latest + if [ ! -d $DEST_DIR-latest ]; then + git clone $GIT_REPO $DEST_DIR-latest + fi + + cd $DEST_DIR-latest + git pull echo "getting version..." - cd xbmc-pvr-latest - SVN_REV=`LANG=C svn info 2>/dev/null | grep Rev: | sed -e 's/.*\: //'` - echo $SVN_REV + GIT_REV=`git log -n1 --format=%h` + echo $GIT_REV cd .. echo "copying sources..." - rm -rf xbmc-pvr-$SVN_REV - cp -R xbmc-pvr-latest xbmc-pvr-$SVN_REV - echo "$SVN_REV" > xbmc-pvr-$SVN_REV/svn.version + rm -rf $PKG_NAME-$GIT_REV + cp -R $DEST_DIR-latest $PKG_NAME-$GIT_REV + echo "$GIT_REV" > $PKG_NAME-$GIT_REV/git.version echo "cleaning sources..." - find xbmc-pvr-$SVN_REV -name .svn -exec rm -rf {} ";" + rm -rf $PKG_NAME-$GIT_REV/.git echo "seperating theme..." - rm -rf xbmc-pvr-theme-Confluence-$SVN_REV - mv xbmc-pvr-$SVN_REV/addons/skin.confluence xbmc-pvr-theme-Confluence-$SVN_REV + rm -rf $PKG_NAME-theme-Confluence-$GIT_REV + mv $PKG_NAME-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$GIT_REV echo "cleaning sources..." - rm -rf xbmc-pvr-$SVN_REV/visualisations - rm -rf xbmc-pvr-$SVN_REV/lib/libSDL-* - rm -rf xbmc-pvr-$SVN_REV/lib/libcurl-* - rm -rf xbmc-pvr-$SVN_REV/project + rm -rf $PKG_NAME-$GIT_REV/visualisations + rm -rf $PKG_NAME-$GIT_REV/lib/libSDL-* + rm -rf $PKG_NAME-$GIT_REV/lib/libcurl-* + rm -rf $PKG_NAME-$GIT_REV/project for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \ "PackageMaker" "Translator" "XBMCLive" "XprPack" \ "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do - rm -rf xbmc-pvr-$SVN_REV/tools/$i + rm -rf $PKG_NAME-$GIT_REV/tools/$i done for i in dll a lib so bat; do - find xbmc-pvr-$SVN_REV -name *.$i -exec rm -rf {} ";" - done - - # remove bundled libraries (including zlib and OSX), saves space and forces using external versions - for i in cximage-6.0/zlib libid3tag/zlib zlib - do - rm -rf xbmc-pvr-$SVN_REV/xbmc/lib/$i + find $PKG_NAME-$GIT_REV -name *.$i -exec rm -rf {} ";" done # bundled win32 binaries - rm -r xbmc-pvr-$SVN_REV/xbmc/visualizations/XBMCProjectM/win32 - - # remove various headers - rm xbmc-pvr-$SVN_REV/xbmc/FileSystem/zlib.h + rm -r $PKG_NAME-$GIT_REV/xbmc/visualizations/XBMCProjectM/win32 echo "packing sources..." - tar cvjf xbmc-pvr-$SVN_REV.tar.bz2 xbmc-pvr-$SVN_REV - tar cvjf xbmc-pvr-theme-Confluence-$SVN_REV.tar.bz2 xbmc-pvr-theme-Confluence-$SVN_REV + tar cvjf $PKG_NAME-$GIT_REV.tar.bz2 $PKG_NAME-$GIT_REV + tar cvjf $PKG_NAME-theme-Confluence-$GIT_REV.tar.bz2 $PKG_NAME-theme-Confluence-$GIT_REV echo "remove temporary sourcedir..." - rm -rf xbmc-pvr-$SVN_REV - rm -rf xbmc-pvr-theme-Confluence-$SVN_REV + rm -rf $PKG_NAME-$GIT_REV + rm -rf $PKG_NAME-theme-Confluence-$GIT_REV