From cf9a61d0b278037ccaffe0d9aa31a2715dab4dd4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 26 Apr 2011 21:23:23 +0200 Subject: [PATCH] xbmc: update to xbmc-04e78f4 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/build | 14 +- packages/mediacenter/xbmc/meta | 2 +- ...-add_support_to_specify_GIT_REV-0.1.patch} | 21 +- ...4e78f4-101-strip_confluence_skin-0.1.patch | 42 ++ ...78f4-201-let_select_XBMCProjectM-0.1.patch | 88 ++++ ...xbmc-04e78f4-202-let_select_RSXS-0.1.patch | 98 +++++ ...mc-04e78f4-303-fix_libdvd_xFLAGS-0.1.patch | 119 ++++++ ...4-321-CrystalHD_use_yuy2_to_yv12-0.1.patch | 12 + ...e78f4-402-enable_yasm_in_ffmpeg-0.1.patch} | 23 +- ...xbmc-04e78f4-404-add_lame_check-0.6.patch} | 59 +-- ...-04e78f4-452-change_lcd_content-0.1.patch} | 6 +- ...f4-453-ps3_remote_be_more_quiet-0.1.patch} | 6 +- ...-add_remote_irtrans_mediacenter-0.1.patch} | 8 +- ...04e78f4-463-add_remote_devinput-0.1.patch} | 10 +- ...advancedsettings_alwaysextractflags.patch} | 16 +- .../xbmc-10.1-Dharma-002-arm_fixes-0.1.patch | 56 --- ....1-Dharma-011-add_xbmcvfs_module-0.1.patch | 354 ---------------- ...add_addon_service_script_support-0.1.patch | 390 ------------------ ...arma-201-let_select_XBMCProjectM-0.1.patch | 97 ----- ...-10.1-Dharma-202-let_select_RSXS-0.1.patch | 98 ----- ...1-Dharma-301-correct_lzo_include-0.1.patch | 28 -- ...ma-302-dont_hardcode_usr_include-0.1.patch | 29 -- ...rma-303-WiiRemote_crosscompiling-0.1.patch | 53 --- ...0.1-Dharma-303-fix_libdvd_xFLAGS-0.1.patch | 119 ------ ...a-321-CrystalHD_use_yuy2_to_yv12-0.1.patch | 12 - ...rma-401-we_dont_need_libXinerama-0.1.patch | 13 - ..._only_needed_for_internal_python-0.1.patch | 21 - ...10.1-Dharma-405-fix_vorbis_cdrip-0.1.patch | 12 - ...mc-10.1-Dharma-406-gcc-4.6-fixes-0.1.patch | 97 ----- ...xbmc-10.1-Dharma-451-full_splash-0.1.patch | 16 - ...ttings_videolibrary.flattenmoviesets.patch | 23 -- 31 files changed, 442 insertions(+), 1500 deletions(-) rename packages/mediacenter/xbmc/patches/{xbmc-10.1-Dharma-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-04e78f4-001-add_support_to_specify_GIT_REV-0.1.patch} (55%) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-04e78f4-101-strip_confluence_skin-0.1.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-04e78f4-201-let_select_XBMCProjectM-0.1.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-04e78f4-202-let_select_RSXS-0.1.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-04e78f4-303-fix_libdvd_xFLAGS-0.1.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-04e78f4-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename packages/mediacenter/xbmc/patches/{xbmc-10.1-Dharma-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-04e78f4-402-enable_yasm_in_ffmpeg-0.1.patch} (55%) rename packages/mediacenter/xbmc/patches/{xbmc-10.1-Dharma-404-add_lame_check-0.6.patch => xbmc-04e78f4-404-add_lame_check-0.6.patch} (61%) rename packages/mediacenter/xbmc/patches/{xbmc-10.1-Dharma-452-change_lcd_content-0.1.patch => xbmc-04e78f4-452-change_lcd_content-0.1.patch} (58%) rename packages/mediacenter/xbmc/patches/{xbmc-10.1-Dharma-452-ps3_remote_be_more_quiet-0.1.patch => xbmc-04e78f4-453-ps3_remote_be_more_quiet-0.1.patch} (71%) rename packages/mediacenter/xbmc/patches/{xbmc-10.1-Dharma-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-04e78f4-462-add_remote_irtrans_mediacenter-0.1.patch} (78%) rename packages/mediacenter/xbmc/patches/{xbmc-10.1-Dharma-463-add_remote_devinput-0.1.patch => xbmc-04e78f4-463-add_remote_devinput-0.1.patch} (85%) rename packages/mediacenter/xbmc/patches/{xbmc-10.1-Dharma-901-advancedsettings_alwaysextractflags.patch => xbmc-04e78f4-901-advancedsettings_alwaysextractflags.patch} (59%) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-002-arm_fixes-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-011-add_xbmcvfs_module-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-012-add_addon_service_script_support-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-201-let_select_XBMCProjectM-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-202-let_select_RSXS-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-301-correct_lzo_include-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-302-dont_hardcode_usr_include-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-303-WiiRemote_crosscompiling-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-303-fix_libdvd_xFLAGS-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-401-we_dont_need_libXinerama-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-403-openssl_only_needed_for_internal_python-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-405-fix_vorbis_cdrip-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-406-gcc-4.6-fixes-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-451-full_splash-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-902-advancedsettings_videolibrary.flattenmoviesets.patch diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 6687d74c8b..c7ef6fa44f 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -105,11 +105,13 @@ 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 +# order matters with libdvd and friends +[ -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 \ @@ -154,7 +156,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/meta b/packages/mediacenter/xbmc/meta index 9a28ef04b3..ae8fd4a8c3 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="10.1-Dharma" +PKG_VERSION="04e78f4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 55% rename from packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-04e78f4-001-add_support_to_specify_GIT_REV-0.1.patch index 0845395f43..89a229d0d0 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-001-add_support_to_specify_GIT_REV-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-001-add_support_to_specify_GIT_REV-0.1.patch @@ -1,23 +1,22 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in ---- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 13:30:17.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 19:08:46.445385047 +0100 -@@ -387,6 +387,15 @@ - AC_MSG_ERROR(unsupported host ($host)) +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 rev-parse --short HEAD) ++ 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" - if test "$use_profiling" = "yes"; then -@@ -1097,7 +1106,6 @@ +@@ -1090,7 +1098,6 @@ fi fi @@ -25,12 +24,12 @@ diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/ # Checks for header files. AC_HEADER_DIRENT -@@ -1282,12 +1290,6 @@ +@@ -1279,12 +1286,6 @@ final_message="$final_message\n Avahi:\tNo" fi -if test "$HAVE_GIT" = "yes"; then -- GIT_REV=$(git rev-parse --short HEAD) +- 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" diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-101-strip_confluence_skin-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-101-strip_confluence_skin-0.1.patch new file mode 100644 index 0000000000..3a3e396bbb --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-101-strip_confluence_skin-0.1.patch @@ -0,0 +1,42 @@ +diff -Naur xbmc-04e78f4/configure.in xbmc-04e78f4.patch/configure.in +--- xbmc-04e78f4/configure.in 2011-04-26 19:38:51.000000000 +0200 ++++ xbmc-04e78f4.patch/configure.in 2011-04-26 19:58:01.520765916 +0200 +@@ -1344,7 +1344,6 @@ + + OUTPUT_FILES="Makefile \ + Makefile.include \ +- addons/skin.confluence/media/Makefile \ + xbmc/Makefile \ + xbmc/cdrip/Makefile \ + xbmc/cores/Makefile \ +diff -Naur xbmc-04e78f4/Makefile.in xbmc-04e78f4.patch/Makefile.in +--- xbmc-04e78f4/Makefile.in 2011-04-26 19:38:51.000000000 +0200 ++++ xbmc-04e78f4.patch/Makefile.in 2011-04-26 19:58:43.768901469 +0200 +@@ -144,13 +144,8 @@ + + endif + +-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) $(SKIN_DIRS) ++ $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) + + LIBS=@LIBS@ + CFLAGS=@CFLAGS@ +@@ -187,12 +182,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/patches/xbmc-04e78f4-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-201-let_select_XBMCProjectM-0.1.patch new file mode 100644 index 0000000000..6372b9e3b0 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-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/patches/xbmc-04e78f4-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-202-let_select_RSXS-0.1.patch new file mode 100644 index 0000000000..f99916b95d --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-202-let_select_RSXS-0.1.patch @@ -0,0 +1,98 @@ +diff -Naur xbmc-04e78f4/configure.in xbmc-04e78f4.patch/configure.in +--- xbmc-04e78f4/configure.in 2011-04-26 20:01:52.765037011 +0200 ++++ xbmc-04e78f4.patch/configure.in 2011-04-26 20:02:20.083478775 +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)])], +@@ -816,6 +824,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],, +@@ -1232,6 +1249,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 +@@ -1439,6 +1462,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) +@@ -1702,7 +1726,7 @@ + --disable-lattice \ + --disable-skyrocket + fi +-], [0]) ++], [$DISABLE_RSXS]) + + XB_CONFIG_MODULE([lib/libapetag], [ + ./configure \ +diff -Naur xbmc-04e78f4/Makefile.in xbmc-04e78f4.patch/Makefile.in +--- xbmc-04e78f4/Makefile.in 2011-04-26 20:01:52.767036969 +0200 ++++ xbmc-04e78f4.patch/Makefile.in 2011-04-26 20:03:45.888725973 +0200 +@@ -125,8 +125,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) +@@ -377,8 +379,10 @@ + for d in $(VIS_DIRS); do $(MAKE) -C $$d; done + screensavers: exports + ifeq (@USE_OPENGL@,1) ++ifneq (@DISABLE_RSXS@,1) + $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc + endif ++endif + libpython: dllloader + $(MAKE) -C xbmc/interfaces/python + $(MAKE) -C xbmc/interfaces/python/xbmcmodule diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-303-fix_libdvd_xFLAGS-0.1.patch new file mode 100644 index 0000000000..5e76acefe4 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-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/patches/xbmc-04e78f4-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-321-CrystalHD_use_yuy2_to_yv12-0.1.patch new file mode 100644 index 0000000000..f925e03246 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-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/patches/xbmc-10.1-Dharma-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 55% rename from packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-04e78f4-402-enable_yasm_in_ffmpeg-0.1.patch index 0aa08ea17d..b8f5b8afcf 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-402-enable_yasm_in_ffmpeg-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-402-enable_yasm_in_ffmpeg-0.1.patch @@ -1,18 +1,17 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in ---- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:17:38.576806450 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:22:07.235423909 +0100 -@@ -914,6 +914,10 @@ - AC_LANG_POP([C++]) - fi - CPPFLAGS="$SAVE_CPPFLAGS" +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",) -+ - else - AC_MSG_NOTICE($external_ffmpeg_disabled) - USE_EXTERNAL_FFMPEG=0 -@@ -1688,6 +1692,7 @@ + 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)) \ diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-404-add_lame_check-0.6.patch similarity index 61% rename from packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-04e78f4-404-add_lame_check-0.6.patch index a51a41d4c7..a459219108 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-404-add_lame_check-0.6.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-404-add_lame_check-0.6.patch @@ -1,18 +1,18 @@ -diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in ---- xbmc-10.1-Dharma/configure.in 2011-03-08 02:49:24.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/configure.in 2011-03-26 05:56:44.077454237 +0100 -@@ -69,6 +69,8 @@ +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. ==" - faac_not_found="== Could not find libfaac. FAAC support disabled. ==" - faac_disabled="== FAAC 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. ==" -@@ -234,6 +236,12 @@ - [use_faac=$enableval], - [use_faac=yes]) +@@ -244,6 +246,12 @@ + [use_ffmpeg_libvorbis=$enableval], + [use_ffmpeg_libvorbis=no]) +AC_ARG_ENABLE([lame], + [AS_HELP_STRING([--enable-lame], @@ -23,8 +23,8 @@ diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in AC_ARG_ENABLE([dvdcss], [AS_HELP_STRING([--enable-dvdcss], [enable DVDCSS support (default is yes)])], -@@ -747,6 +755,20 @@ - fi +@@ -758,6 +766,20 @@ + USE_PULSE=0 fi +# LAME @@ -44,8 +44,8 @@ diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in # HAL if test "$host_vendor" = "apple" ; then use_hal="no" -@@ -1262,6 +1284,12 @@ - final_message="$final_message\n FAAC:\t\tNo" +@@ -1311,6 +1333,12 @@ + final_message="$final_message\n HAL Support:\tNo" fi +if test "$use_lame" = "yes"; then @@ -57,12 +57,14 @@ diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in # DVDCSS if test "$use_dvdcss" = "yes"; then AC_MSG_NOTICE($dvdcss_enabled) -diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/CDDARipper.cpp xbmc-10.1-Dharma.patch/xbmc/cdrip/CDDARipper.cpp ---- xbmc-10.1-Dharma/xbmc/cdrip/CDDARipper.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/cdrip/CDDARipper.cpp 2011-03-26 04:56:03.594891023 +0100 +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 "StringUtils.h" + #include "utils/StringUtils.h" #include "Util.h" + +#ifdef HAVE_LIBMP3LAME @@ -72,7 +74,7 @@ diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/CDDARipper.cpp xbmc-10.1-Dharma.patch/xbm #include "EncoderWav.h" #include "EncoderVorbis.h" #include "EncoderFFmpeg.h" -@@ -77,9 +81,16 @@ +@@ -78,9 +82,16 @@ case CDDARIP_ENCODER_FLAC: m_pEncoder = new CEncoderFlac(); break; @@ -90,17 +92,16 @@ diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/CDDARipper.cpp xbmc-10.1-Dharma.patch/xbm } // we have to set the tags before we init the Encoder -diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/Makefile.in xbmc-10.1-Dharma.patch/xbmc/cdrip/Makefile.in ---- xbmc-10.1-Dharma/xbmc/cdrip/Makefile.in 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/cdrip/Makefile.in 2011-03-26 04:55:12.286896848 +0100 -@@ -6,11 +6,14 @@ - CDDAReader.cpp \ +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 \ - EncoderFlac.cpp \ +ifeq (@HAVE_LIBMP3LAME@,1) + SRCS+=EncoderLame.cpp @@ -108,11 +109,11 @@ diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/Makefile.in xbmc-10.1-Dharma.patch/xbmc/c + LIB=cdrip.a - include ../../Makefile.include -diff -Naur xbmc-10.1-Dharma/xbmc/GUISettings.cpp xbmc-10.1-Dharma.patch/xbmc/GUISettings.cpp ---- xbmc-10.1-Dharma/xbmc/GUISettings.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/GUISettings.cpp 2011-03-26 04:55:12.288896808 +0100 -@@ -325,7 +325,9 @@ + 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; diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-452-change_lcd_content-0.1.patch similarity index 58% rename from packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-04e78f4-452-change_lcd_content-0.1.patch index 66da18041b..0427b534f9 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-452-change_lcd_content-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-452-change_lcd_content-0.1.patch @@ -1,6 +1,6 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/userdata/LCD.xml xbmc-Dharma-10.1-c8405db.patch/userdata/LCD.xml ---- xbmc-Dharma-10.1-c8405db/userdata/LCD.xml 2011-02-15 13:30:17.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/userdata/LCD.xml 2011-02-15 14:25:46.406031718 +0100 +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] diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-452-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-453-ps3_remote_be_more_quiet-0.1.patch similarity index 71% rename from packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-452-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-04e78f4-453-ps3_remote_be_more_quiet-0.1.patch index f955335196..6b2f879e1c 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-452-ps3_remote_be_more_quiet-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-453-ps3_remote_be_more_quiet-0.1.patch @@ -1,6 +1,6 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py ---- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-02-15 13:30:04.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-02-15 14:27:22.774100190 +0100 +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/patches/xbmc-10.1-Dharma-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 78% rename from packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-04e78f4-462-add_remote_irtrans_mediacenter-0.1.patch index 553afd86a0..0edef5a7a5 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-462-add_remote_irtrans_mediacenter-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-462-add_remote_irtrans_mediacenter-0.1.patch @@ -1,7 +1,7 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml ---- xbmc-Dharma-10.1-c8405db/system/Lircmap.xml 2011-02-15 13:30:17.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml 2011-02-15 14:28:14.180069773 +0100 -@@ -408,4 +408,48 @@ +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 diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-463-add_remote_devinput-0.1.patch similarity index 85% rename from packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-04e78f4-463-add_remote_devinput-0.1.patch index c88c658d86..5c42a38424 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-463-add_remote_devinput-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-463-add_remote_devinput-0.1.patch @@ -1,7 +1,7 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml ---- xbmc-Dharma-10.1-c8405db/system/Lircmap.xml 2011-02-15 14:28:59.646158376 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml 2011-02-15 14:29:58.387980799 +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-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db. KEY_LEFT KEY_RIGHT KEY_UP -@@ -452,4 +451,57 @@ +@@ -453,4 +452,57 @@ yellow blue diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-901-advancedsettings_alwaysextractflags.patch similarity index 59% rename from packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-04e78f4-901-advancedsettings_alwaysextractflags.patch index 6d4ddfd6c2..126207b081 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-901-advancedsettings_alwaysextractflags.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-04e78f4-901-advancedsettings_alwaysextractflags.patch @@ -1,7 +1,7 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp ---- xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp 2011-02-15 13:30:06.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp 2011-02-15 14:31:51.689709299 +0100 -@@ -617,6 +617,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-10.1-c8405db/xbmc/GUISettings.cpp xbmc-Dharma-10.1-c8405d AddBool(vid, "myvideos.cleanstrings", 20418, false); AddBool(NULL, "myvideos.extractthumb",20433, true); -diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/ThumbLoader.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/ThumbLoader.cpp ---- xbmc-Dharma-10.1-c8405db/xbmc/ThumbLoader.cpp 2011-02-15 13:30:05.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/ThumbLoader.cpp 2011-02-15 14:31:51.690709279 +0100 -@@ -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/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-002-arm_fixes-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-002-arm_fixes-0.1.patch deleted file mode 100644 index a5dd29e7ff..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-002-arm_fixes-0.1.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in ---- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 13:30:17.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-03-06 21:19:57.004648466 +0100 -@@ -448,30 +448,6 @@ - LIBS="$LIBS -framework CoreFoundation" - LIBS="$LIBS -framework DiskArbitration" - LIBS="$LIBS -framework ApplicationServices" --elif expr "X$host_cpu" : 'Xarm.*' > /dev/null; then -- use_arch=arm -- CFLAGS="$CFLAGS -mfloat-abi=softfp -mno-apcs-stack-check" -- CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp -mno-apcs-stack-check" -- FFMPEG_EXTRACFLAGS="-mfloat-abi=softfp" -- if test "$use_tegra" = "yes"; then -- # Compile for ARMv7a architecture, need to test gcc for vfpv3-d16 support -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="-mfpu=vfpv3-d16" -- AC_COMPILE_IFELSE( -- [int foo;], -- [ CFLAGS="$SAVE_CFLAGS -Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork" -- CXXFLAGS="$CXXFLAGS -Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork" -- FFMPEG_EXTRACFLAGS+=" -mtune=cortex-a9 -mfpu=vfpv3-d16" -- use_cpu=cortex-a9], -- [ CFLAGS="$SAVE_CFLAGS -Wa,-march=armv6 -mtune=cortex-a8 -mthumb-interwork" -- CXXFLAGS="$CXXFLAGS -Wa,-march=armv6 -mtune=cortex-a8 -mthumb-interwork" -- use_cpu=cortex-a8]) -- else -- # Compile for ARMv7a architecture, CortexA8 cpu and NEON coprocessor -- CFLAGS+=" -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad" -- CXXFLAGS+=" -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad" -- FFMPEG_EXTRACFLAGS+=" -mfpu=neon" -- fi - fi - - # Checks for library functions. -@@ -1646,6 +1622,7 @@ - --disable-static \ - `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ - `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \ -+ `if test -n "$host_alias"; then echo --cross-prefix="${host_alias}-"; fi`\ - `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)) \ -diff -Naur xbmc-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in ---- xbmc-Dharma-10.1-c8405db/Makefile.in 2011-02-15 13:30:17.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in 2011-03-04 19:52:52.500328225 +0100 -@@ -467,8 +467,8 @@ - xbmc/cores/DllLoader/exports/exports.a - - ifeq (arm, $(ARCH)) --# Force external python2.5 for now! --LIBS +=-lpython2.5 -+# Force external python2.6 for now! -+LIBS +=-lpython2.6 - endif - - xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-011-add_xbmcvfs_module-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-011-add_xbmcvfs_module-0.1.patch deleted file mode 100644 index d21e14f7f5..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-011-add_xbmcvfs_module-0.1.patch +++ /dev/null @@ -1,354 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/lib/libPython/xbmcmodule/Makefile xbmc-Dharma-10.1-c8405db.patch/xbmc/lib/libPython/xbmcmodule/Makefile ---- xbmc-Dharma-10.1-c8405db/xbmc/lib/libPython/xbmcmodule/Makefile 2011-02-15 13:30:06.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/lib/libPython/xbmcmodule/Makefile 2011-03-03 16:47:38.230032818 +0100 -@@ -1,8 +1,9 @@ - INCLUDES=-I../../../.. -I. -I../../../ -I../../../linux -I../../../../guilib -I../../../utils -I../../../cores -I../../../../lib/jsoncpp/jsoncpp/include - --SRCS=action.cpp controlbutton.cpp controlcheckmark.cpp control.cpp controlfadelabel.cpp controlimage.cpp controllabel.cpp controllist.cpp controlprogress.cpp controlslider.cpp controlspin.cpp controltextbox.cpp dialog.cpp GUIPythonWindow.cpp GUIPythonWindowDialog.cpp GUIPythonWindowXML.cpp GUIPythonWindowXMLDialog.cpp infotagmusic.cpp infotagvideo.cpp keyboard.cpp listitem.cpp player.cpp pyplaylist.cpp PythonPlayer.cpp pyutil.cpp window.cpp winxml.cpp winxmldialog.cpp xbmcguimodule.cpp xbmcmodule.cpp controlgroup.cpp xbmcplugin.cpp controlradiobutton.cpp PythonAddon.cpp xbmcaddonmodule.cpp -+SRCS=action.cpp controlbutton.cpp controlcheckmark.cpp control.cpp controlfadelabel.cpp controlimage.cpp controllabel.cpp controllist.cpp controlprogress.cpp controlslider.cpp controlspin.cpp controltextbox.cpp dialog.cpp GUIPythonWindow.cpp GUIPythonWindowDialog.cpp GUIPythonWindowXML.cpp GUIPythonWindowXMLDialog.cpp infotagmusic.cpp infotagvideo.cpp keyboard.cpp listitem.cpp player.cpp pyplaylist.cpp PythonPlayer.cpp pyutil.cpp window.cpp winxml.cpp winxmldialog.cpp xbmcguimodule.cpp xbmcmodule.cpp controlgroup.cpp xbmcplugin.cpp controlradiobutton.cpp PythonAddon.cpp xbmcaddonmodule.cpp xbmcvfsmodule.cpp - - LIB=xbmcmodule.a - - include ../../../../Makefile.include - -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS))) -+ -diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp ---- xbmc-Dharma-10.1-c8405db/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp 2011-02-15 13:30:06.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp 2011-03-03 16:47:38.257032286 +0100 -@@ -64,6 +64,7 @@ - #include "SectionLoader.h" - #include "Settings.h" - #include "LocalizeStrings.h" -+#include "utils/FileUtils.h" - - // include for constants - #include "pyutil.h" -@@ -958,6 +959,35 @@ - - return Py_BuildValue((char*)"b", exists); - } -+ -+ PyDoc_STRVAR(subHashAndFileSize__doc__, -+ "subHashAndFileSize(file)\n" -+ "\n" -+ "file : file to calculate subtitle hash and size for" -+ "\n" -+ "example:\n" -+ " size,hash = xbmcvfs.subHashAndFileSize(file)\n"); -+ PyObject* XBMC_subHashAndFileSize(PyObject *self, PyObject *args, PyObject *kwds) -+ { -+ PyObject *f_line; -+ if (!PyArg_ParseTuple( -+ args, -+ (char*)"O", -+ &f_line)) -+ { -+ return NULL; -+ } -+ CStdString strSource; -+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL; -+ -+ CStdString strSize; -+ CStdString strHash; -+ Py_BEGIN_ALLOW_THREADS -+ CFileUtils::SubtitleFileSizeAndHash(strSource, strSize, strHash); -+ Py_END_ALLOW_THREADS -+ -+ return Py_BuildValue((char*)"ss",strSize.c_str(), strHash.c_str()); -+ } - - // define c functions to be used in python here - PyMethodDef xbmcMethods[] = { -@@ -1005,6 +1035,8 @@ - {(char*)"getCleanMovieTitle", (PyCFunction)XBMC_GetCleanMovieTitle, METH_VARARGS|METH_KEYWORDS, getCleanMovieTitle__doc__}, - - {(char*)"skinHasImage", (PyCFunction)XBMC_SkinHasImage, METH_VARARGS|METH_KEYWORDS, skinHasImage__doc__}, -+ {(char*)"subHashAndFileSize", (PyCFunction)XBMC_subHashAndFileSize, METH_VARARGS, subHashAndFileSize__doc__}, -+ - {NULL, NULL, 0, NULL} - }; - -diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp ---- xbmc-Dharma-10.1-c8405db/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp 2011-03-03 16:53:19.588294319 +0100 -@@ -0,0 +1,205 @@ -+/* -+ * Copyright (C) 2005-2011 Team XBMC -+ * http://www.xbmc.org -+ * -+ * This Program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This Program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with XBMC; see the file COPYING. If not, write to -+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -+ * http://www.gnu.org/copyleft/gpl.html -+ * -+ */ -+ -+#include "system.h" -+#if (defined USE_EXTERNAL_PYTHON) -+#if (defined HAVE_LIBPYTHON2_6) -+#include -+#elif (defined HAVE_LIBPYTHON2_5) -+#include -+#elif (defined HAVE_LIBPYTHON2_4) -+#include -+#else -+#error "Could not determine version of Python to use." -+#endif -+#else -+#include "python/Include/Python.h" -+#endif -+#include "../XBPythonDll.h" -+ -+#include "FileSystem/File.h" -+#include "pyutil.h" -+ -+using namespace std; -+using namespace XFILE; -+using namespace PYXBMC; -+ -+#ifndef __GNUC__ -+#pragma code_seg("PY_TEXT") -+#pragma data_seg("PY_DATA") -+#pragma bss_seg("PY_BSS") -+#pragma const_seg("PY_RDATA") -+#endif -+ -+#if defined(__GNUG__) && (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=2) -+#pragma GCC diagnostic ignored "-Wstrict-aliasing" -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+ namespace xbmcvfs -+ { -+ /***************************************************************** -+ * start of xbmcvfs methods -+ *****************************************************************/ -+ typedef struct { -+ PyObject_HEAD -+ CFile* pFile; -+ } File; -+ -+ // copy() method -+ PyDoc_STRVAR(copy__doc__, -+ "copy(source, destination) -- copy file to destination, returns true/false.\n" -+ "\n" -+ "source : file to copy.\n" -+ "destination : destination file" -+ "\n" -+ "example:\n" -+ " success = xbmcvfs.copy(source, destination)\n"); -+ -+ PyObject* vfs_copy(PyObject *self, PyObject *args) -+ { -+ PyObject *f_line; -+ PyObject *d_line; -+ if (!PyArg_ParseTuple( -+ args, -+ (char*)"OO", -+ &f_line, -+ &d_line)) -+ { -+ return NULL; -+ } -+ CStdString strSource; -+ CStdString strDestnation; -+ bool bResult = true; -+ -+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL; -+ if (!PyXBMCGetUnicodeString(strDestnation, d_line, 1)) return NULL; -+ Py_BEGIN_ALLOW_THREADS -+ bResult = CFile::Cache(strSource, strDestnation); -+ Py_END_ALLOW_THREADS -+ -+ return Py_BuildValue((char*)"b", bResult); -+ } -+ PyDoc_STRVAR(delete__doc__, -+ "delete(file)\n" -+ "\n" -+ "file : file to delete" -+ "\n" -+ "example:\n" -+ " xbmcvfs.delete(file)\n"); -+ -+ // delete a file -+ PyObject* vfs_delete(File *self, PyObject *args, PyObject *kwds) -+ { -+ PyObject *f_line; -+ if (!PyArg_ParseTuple( -+ args, -+ (char*)"O", -+ &f_line)) -+ { -+ return NULL; -+ } -+ CStdString strSource; -+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL; -+ -+ Py_BEGIN_ALLOW_THREADS -+ self->pFile->Delete(strSource); -+ Py_END_ALLOW_THREADS -+ -+ Py_INCREF(Py_None); -+ return Py_None; -+ -+ } -+ -+ PyDoc_STRVAR(rename__doc__, -+ "rename(file, newFileName)\n" -+ "\n" -+ "file : file to reaname" -+ "newFileName : new filename, including the full path" -+ "\n" -+ "example:\n" -+ " success = xbmcvfs.rename(file,newFileName)\n"); -+ -+ // rename a file -+ PyObject* vfs_rename(File *self, PyObject *args, PyObject *kwds) -+ { -+ PyObject *f_line; -+ PyObject *d_line; -+ if (!PyArg_ParseTuple( -+ args, -+ (char*)"OO", -+ &f_line, -+ &d_line)) -+ { -+ return NULL; -+ } -+ CStdString strSource; -+ CStdString strDestnation; -+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL; -+ if (!PyXBMCGetUnicodeString(strDestnation, d_line, 1)) return NULL; -+ -+ bool bResult; -+ Py_BEGIN_ALLOW_THREADS -+ bResult = self->pFile->Rename(strSource,strDestnation); -+ Py_END_ALLOW_THREADS -+ -+ return Py_BuildValue((char*)"b", bResult); -+ -+ } -+ -+ -+ // define c functions to be used in python here -+ PyMethodDef xbmcvfsMethods[] = { -+ {(char*)"copy", (PyCFunction)vfs_copy, METH_VARARGS, copy__doc__}, -+ {(char*)"delete", (PyCFunction)vfs_delete, METH_VARARGS, delete__doc__}, -+ {(char*)"rename", (PyCFunction)vfs_rename, METH_VARARGS, rename__doc__}, -+ {NULL, NULL, 0, NULL} -+ }; -+ -+ /***************************************************************** -+ * end of methods and python objects -+ * initxbmc(void); -+ *****************************************************************/ -+ -+ -+ PyMODINIT_FUNC -+ DeinitVFSModule() -+ { -+ // no need to Py_DECREF our objects (see InitXBMCMVFSModule()) as they were created only -+ // so that they could be added to the module, which steals a reference. -+ } -+ -+ PyMODINIT_FUNC -+ InitVFSModule() -+ { -+ // init general xbmc modules -+ PyObject* pXbmcvfsModule; -+ pXbmcvfsModule = Py_InitModule((char*)"xbmcvfs", xbmcvfsMethods); -+ if (pXbmcvfsModule == NULL) return; -+ } -+ } -+ -+#ifdef __cplusplus -+} -+#endif -diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/lib/libPython/XBPython.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/lib/libPython/XBPython.cpp ---- xbmc-Dharma-10.1-c8405db/xbmc/lib/libPython/XBPython.cpp 2011-02-15 13:30:09.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/lib/libPython/XBPython.cpp 2011-03-03 16:47:38.270032028 +0100 -@@ -119,6 +119,8 @@ - void InitAddonModule(void); - void InitAddonTypes(void); - void DeinitAddonModule(void); -+ void InitVFSModule(void); -+ void DeinitVFSModule(void); - } - - XBPython::XBPython() -@@ -297,7 +299,8 @@ - InitPluginModule(); // init xbmcplugin modules - InitGUIModule(); // init xbmcgui modules - InitAddonModule(); // init xbmcaddon modules -- -+ InitVFSModule(); // init xbmcvfs modules -+ - // redirecting default output to debug console - if (PyRun_SimpleString("" - "import xbmc\n" -@@ -325,6 +328,7 @@ - DeinitPluginModule(); - DeinitGUIModule(); - DeinitAddonModule(); -+ DeinitVFSModule(); - } - - /** -diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/utils/FileUtils.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/utils/FileUtils.cpp ---- xbmc-Dharma-10.1-c8405db/xbmc/utils/FileUtils.cpp 2011-02-15 13:30:05.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/utils/FileUtils.cpp 2011-03-03 16:47:38.279031851 +0100 -@@ -72,3 +72,32 @@ - } - return false; - } -+ -+bool CFileUtils::SubtitleFileSizeAndHash(const CStdString &path, CStdString &strSize, CStdString &strHash) -+{ -+ const size_t chksum_block_size = 8192; -+ -+ CFile file; -+ size_t i; -+ uint64_t hash = 0; -+ uint64_t buffer1[chksum_block_size*2]; -+ uint64_t fileSize ; -+ // In natural language it calculates: size + 64k chksum of the first and last 64k -+ // (even if they overlap because the file is smaller than 128k). -+ file.Open(path, READ_NO_CACHE); //open file -+ file.Read(buffer1, chksum_block_size*sizeof(uint64_t)); //read first 64k -+ file.Seek(-(int64_t)chksum_block_size*sizeof(uint64_t), SEEK_END); //seek to the end of the file -+ file.Read(&buffer1[chksum_block_size], chksum_block_size*sizeof(uint64_t)); //read last 64k -+ -+ for (i=0;iMusic video information - Album information - Artist information -+ Services - - Configure - Disable -diff -Naur xbmc-10.1-Dharma/language/English/strings.xml.orig xbmc-10.1-Dharma.patch/language/English/strings.xml.orig -diff -Naur xbmc-10.1-Dharma/xbmc/AddonDatabase.cpp xbmc-10.1-Dharma.patch/xbmc/AddonDatabase.cpp ---- xbmc-10.1-Dharma/xbmc/AddonDatabase.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/AddonDatabase.cpp 2011-04-19 00:23:35.020973069 +0200 -@@ -24,6 +24,7 @@ - #include "utils/log.h" - #include "DateTime.h" - #include "StringUtils.h" -+#include "addons/Service.h" - - using namespace ADDON; - using namespace std; -@@ -578,6 +579,16 @@ - m_pDS->close(); - sql = PrepareSQL("insert into disabled(id, addonID) values(NULL, '%s')", addonID.c_str()); - m_pDS->exec(sql); -+ -+ AddonPtr addon; -+ // If the addon is a service, stop it -+ if (CAddonMgr::Get().GetAddon(addonID, addon, ADDON_SERVICE, false) && addon) -+ { -+ boost::shared_ptr service = boost::dynamic_pointer_cast(addon); -+ if (service) -+ service->Stop(); -+ } -+ - return true; - } - return false; // already disabled or failed query -@@ -586,6 +597,16 @@ - { - CStdString sql = PrepareSQL("delete from disabled where addonID='%s'", addonID.c_str()); - m_pDS->exec(sql); -+ -+ AddonPtr addon; -+ // If the addon is a service, start it -+ if (CAddonMgr::Get().GetAddon(addonID, addon, ADDON_SERVICE, false) && addon) -+ { -+ boost::shared_ptr service = boost::dynamic_pointer_cast(addon); -+ if (service) -+ service->Start(); -+ } -+ - } - return true; - } -diff -Naur xbmc-10.1-Dharma/xbmc/addons/Addon.cpp xbmc-10.1-Dharma.patch/xbmc/addons/Addon.cpp ---- xbmc-10.1-Dharma/xbmc/addons/Addon.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/addons/Addon.cpp 2011-04-19 00:23:35.029972895 +0200 -@@ -153,7 +153,8 @@ - {"xbmc.addon.video", ADDON_VIDEO, 1037, "DefaultAddonVideo.png" }, - {"xbmc.addon.audio", ADDON_AUDIO, 1038, "DefaultAddonMusic.png" }, - {"xbmc.addon.image", ADDON_IMAGE, 1039, "DefaultAddonPicture.png" }, -- {"xbmc.addon.executable", ADDON_EXECUTABLE, 1043, "DefaultAddonProgram.png" }}; -+ {"xbmc.addon.executable", ADDON_EXECUTABLE, 1043, "DefaultAddonProgram.png" }, -+ {"xbmc.service", ADDON_SERVICE, 24018, "DefaultAddonService.png" }}; - - const CStdString TranslateType(const ADDON::TYPE &type, bool pretty/*=false*/) - { -@@ -367,6 +368,7 @@ - case ADDON_SCRIPT_WEATHER: - case ADDON_SCRIPT_SUBTITLES: - case ADDON_PLUGIN: -+ case ADDON_SERVICE: - ext = ADDON_PYTHON_EXT; - break; - default: -@@ -396,6 +398,7 @@ - case ADDON_SCRAPER_TVSHOWS: - case ADDON_SCRAPER_LIBRARY: - case ADDON_PLUGIN: -+ case ADDON_SERVICE: - { - CStdString temp = CAddonMgr::Get().GetExtValue(extension->configuration, "@library"); - m_strLibName = temp; -diff -Naur xbmc-10.1-Dharma/xbmc/addons/AddonManager.cpp xbmc-10.1-Dharma.patch/xbmc/addons/AddonManager.cpp ---- xbmc-10.1-Dharma/xbmc/addons/AddonManager.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/addons/AddonManager.cpp 2011-04-19 00:27:58.785878189 +0200 -@@ -48,6 +48,7 @@ - #include "PluginSource.h" - #include "Repository.h" - #include "Skin.h" -+#include "Service.h" - - using namespace std; - -@@ -89,6 +90,8 @@ - case ADDON_SCRIPT_MODULE: - case ADDON_WEB_INTERFACE: - return AddonPtr(new CAddon(props)); -+ case ADDON_SERVICE: -+ return AddonPtr(new CService(props)); - case ADDON_SCRAPER_ALBUMS: - case ADDON_SCRAPER_ARTISTS: - case ADDON_SCRAPER_MOVIES: -@@ -481,6 +484,8 @@ - case ADDON_SCRIPT_MODULE: - case ADDON_WEB_INTERFACE: - return AddonPtr(new CAddon(addonProps)); -+ case ADDON_SERVICE: -+ return AddonPtr(new CService(addonProps)); - case ADDON_SCRAPER_ALBUMS: - case ADDON_SCRAPER_ARTISTS: - case ADDON_SCRAPER_MOVIES: -@@ -725,7 +730,42 @@ - m_cpluff->destroy_context(context); - return addon != NULL; - } -- -+ -+bool CAddonMgr::StartServices() -+{ -+ CLog::Log(LOGDEBUG, "ADDON: Starting service addons."); -+ -+ VECADDONS services; -+ if (!GetAddons(ADDON_SERVICE, services)) -+ return false; -+ -+ bool ret = true; -+ for (IVECADDONS it = services.begin(); it != services.end(); ++it) -+ { -+ boost::shared_ptr service = boost::dynamic_pointer_cast(*it); -+ if (service) -+ ret &= service->Start(); -+ } -+ -+ return ret; -+} -+ -+void CAddonMgr::StopServices() -+{ -+ CLog::Log(LOGDEBUG, "ADDON: Stopping service addons."); -+ -+ VECADDONS services; -+ if (!GetAddons(ADDON_SERVICE, services)) -+ return; -+ -+ for (IVECADDONS it = services.begin(); it != services.end(); ++it) -+ { -+ boost::shared_ptr service = boost::dynamic_pointer_cast(*it); -+ if (service) -+ service->Stop(); -+ } -+} -+ - int cp_to_clog(cp_log_severity_t lvl) - { - if (lvl >= CP_LOG_ERROR) -diff -Naur xbmc-10.1-Dharma/xbmc/addons/AddonManager.h xbmc-10.1-Dharma.patch/xbmc/addons/AddonManager.h ---- xbmc-10.1-Dharma/xbmc/addons/AddonManager.h 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/addons/AddonManager.h 2011-04-19 00:23:35.031972857 +0200 -@@ -154,6 +154,15 @@ - */ - bool AddonsFromRepoXML(const TiXmlElement *root, VECADDONS &addons); - ADDONDEPS GetDeps(const CStdString& id); -+ -+ /*! \brief Start all services addons. -+ \return True is all addons are started, false otherwise -+ */ -+ bool StartServices(); -+ /*! \brief Stop all services addons. -+ */ -+ void StopServices(); -+ - private: - void LoadAddons(const CStdString &path, - std::map& unresolved); -diff -Naur xbmc-10.1-Dharma/xbmc/addons/IAddon.h xbmc-10.1-Dharma.patch/xbmc/addons/IAddon.h ---- xbmc-10.1-Dharma/xbmc/addons/IAddon.h 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/addons/IAddon.h 2011-04-19 00:23:35.032972838 +0200 -@@ -47,6 +47,7 @@ - ADDON_PLUGIN, - ADDON_REPOSITORY, - ADDON_WEB_INTERFACE, -+ ADDON_SERVICE, - ADDON_VIDEO, // virtual addon types - ADDON_AUDIO, - ADDON_IMAGE, -diff -Naur xbmc-10.1-Dharma/xbmc/addons/Makefile xbmc-10.1-Dharma.patch/xbmc/addons/Makefile ---- xbmc-10.1-Dharma/xbmc/addons/Makefile 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/addons/Makefile 2011-04-19 00:32:56.915120508 +0200 -@@ -6,6 +6,7 @@ - PluginSource.cpp \ - ScreenSaver.cpp \ - Scraper.cpp \ -+ Service.cpp \ - Skin.cpp \ - Visualisation.cpp \ - fft.cpp \ -diff -Naur xbmc-10.1-Dharma/xbmc/addons/Service.cpp xbmc-10.1-Dharma.patch/xbmc/addons/Service.cpp ---- xbmc-10.1-Dharma/xbmc/addons/Service.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/addons/Service.cpp 2011-04-19 00:23:35.033972819 +0200 -@@ -0,0 +1,109 @@ -+/* -+ * Copyright (C) 2005-2009 Team XBMC -+ * http://www.xbmc.org -+ * -+ * This Program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This Program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with XBMC; see the file COPYING. If not, write to -+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -+ * http://www.gnu.org/copyleft/gpl.html -+ * -+ */ -+#include "Service.h" -+#include "AddonManager.h" -+#include "log.h" -+#ifdef HAS_PYTHON -+#include "lib/libPython/XBPython.h" -+#endif -+ -+using namespace std; -+ -+namespace ADDON -+{ -+ -+CService::CService(const cp_extension_t *ext) -+ : CAddon(ext), m_type(UNKNOWN) -+{ -+ BuildServiceType(); -+} -+ -+ -+CService::CService(const AddonProps &props) -+ : CAddon(props), m_type(UNKNOWN) -+{ -+ BuildServiceType(); -+} -+ -+bool CService::Start() -+{ -+ bool ret = true; -+ switch (m_type) -+ { -+#ifdef HAS_PYTHON -+ case PYTHON: -+ ret = (g_pythonParser.evalFile(LibPath()) != -1); -+ break; -+#endif -+ -+ case UNKNOWN: -+ default: -+ ret = false; -+ break; -+ } -+ -+ return ret; -+} -+ -+bool CService::Stop() -+{ -+ bool ret = true; -+ -+ switch (m_type) -+ { -+#ifdef HAS_PYTHON -+ case PYTHON: -+ ret = g_pythonParser.StopScript(LibPath()); -+ break; -+#endif -+ -+ case UNKNOWN: -+ default: -+ ret = false; -+ break; -+ } -+ -+ return ret; -+} -+ -+void CService::BuildServiceType() -+{ -+ CStdString str = LibPath(); -+ CStdString ext; -+ -+ size_t p = str.find_last_of('.'); -+ if (p != string::npos) -+ ext = str.substr(p + 1); -+ -+#ifdef HAS_PYTHON -+ CStdString pythonExt = ADDON_PYTHON_EXT; -+ pythonExt.erase(0, 2); -+ if ( ext.Equals(pythonExt) ) -+ m_type = PYTHON; -+ else -+#endif -+ { -+ m_type = UNKNOWN; -+ CLog::Log(LOGERROR, "ADDON: extension '%s' is not currently supported for service addon", ext.c_str()); -+ } -+} -+ -+} -diff -Naur xbmc-10.1-Dharma/xbmc/addons/Service.h xbmc-10.1-Dharma.patch/xbmc/addons/Service.h ---- xbmc-10.1-Dharma/xbmc/addons/Service.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/addons/Service.h 2011-04-19 00:23:35.033972819 +0200 -@@ -0,0 +1,50 @@ -+#pragma once -+/* -+ * Copyright (C) 2005-2009 Team XBMC -+ * http://www.xbmc.org -+ * -+ * This Program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This Program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with XBMC; see the file COPYING. If not, write to -+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -+ * http://www.gnu.org/copyleft/gpl.html -+ * -+ */ -+#include "Addon.h" -+ -+namespace ADDON -+{ -+ -+ class CService: public CAddon -+ { -+ public: -+ -+ enum TYPE -+ { -+ UNKNOWN, -+ PYTHON -+ }; -+ -+ CService(const cp_extension_t *ext); -+ CService(const AddonProps &props); -+ -+ bool Start(); -+ bool Stop(); -+ TYPE GetServiceType() { return m_type; } -+ -+ protected: -+ void BuildServiceType(); -+ -+ private: -+ TYPE m_type; -+ }; -+} -\ Kein Zeilenumbruch am Dateiende. -diff -Naur xbmc-10.1-Dharma/xbmc/Application.cpp xbmc-10.1-Dharma.patch/xbmc/Application.cpp ---- xbmc-10.1-Dharma/xbmc/Application.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/Application.cpp 2011-04-19 00:23:35.028972914 +0200 -@@ -1163,6 +1163,8 @@ - CCrystalHD::GetInstance(); - #endif - -+ CAddonMgr::Get().StartServices(); -+ - CLog::Log(LOGNOTICE, "initialize done"); - - m_bInitializing = false; -@@ -3360,6 +3362,9 @@ - - g_mediaManager.Stop(); - -+ // Stop services before unloading Python -+ CAddonMgr::Get().StopServices(); -+ - /* Python resource freeing must be done after skin has been unloaded, not before - some windows still need it when deinitializing during skin unloading. */ - #ifdef HAS_PYTHON diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-201-let_select_XBMCProjectM-0.1.patch deleted file mode 100644 index 599268596c..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-201-let_select_XBMCProjectM-0.1.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in ---- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 13:30:17.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 13:57:02.105903186 +0100 -@@ -65,6 +65,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. ==" -@@ -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)])], -@@ -832,6 +840,15 @@ - AC_MSG_NOTICE($librtmp_disabled) - fi - -+# 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 -@@ -1210,6 +1227,12 @@ - final_message="$final_message\n Bluray:\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" -@@ -1474,6 +1497,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) -@@ -1870,7 +1894,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-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in ---- xbmc-Dharma-10.1-c8405db/Makefile.in 2011-02-15 13:56:41.203329597 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in 2011-02-15 13:57:02.107903144 +0100 -@@ -109,8 +109,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 -@@ -308,7 +310,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/patches/xbmc-10.1-Dharma-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-202-let_select_RSXS-0.1.patch deleted file mode 100644 index e5d81c33d8..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-202-let_select_RSXS-0.1.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in ---- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 13:58:10.630505451 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 13:59:48.190515901 +0100 -@@ -67,6 +67,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. ==" -@@ -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)])], -@@ -849,6 +857,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 -@@ -1233,6 +1250,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" -@@ -1498,6 +1521,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) -@@ -1952,7 +1976,7 @@ - --disable-skyrocket - fi - fi --], [0]) -+], [$BUILD_RSXS]) - - XB_CONFIG_MODULE([xbmc/lib/libapetag], [ - if test "$host_vendor" = "apple" ; then -diff -Naur xbmc-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in ---- xbmc-Dharma-10.1-c8405db/Makefile.in 2011-02-15 13:58:10.631505430 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in 2011-02-15 13:59:48.191515880 +0100 -@@ -104,8 +104,10 @@ - LIB_DIRS+=lib/libmicrohttpd - endif - --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 \ -@@ -324,8 +326,10 @@ - endif - screensavers: exports - ifneq (arm, $(ARCH)) -+ifneq (@BUILD_RSXS@,1) - $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc - endif -+endif - libpython: dllloader - $(MAKE) -C xbmc/lib/libPython - $(MAKE) -C xbmc/lib/libPython/xbmcmodule diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-301-correct_lzo_include-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-301-correct_lzo_include-0.1.patch deleted file mode 100644 index aa10112557..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-301-correct_lzo_include-0.1.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in ---- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:00:23.143803217 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:01:15.327739326 +0100 -@@ -1263,12 +1263,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-Dharma-10.1-c8405db/tools/TexturePacker/XBMCTex.cpp xbmc-Dharma-10.1-c8405db.patch/tools/TexturePacker/XBMCTex.cpp ---- xbmc-Dharma-10.1-c8405db/tools/TexturePacker/XBMCTex.cpp 2011-02-15 13:30:04.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/tools/TexturePacker/XBMCTex.cpp 2011-02-15 14:01:15.328739305 +0100 -@@ -40,7 +40,7 @@ - #endif - - #ifdef _LINUX --#include -+#include - #else - #include "../../xbmc/lib/liblzo/LZO1X.H" - #endif diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-302-dont_hardcode_usr_include-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-302-dont_hardcode_usr_include-0.1.patch deleted file mode 100644 index b3e19d5b91..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-302-dont_hardcode_usr_include-0.1.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/guilib/Makefile.in xbmc-Dharma-10.1-c8405db.patch/guilib/Makefile.in ---- xbmc-Dharma-10.1-c8405db/guilib/Makefile.in 2011-02-15 13:30:05.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/guilib/Makefile.in 2011-02-15 14:06:40.345116165 +0100 -@@ -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-Dharma-10.1-c8405db/xbmc/FileSystem/Makefile.in xbmc-Dharma-10.1-c8405db.patch/xbmc/FileSystem/Makefile.in ---- xbmc-Dharma-10.1-c8405db/xbmc/FileSystem/Makefile.in 2011-02-15 13:30:05.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/FileSystem/Makefile.in 2011-02-15 14:06:40.346116145 +0100 -@@ -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-Dharma-10.1-c8405db/xbmc/Makefile.in xbmc-Dharma-10.1-c8405db.patch/xbmc/Makefile.in ---- xbmc-Dharma-10.1-c8405db/xbmc/Makefile.in 2011-02-15 13:30:06.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/Makefile.in 2011-02-15 14:06:40.347116125 +0100 -@@ -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/patches/xbmc-10.1-Dharma-303-WiiRemote_crosscompiling-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-303-WiiRemote_crosscompiling-0.1.patch deleted file mode 100644 index 20a7760ebc..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-303-WiiRemote_crosscompiling-0.1.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/Makefile ---- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/Makefile 2011-02-15 13:30:04.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/Makefile 2011-02-15 14:08:13.446219906 +0100 -@@ -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-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile ---- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile 2011-02-15 13:30:04.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile 2011-02-15 14:08:13.447219886 +0100 -@@ -5,7 +5,7 @@ - # - # Change this to your GCC version. - # --CC = gcc -+CC ?= gcc - - #################################################### - # -diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile ---- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile 2011-02-15 13:30:04.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile 2011-02-15 14:08:13.449219844 +0100 -@@ -5,7 +5,7 @@ - # - # Change this to your GCC version. - # --CC = gcc -+CC ?= gcc - - #################################################### - # -diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile ---- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile 2011-02-15 13:30:04.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile 2011-02-15 14:08:13.450219823 +0100 -@@ -5,7 +5,7 @@ - # - # Change this to your GCC version. - # --CC = gcc -+CC ?= gcc - - #################################################### - # diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-303-fix_libdvd_xFLAGS-0.1.patch deleted file mode 100644 index 0fe021231d..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-303-fix_libdvd_xFLAGS-0.1.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in ---- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-02-15 13:30:12.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-02-15 14:07:34.152020190 +0100 -@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh ---- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-02-15 13:30:12.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-02-15 14:07:34.153020170 +0100 -@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in ---- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in 2011-02-15 13:30:12.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in 2011-02-15 14:07:34.154020150 +0100 -@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in ---- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-02-15 13:30:12.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-02-15 14:07:34.156020109 +0100 -@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in ---- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-02-15 13:30:12.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-02-15 14:07:34.157020088 +0100 -@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in ---- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in 2011-02-15 13:30:12.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in 2011-02-15 14:07:34.158020067 +0100 -@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh ---- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh 2011-02-15 13:30:12.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh 2011-02-15 14:07:34.158020067 +0100 -@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in ---- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in 2011-02-15 13:30:12.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in 2011-02-15 14:07:34.159020047 +0100 -@@ -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/patches/xbmc-10.1-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch deleted file mode 100644 index 72b5bd4fa8..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp ---- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-02-15 13:30:12.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-02-15 14:08:59.000292217 +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/patches/xbmc-10.1-Dharma-401-we_dont_need_libXinerama-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-401-we_dont_need_libXinerama-0.1.patch deleted file mode 100644 index 96865f6d4e..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-401-we_dont_need_libXinerama-0.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in ---- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:06:18.343564347 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:16:56.717644949 +0100 -@@ -685,9 +685,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/patches/xbmc-10.1-Dharma-403-openssl_only_needed_for_internal_python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-403-openssl_only_needed_for_internal_python-0.1.patch deleted file mode 100644 index 832cfca576..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-403-openssl_only_needed_for_internal_python-0.1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in ---- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:23:09.427177685 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:23:28.731790834 +0100 -@@ -562,8 +562,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)) -@@ -975,6 +973,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/patches/xbmc-10.1-Dharma-405-fix_vorbis_cdrip-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-405-fix_vorbis_cdrip-0.1.patch deleted file mode 100644 index a8a65f5637..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-405-fix_vorbis_cdrip-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/DllVorbis.h xbmc-10.1-Dharma.patch/xbmc/cdrip/DllVorbis.h ---- xbmc-10.1-Dharma/xbmc/cdrip/DllVorbis.h 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/cdrip/DllVorbis.h 2011-03-29 16:37:38.432826576 +0200 -@@ -61,7 +61,7 @@ - public: - virtual ~DllVorbis() {}; - virtual void vorbis_info_init(vorbis_info *vi) -- { vorbis_info_init(vi); } -+ { ::vorbis_info_init(vi); } - virtual int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ogg_packet *op) - { return ::vorbis_bitrate_flushpacket(vd, op); } - virtual int vorbis_bitrate_addblock(vorbis_block *vb) diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-406-gcc-4.6-fixes-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-406-gcc-4.6-fixes-0.1.patch deleted file mode 100644 index cb310d476a..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-406-gcc-4.6-fixes-0.1.patch +++ /dev/null @@ -1,97 +0,0 @@ -From c66099c4d8e6b2d748ca3ddc31ee90b731d0f620 Mon Sep 17 00:00:00 2001 -From: Stephan Raue -Date: Wed, 30 Mar 2011 14:57:28 +0200 -Subject: [PATCH] dvdplayer: fix build with gcc-4.6. Flags to the Linker must be passed via -Wl,. This fixes ticket #11383 - -Signed-off-by: Stephan Raue ---- - xbmc/cores/dvdplayer/Codecs/Makefile.in | 18 +++++++++--------- - xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 4 ++-- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/Codecs/Makefile.in b/xbmc/cores/dvdplayer/Codecs/Makefile.in -index a7ef1a0..308664a 100644 ---- a/xbmc/cores/dvdplayer/Codecs/Makefile.in -+++ b/xbmc/cores/dvdplayer/Codecs/Makefile.in -@@ -148,32 +148,32 @@ liba52: - else - - $(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so -- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ - ffmpeg/libavutil/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER) - - $(SYSDIR)/avcodec-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavcodec/libavcodec.so -- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ - ffmpeg/libavcodec/*.o ffmpeg/libavcodec/$(ARCH_DIR)/*.o \ - `cat $(WRAPPER:.o=.def)` $(WRAPPER) - - $(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.so -- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ - ffmpeg/libavformat/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER) - - ifneq ($(ARCH), arm) - $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so -- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ - ffmpeg/libswscale/*.o ffmpeg/libswscale/$(ARCH_DIR)/*.o \ - `cat $(WRAPPER:.o=.def)` $(WRAPPER) - else # No ARM version of swscale available yet. - $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so -- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ - ffmpeg/libswscale/*.o \ - `cat $(WRAPPER:.o=.def)` $(WRAPPER) - endif - - $(SYSDIR)/postproc-51-$(ARCH).so: $(WRAPPER) ffmpeg/libpostproc/libpostproc.so -- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \ - ffmpeg/libpostproc/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER) - - ffmpeg/libavutil/libavutil.so : ffmpeg; -@@ -185,17 +185,17 @@ ffmpeg: - $(MAKE) -C $@ - - $(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER) libdts/libdts/libdts.a -- $(CC) -o $@ $(LDFLAGS) --soname,$@ \ -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \ - libdts/libdts/bitstream.o \ - libdts/libdts/downmix.o libdts/libdts/parse.o \ - `cat $(WRAPPER:.o=.def)` $(WRAPPER) - - $(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER) liba52/liba52/liba52.la -- $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/liba52/.libs/*.o \ -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/liba52/.libs/*.o \ - -Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER) - - $(SYSDIR)/libao-$(ARCH).so: $(WRAPPER) liba52/libao/libao.a -- $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \ -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/libao/libao.a \ - -Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER) - - libdts/libdts/libdts.a : libdts; -diff --git a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in -index 3c487e9..6d4abd4 100644 ---- a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in -+++ b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in -@@ -49,12 +49,12 @@ $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvd - else - - $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a -- $(CC) -o $@ $(LDFLAGS) --soname,$@ \ -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \ - libdvdcss/src/*.o \ - `cat $(WRAPPER:.o=.def)` $(WRAPPER) - - $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a -- $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \ -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \ - `cat $(WRAPPER:.o=.def)` $(WRAPPER) - - endif --- -1.7.0.2 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-451-full_splash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-451-full_splash-0.1.patch deleted file mode 100644 index 95060d0ed4..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-451-full_splash-0.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/utils/Splash.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/utils/Splash.cpp ---- xbmc-Dharma-10.1-c8405db/xbmc/utils/Splash.cpp 2011-02-15 13:30:05.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/utils/Splash.cpp 2011-02-15 14:25:02.308915505 +0100 -@@ -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/patches/xbmc-10.1-Dharma-902-advancedsettings_videolibrary.flattenmoviesets.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-902-advancedsettings_videolibrary.flattenmoviesets.patch deleted file mode 100644 index a0351fb48b..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-902-advancedsettings_videolibrary.flattenmoviesets.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp ---- xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp 2011-02-15 14:32:35.774825404 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp 2011-02-15 14:33:07.788183524 +0100 -@@ -527,6 +527,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-10.1-c8405db/xbmc/VideoDatabase.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/VideoDatabase.cpp ---- xbmc-Dharma-10.1-c8405db/xbmc/VideoDatabase.cpp 2011-02-15 13:30:05.000000000 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/VideoDatabase.cpp 2011-02-15 14:33:07.792183444 +0100 -@@ -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;