From cf9a61d0b278037ccaffe0d9aa31a2715dab4dd4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 26 Apr 2011 21:23:23 +0200 Subject: [PATCH 01/29] 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; From 70df3e8716bf3244882418029ace51fcf1d59aa8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 26 Apr 2011 21:23:40 +0200 Subject: [PATCH 02/29] xbmc-theme-Confluence: update to xbmc-theme-Confluence-04e78f4 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- ...Dharma-001-fix_bookmarks_filenames-0.1.patch | 14 -------------- ...2-add_addon_service_script_support-0.1.patch | Bin 35734 -> 0 bytes 3 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-10.1-Dharma-001-fix_bookmarks_filenames-0.1.patch delete mode 100644 packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-10.1-Dharma-012-add_addon_service_script_support-0.1.patch diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 54db05951f..078426d8ff 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="10.1-Dharma" +PKG_VERSION="04e78f4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-10.1-Dharma-001-fix_bookmarks_filenames-0.1.patch b/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-10.1-Dharma-001-fix_bookmarks_filenames-0.1.patch deleted file mode 100644 index e527f60efd..0000000000 --- a/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-10.1-Dharma-001-fix_bookmarks_filenames-0.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur xbmc-theme-Confluence-10.1-Dharma/720p/VideoOSD.xml xbmc-theme-Confluence-10.1-Dharma.patch/720p/VideoOSD.xml ---- xbmc-theme-Confluence-10.1-Dharma/720p/VideoOSD.xml 2011-03-08 02:49:22.000000000 +0100 -+++ xbmc-theme-Confluence-10.1-Dharma.patch/720p/VideoOSD.xml 2011-03-30 18:18:57.291644805 +0200 -@@ -23,8 +23,8 @@ - 45 - - - -- OSDBookMarksFO.png -- OSDBookMarksNF.png -+ OSDBookmarksFO.png -+ OSDBookmarksNF.png - 705 - 701 - 600 diff --git a/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-10.1-Dharma-012-add_addon_service_script_support-0.1.patch b/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-10.1-Dharma-012-add_addon_service_script_support-0.1.patch deleted file mode 100644 index bd893e8e3e610fdfeadc67e74ce3217408e7b25f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35734 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

)!uNR!E|W={PzteHlW)?Fw0NY0S_ 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 Date: Tue, 26 Apr 2011 21:24:06 +0200 Subject: [PATCH 03/29] tools/mkpkg: update mkpkg_xbmc script Signed-off-by: Stephan Raue --- tools/mkpkg/mkpkg_xbmc | 50 ++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/tools/mkpkg/mkpkg_xbmc b/tools/mkpkg/mkpkg_xbmc index c86609a7b3..1f1d3ee8da 100755 --- a/tools/mkpkg/mkpkg_xbmc +++ b/tools/mkpkg/mkpkg_xbmc @@ -19,50 +19,58 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ +PKG_NAME="xbmc" +GIT_REPO="-b master git://github.com/xbmc/xbmc.git" +DEST_DIR="$PKG_NAME" + echo "getting sources..." - svn co http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk xbmc-latest + if [ ! -d $DEST_DIR-latest ]; then + git clone $GIT_REPO $DEST_DIR-latest + fi + + cd $DEST_DIR-latest + git pull echo "getting version..." - cd xbmc-latest - SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'` - echo $SVN_REV + GIT_REV=`git log -n1 --format=%h` + echo $GIT_REV cd .. echo "copying sources..." - rm -rf xbmc-$SVN_REV - cp -R xbmc-latest xbmc-$SVN_REV - echo "$SVN_REV" > xbmc-$SVN_REV/svn.version + rm -rf $PKG_NAME-$GIT_REV + cp -R $DEST_DIR-latest $PKG_NAME-$GIT_REV + echo "$GIT_REV" > $PKG_NAME-$GIT_REV/git.version echo "cleaning sources..." - find xbmc-$SVN_REV -name .svn -exec rm -rf {} ";" + rm -rf $PKG_NAME-$GIT_REV/.git echo "seperating theme..." - rm -rf xbmc-theme-Confluence-$SVN_REV - mv xbmc-$SVN_REV/addons/skin.confluence xbmc-theme-Confluence-$SVN_REV + rm -rf $PKG_NAME-theme-Confluence-$GIT_REV + mv $PKG_NAME-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$GIT_REV echo "cleaning sources..." - rm -rf xbmc-$SVN_REV/visualisations - rm -rf xbmc-$SVN_REV/lib/libSDL-* - rm -rf xbmc-$SVN_REV/lib/libcurl-* - rm -rf xbmc-$SVN_REV/project + rm -rf $PKG_NAME-$GIT_REV/visualisations + rm -rf $PKG_NAME-$GIT_REV/lib/libSDL-* + rm -rf $PKG_NAME-$GIT_REV/lib/libcurl-* + rm -rf $PKG_NAME-$GIT_REV/project for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \ "PackageMaker" "Translator" "XBMCLive" "XprPack" \ "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do - rm -rf xbmc-$SVN_REV/tools/$i + rm -rf $PKG_NAME-$GIT_REV/tools/$i done for i in dll a lib so bat; do - find xbmc-$SVN_REV -name *.$i -exec rm -rf {} ";" + find $PKG_NAME-$GIT_REV -name *.$i -exec rm -rf {} ";" done # bundled win32 binaries - rm -r xbmc-$SVN_REV/xbmc/visualizations/XBMCProjectM/win32 + rm -r $PKG_NAME-$GIT_REV/xbmc/visualizations/XBMCProjectM/win32 echo "packing sources..." - tar cvjf xbmc-$SVN_REV.tar.bz2 xbmc-$SVN_REV - tar cvjf xbmc-theme-Confluence-$SVN_REV.tar.bz2 xbmc-theme-Confluence-$SVN_REV + tar cvjf $PKG_NAME-$GIT_REV.tar.bz2 $PKG_NAME-$GIT_REV + tar cvjf $PKG_NAME-theme-Confluence-$GIT_REV.tar.bz2 $PKG_NAME-theme-Confluence-$GIT_REV echo "remove temporary sourcedir..." - rm -rf xbmc-$SVN_REV - rm -rf xbmc-theme-Confluence-$SVN_REV + rm -rf $PKG_NAME-$GIT_REV + rm -rf $PKG_NAME-theme-Confluence-$GIT_REV From ea14c7b6195158b77065899fa8e301b7592c1949 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 28 Apr 2011 16:29:06 +0200 Subject: [PATCH 04/29] xbmc: add (ugly) hack to detect the python version if we compile between arch's Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index c7ef6fa44f..2d45e8f79c 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -85,6 +85,12 @@ fi # this fixes problems with faac implementation of ffmpeg LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` + export PYTHON_VERSION="2.6" + export PYTHON_CPPFLAGS="-I$SYSROOT_PREFIX/usr/include/python$PYTHON_VERSION" + export PYTHON_LDFLAGS="-L$SYSROOT_PREFIX/usr/lib/python$PYTHON_VERSION -lpython$PYTHON_VERSION" + export PYTHON_SITE_PKG="$SYSROOT_PREFIX/usr/lib/python$PYTHON_VERSION/site-packages" + export ac_python_version="$PYTHON_VERSION" + # this fixes the "stretching picture bug" CFLAGS=`echo $CFLAGS | sed -e "s|-ftree-loop-distribution||"` CFLAGS=`echo $CFLAGS | sed -e "s|-floop-interchange||"` From 299b38db428618f412e85dfe3880966c264e8ba3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 2 May 2011 01:09:32 +0200 Subject: [PATCH 05/29] xbmc: update to xbmc-be6ae84 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/build | 35 +++++++++------- packages/mediacenter/xbmc/meta | 6 +-- ...4e78f4-101-strip_confluence_skin-0.1.patch | 42 ------------------- ...-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...e84-201-let_select_XBMCProjectM-0.1.patch} | 0 ...bmc-be6ae84-202-let_select_RSXS-0.1.patch} | 0 ...c-be6ae84-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...6ae84-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...xbmc-be6ae84-404-add_lame_check-0.6.patch} | 0 ...-be6ae84-452-change_lcd_content-0.1.patch} | 0 ...84-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...be6ae84-463-add_remote_devinput-0.1.patch} | 0 ...advancedsettings_alwaysextractflags.patch} | 0 15 files changed, 24 insertions(+), 59 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-04e78f4-101-strip_confluence_skin-0.1.patch rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-be6ae84-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-201-let_select_XBMCProjectM-0.1.patch => xbmc-be6ae84-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-202-let_select_RSXS-0.1.patch => xbmc-be6ae84-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-be6ae84-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-be6ae84-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-be6ae84-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-404-add_lame_check-0.6.patch => xbmc-be6ae84-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-452-change_lcd_content-0.1.patch => xbmc-be6ae84-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-be6ae84-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-be6ae84-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-463-add_remote_devinput-0.1.patch => xbmc-be6ae84-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-04e78f4-901-advancedsettings_alwaysextractflags.patch => xbmc-be6ae84-901-advancedsettings_alwaysextractflags.patch} (100%) diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 2d45e8f79c..498ea14cdf 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -109,15 +109,20 @@ fi cd $PKG_BUILD -do_autoreconf -do_autoreconf lib/cpluff -# 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 +# adding fake Makefile for stripped skin + mkdir -p addons/skin.confluence/media + touch addons/skin.confluence/media/Makefile.in + +# autoreconf + do_autoreconf + do_autoreconf lib/cpluff + # 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 {} \; + find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \; ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ @@ -131,10 +136,14 @@ find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \; --disable-debug \ --disable-optimizations \ --enable-gl \ + --disable-gles \ $XBMC_VDPAU \ $XBMC_VAAPI \ $XBMC_CRYSTALHD \ --disable-vdadecoder \ + --disable-vtbdecoder \ + --disable-openmax \ + --disable-tegra \ --disable-profiling \ --enable-joystick \ --enable-xrandr \ @@ -143,23 +152,21 @@ find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \; --disable-rsxs \ --disable-ccache \ $XBMC_PULSEAUDIO \ + --enable-rtmp \ --enable-ffmpeg-libvorbis \ - --disable-faac \ --enable-lame \ $XBMC_DVDCSS \ --disable-mid \ - $XBMC_AVAHI \ --disable-hal \ + $XBMC_AVAHI \ $XBMC_NONFREE \ --disable-asap-codec \ $XBMC_WEBSERVER \ - --disable-libdts \ - --disable-liba52 \ + --enable-optical-drive \ --enable-libbluray \ + --enable-texturepacker \ + --disable-external-libraries \ --disable-external-ffmpeg \ - --disable-external-liba52 \ - --disable-external-libdts \ - --enable-external-python \ # setup default skin inside the sources sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/settings/Settings.h diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index ae8fd4a8c3..479d979c54 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,14 +19,14 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="04e78f4" +PKG_VERSION="be6ae84" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings" -PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" +PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings" +PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc: XBMC Mediacenter" 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 deleted file mode 100644 index 3a3e396bbb..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-101-strip_confluence_skin-0.1.patch +++ /dev/null @@ -1,42 +0,0 @@ -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-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-04e78f4-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-be6ae84-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-04e78f4-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-be6ae84-901-advancedsettings_alwaysextractflags.patch From 6372e70153d4b1210db8e64ddeefcd9c89c24333 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 2 May 2011 01:09:46 +0200 Subject: [PATCH 06/29] xbmc-theme-Confluence: update to xbmc-theme-Confluence-be6ae84 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 078426d8ff..d81dfe86a6 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="04e78f4" +PKG_VERSION="be6ae84" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From ddad74d72cd1cbeeb826b591ff9eb2554b9c328d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 2 May 2011 01:10:23 +0200 Subject: [PATCH 07/29] libmms: remove package 'libmms' Signed-off-by: Stephan Raue --- packages/audio/libmms/build | 37 -------------- packages/audio/libmms/install | 27 ----------- packages/audio/libmms/meta | 36 -------------- .../patches/libmms-0.5-this_keyword.patch | 48 ------------------- 4 files changed, 148 deletions(-) delete mode 100755 packages/audio/libmms/build delete mode 100755 packages/audio/libmms/install delete mode 100644 packages/audio/libmms/meta delete mode 100644 packages/audio/libmms/patches/libmms-0.5-this_keyword.patch diff --git a/packages/audio/libmms/build b/packages/audio/libmms/build deleted file mode 100755 index 012809e2e1..0000000000 --- a/packages/audio/libmms/build +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# 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 OpenELEC.tv; 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 -################################################################################ - -. config/options $1 - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --enable-shared \ - --disable-static \ - -make - -$MAKEINSTALL \ No newline at end of file diff --git a/packages/audio/libmms/install b/packages/audio/libmms/install deleted file mode 100755 index 236f10acaf..0000000000 --- a/packages/audio/libmms/install +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# 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 OpenELEC.tv; 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 -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib - diff --git a/packages/audio/libmms/meta b/packages/audio/libmms/meta deleted file mode 100644 index af007516b2..0000000000 --- a/packages/audio/libmms/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# 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 OpenELEC.tv; 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 -################################################################################ - -PKG_NAME="libmms" -PKG_VERSION="0.6" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://sourceforge.net/projects/libmms/" -PKG_URL="$SOURCEFORGE_SRC/libmms/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="glib" -PKG_BUILD_DEPENDS="toolchain glib" -PKG_PRIORITY="optional" -PKG_SECTION="audio" -PKG_SHORTDESC="libmms: a common library for parsing mms:// and mmsh:// type network streams." -PKG_LONGDESC="LibMMS is a common library for parsing mms:// and mmsh:// type network streams. These are commonly used to stream Windows Media Video content over the web. LibMMS itself is only for receiving MMS stream, it doesn't handle sending at all." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/audio/libmms/patches/libmms-0.5-this_keyword.patch b/packages/audio/libmms/patches/libmms-0.5-this_keyword.patch deleted file mode 100644 index 258b46226c..0000000000 --- a/packages/audio/libmms/patches/libmms-0.5-this_keyword.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur libmms-0.5/src/mmsh.h libmms-0.5.patch/src/mmsh.h ---- libmms-0.5/src/mmsh.h 2009-10-31 13:35:28.000000000 +0100 -+++ libmms-0.5.patch/src/mmsh.h 2010-01-25 12:11:31.862959172 +0100 -@@ -41,20 +41,20 @@ - - int mmsh_read (mms_io_t *io, mmsh_t *instance, char *data, int len); - int mmsh_time_seek (mms_io_t *io, mmsh_t *instance, double time_sec); --mms_off_t mmsh_seek (mms_io_t *io, mmsh_t *this, mms_off_t offset, int origin); -+mms_off_t mmsh_seek (mms_io_t *io, mmsh_t *instance, mms_off_t offset, int origin); - uint32_t mmsh_get_length (mmsh_t *instance); --double mmsh_get_time_length (mmsh_t *this); --uint64_t mmsh_get_raw_time_length (mmsh_t *this); -+double mmsh_get_time_length (mmsh_t *instance); -+uint64_t mmsh_get_raw_time_length (mmsh_t *instance); - mms_off_t mmsh_get_current_pos (mmsh_t *instance); - void mmsh_close (mmsh_t *instance); - - int mmsh_peek_header (mmsh_t *instance, char *data, int maxsize); - --uint32_t mmsh_get_asf_header_len (mmsh_t *this); -+uint32_t mmsh_get_asf_header_len (mmsh_t *instance); - --uint32_t mmsh_get_asf_packet_len (mmsh_t *this); -+uint32_t mmsh_get_asf_packet_len (mmsh_t *instance); - --int mmsh_get_seekable (mmsh_t *this); -+int mmsh_get_seekable (mmsh_t *instance); - - #ifdef __cplusplus - } -diff -Naur libmms-0.5/src/mmsx.h libmms-0.5.patch/src/mmsx.h ---- libmms-0.5/src/mmsx.h 2009-10-31 13:35:28.000000000 +0100 -+++ libmms-0.5.patch/src/mmsx.h 2010-01-25 12:11:51.451960516 +0100 -@@ -55,11 +55,11 @@ - - mms_off_t mmsx_get_current_pos (mmsx_t *instance); - --uint32_t mmsx_get_asf_header_len (mmsx_t *this); -+uint32_t mmsx_get_asf_header_len (mmsx_t *instance); - --uint64_t mmsx_get_asf_packet_len (mmsx_t *this); -+uint64_t mmsx_get_asf_packet_len (mmsx_t *instance); - --int mmsx_get_seekable (mmsx_t *this); -+int mmsx_get_seekable (mmsx_t *instance); - - #ifdef __cplusplus - } From 1bd28c2dfc84e3eeb1f6f7cde1d6f8d79b7846d2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 9 May 2011 19:46:39 +0200 Subject: [PATCH 08/29] xbmc: update to xbmc-366bf45 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/meta | 2 +- ...-331-fix_playpause_problem_ticket_7338-0.1.patch | 13 ------------- ...bmc-10.1-Dharma-455-enable_lan_caching-0.1.patch | 12 ------------ ...45-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...c-366bf45-201-let_select_XBMCProjectM-0.1.patch} | 0 ...h => xbmc-366bf45-202-let_select_RSXS-0.1.patch} | 0 ...=> xbmc-366bf45-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...66bf45-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...bmc-366bf45-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...ch => xbmc-366bf45-404-add_lame_check-0.6.patch} | 0 ...> xbmc-366bf45-452-change_lcd_content-0.1.patch} | 0 ...-366bf45-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...45-462-add_remote_irtrans_mediacenter-0.1.patch} | 0 ... xbmc-366bf45-463-add_remote_devinput-0.1.patch} | 0 ...5-901-advancedsettings_alwaysextractflags.patch} | 0 15 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-331-fix_playpause_problem_ticket_7338-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-455-enable_lan_caching-0.1.patch rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-366bf45-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-201-let_select_XBMCProjectM-0.1.patch => xbmc-366bf45-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-202-let_select_RSXS-0.1.patch => xbmc-366bf45-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-366bf45-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-366bf45-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-366bf45-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-404-add_lame_check-0.6.patch => xbmc-366bf45-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-452-change_lcd_content-0.1.patch => xbmc-366bf45-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-366bf45-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-366bf45-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-463-add_remote_devinput-0.1.patch => xbmc-366bf45-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-be6ae84-901-advancedsettings_alwaysextractflags.patch => xbmc-366bf45-901-advancedsettings_alwaysextractflags.patch} (100%) diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 479d979c54..d2d7e30d04 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="be6ae84" +PKG_VERSION="366bf45" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-331-fix_playpause_problem_ticket_7338-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-331-fix_playpause_problem_ticket_7338-0.1.patch deleted file mode 100644 index 63b04cb3e0..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-331-fix_playpause_problem_ticket_7338-0.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -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-05-06 01:41:52.853741840 +0200 -@@ -2515,8 +2515,8 @@ - if (!m_pPlayer->IsPaused()) - { // unpaused - set the playspeed back to normal - SetPlaySpeed(1); -+ g_audioManager.Enable(m_pPlayer->IsPaused() && !g_audioContext.IsPassthroughActive()); - } -- g_audioManager.Enable(m_pPlayer->IsPaused() && !g_audioContext.IsPassthroughActive()); - return true; - } - if (!m_pPlayer->IsPaused()) diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-455-enable_lan_caching-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-455-enable_lan_caching-0.1.patch deleted file mode 100644 index 3d99ba963d..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-455-enable_lan_caching-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xbmc-10.1-Dharma/xbmc/FileSystem/File.cpp xbmc-10.1-Dharma.patch/xbmc/FileSystem/File.cpp ---- xbmc-10.1-Dharma/xbmc/FileSystem/File.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/FileSystem/File.cpp 2011-05-04 17:59:12.093724017 +0200 -@@ -217,7 +217,7 @@ - return false; - } - -- if ( (flags & READ_NO_CACHE) == 0 && CUtil::IsInternetStream(strFileName) && !CUtil::IsPicture(strFileName) ) -+ if ( (flags & READ_NO_CACHE) == 0 && ( CUtil::IsInternetStream(strFileName) || CUtil::IsOnLAN(strFileName) ) && !CUtil::IsPicture(strFileName) ) - m_flags |= READ_CACHED; - - CURL url(strFileName); diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-be6ae84-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-366bf45-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-be6ae84-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-366bf45-901-advancedsettings_alwaysextractflags.patch From 859008699e865f1726c3ef93cd1397dc4cce32ec Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 9 May 2011 19:47:10 +0200 Subject: [PATCH 09/29] xbmc-theme-Confluence: update to xbmc-theme-Confluence-366bf45 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index d81dfe86a6..017c946bfd 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="be6ae84" +PKG_VERSION="366bf45" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 57c3543806bbab93f192e49be6614440e499f28a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 9 May 2011 19:47:30 +0200 Subject: [PATCH 10/29] scripts/checkdeps: fix paths Signed-off-by: Stephan Raue --- scripts/checkdeps | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/checkdeps b/scripts/checkdeps index 9ed5c8b0bd..4881dafc6c 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -35,8 +35,8 @@ case $1 in build) deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt" deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext" - files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h" - files_pkg="glibc-static libc6-dev zlib1g-dev libncurses5-dev" + files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h /usr/include/SDL/SDL.h /usr/include/SDL/SDL_image.h /usr/include/lzo/lzo1.h" + files_pkg="glibc-static libc6-dev zlib1g-dev libncurses5-dev libSDL-devel libSDL_image-devel lzo-devel" ;; qemu) if [ ! `which qemu` ]; then From 40bfe827f3a7f38a0143085066b49e1ddd19302f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 22 May 2011 14:14:08 +0200 Subject: [PATCH 11/29] xbmc: update to xbmc-dad2b76 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/build | 3 +++ packages/mediacenter/xbmc/meta | 2 +- ... xbmc-dad2b76-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...atch => xbmc-dad2b76-201-let_select_XBMCProjectM-0.1.patch} | 0 ...XS-0.1.patch => xbmc-dad2b76-202-let_select_RSXS-0.1.patch} | 0 ...-0.1.patch => xbmc-dad2b76-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...h => xbmc-dad2b76-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ....patch => xbmc-dad2b76-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...eck-0.6.patch => xbmc-dad2b76-404-add_lame_check-0.6.patch} | 0 ...0.1.patch => xbmc-dad2b76-452-change_lcd_content-0.1.patch} | 0 ...tch => xbmc-dad2b76-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ... xbmc-dad2b76-462-add_remote_irtrans_mediacenter-0.1.patch} | 0 ....1.patch => xbmc-dad2b76-463-add_remote_devinput-0.1.patch} | 0 ...xbmc-dad2b76-901-advancedsettings_alwaysextractflags.patch} | 0 14 files changed, 4 insertions(+), 1 deletion(-) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-dad2b76-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-201-let_select_XBMCProjectM-0.1.patch => xbmc-dad2b76-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-202-let_select_RSXS-0.1.patch => xbmc-dad2b76-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-dad2b76-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-dad2b76-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-dad2b76-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-404-add_lame_check-0.6.patch => xbmc-dad2b76-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-452-change_lcd_content-0.1.patch => xbmc-dad2b76-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-dad2b76-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-dad2b76-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-463-add_remote_devinput-0.1.patch => xbmc-dad2b76-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-366bf45-901-advancedsettings_alwaysextractflags.patch => xbmc-dad2b76-901-advancedsettings_alwaysextractflags.patch} (100%) diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 498ea14cdf..9e05a32f46 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -115,6 +115,9 @@ cd $PKG_BUILD # autoreconf do_autoreconf + do_autoreconf lib/libid3tag/libid3tag + do_autoreconf xbmc/screensavers/rsxs-0.9 + do_autoreconf lib/libapetag do_autoreconf lib/cpluff # order matters with libdvd and friends [ -d lib/libdvd/libdvdcss ] && do_autoreconf lib/libdvd/libdvdcss diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index d2d7e30d04..3485dac7d9 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="366bf45" +PKG_VERSION="dad2b76" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-366bf45-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-dad2b76-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-366bf45-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-dad2b76-901-advancedsettings_alwaysextractflags.patch From 4d2e957b7890346d017c63f6105de4c44a80d791 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 22 May 2011 14:14:26 +0200 Subject: [PATCH 12/29] xbmc-theme-Confluence: update to xbmc-theme-Confluence-dad2b76 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 017c946bfd..1db3d09458 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="366bf45" +PKG_VERSION="dad2b76" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 6beb24eab62721637863e27666028c2367a3e9a7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 23 May 2011 22:36:32 +0200 Subject: [PATCH 13/29] netmount: fix permissions Signed-off-by: Stephan Raue --- packages/network/netmount/scripts/netmount | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 packages/network/netmount/scripts/netmount diff --git a/packages/network/netmount/scripts/netmount b/packages/network/netmount/scripts/netmount old mode 100644 new mode 100755 From bcad1a734f5e1fb94ccba50fb223c13ba09e8761 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 25 May 2011 12:45:55 +0200 Subject: [PATCH 14/29] xbmc: update to xbmc-93b77d7 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/meta | 2 +- ...> xbmc-93b77d7-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...patch => xbmc-93b77d7-201-let_select_XBMCProjectM-0.1.patch} | 0 ...SXS-0.1.patch => xbmc-93b77d7-202-let_select_RSXS-0.1.patch} | 0 ...S-0.1.patch => xbmc-93b77d7-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...ch => xbmc-93b77d7-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...1.patch => xbmc-93b77d7-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...heck-0.6.patch => xbmc-93b77d7-404-add_lame_check-0.6.patch} | 0 ...-0.1.patch => xbmc-93b77d7-452-change_lcd_content-0.1.patch} | 0 ...atch => xbmc-93b77d7-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...> xbmc-93b77d7-462-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...0.1.patch => xbmc-93b77d7-463-add_remote_devinput-0.1.patch} | 0 ... xbmc-93b77d7-901-advancedsettings_alwaysextractflags.patch} | 0 13 files changed, 1 insertion(+), 1 deletion(-) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-93b77d7-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-201-let_select_XBMCProjectM-0.1.patch => xbmc-93b77d7-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-202-let_select_RSXS-0.1.patch => xbmc-93b77d7-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-93b77d7-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-93b77d7-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-93b77d7-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-404-add_lame_check-0.6.patch => xbmc-93b77d7-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-452-change_lcd_content-0.1.patch => xbmc-93b77d7-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-93b77d7-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-93b77d7-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-463-add_remote_devinput-0.1.patch => xbmc-93b77d7-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dad2b76-901-advancedsettings_alwaysextractflags.patch => xbmc-93b77d7-901-advancedsettings_alwaysextractflags.patch} (100%) diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 3485dac7d9..f1df6768a5 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="dad2b76" +PKG_VERSION="93b77d7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dad2b76-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-93b77d7-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dad2b76-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-93b77d7-901-advancedsettings_alwaysextractflags.patch From ef707581d6c83bdf608c91e0cab8f556947dbed9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 25 May 2011 12:46:10 +0200 Subject: [PATCH 15/29] xbmc-theme-Confluence: update to xbmc-theme-Confluence-93b77d7 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 1db3d09458..d7aa510793 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="dad2b76" +PKG_VERSION="93b77d7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 58aee9b26e510d7807aef4a79936b0562beffdfe Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 25 May 2011 14:26:29 +0200 Subject: [PATCH 16/29] xbmc: update to xbmc-f13b67d Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/meta | 2 +- ...> xbmc-f13b67d-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...patch => xbmc-f13b67d-201-let_select_XBMCProjectM-0.1.patch} | 0 ...SXS-0.1.patch => xbmc-f13b67d-202-let_select_RSXS-0.1.patch} | 0 ...S-0.1.patch => xbmc-f13b67d-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...ch => xbmc-f13b67d-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...1.patch => xbmc-f13b67d-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...heck-0.6.patch => xbmc-f13b67d-404-add_lame_check-0.6.patch} | 0 ...-0.1.patch => xbmc-f13b67d-452-change_lcd_content-0.1.patch} | 0 ...atch => xbmc-f13b67d-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...> xbmc-f13b67d-462-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...0.1.patch => xbmc-f13b67d-463-add_remote_devinput-0.1.patch} | 0 ... xbmc-f13b67d-901-advancedsettings_alwaysextractflags.patch} | 0 13 files changed, 1 insertion(+), 1 deletion(-) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-f13b67d-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-201-let_select_XBMCProjectM-0.1.patch => xbmc-f13b67d-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-202-let_select_RSXS-0.1.patch => xbmc-f13b67d-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-f13b67d-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-f13b67d-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-f13b67d-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-404-add_lame_check-0.6.patch => xbmc-f13b67d-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-452-change_lcd_content-0.1.patch => xbmc-f13b67d-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-f13b67d-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-f13b67d-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-463-add_remote_devinput-0.1.patch => xbmc-f13b67d-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-93b77d7-901-advancedsettings_alwaysextractflags.patch => xbmc-f13b67d-901-advancedsettings_alwaysextractflags.patch} (100%) diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index f1df6768a5..c9e2519965 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="93b77d7" +PKG_VERSION="f13b67d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-93b77d7-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-f13b67d-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-93b77d7-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-f13b67d-901-advancedsettings_alwaysextractflags.patch From d313f48626969d5a87607bbc762e3bb414b77744 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 25 May 2011 14:26:43 +0200 Subject: [PATCH 17/29] xbmc-theme-Confluence: update to xbmc-theme-Confluence-f13b67d Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index d7aa510793..fe53635182 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="93b77d7" +PKG_VERSION="f13b67d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From aa735440a1c9e86d3de753d55dcc6ebd4edfee88 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 30 May 2011 02:12:19 +0200 Subject: [PATCH 18/29] projects/*/options: rename build so its more clear which build we use Signed-off-by: Stephan Raue --- projects/ATV/options | 2 +- projects/Fusion/options | 2 +- projects/Generic/options | 2 +- projects/ION/options | 2 +- projects/Intel/options | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/ATV/options b/projects/ATV/options index ccc3da31a2..ca54427f1a 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -1,5 +1,5 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC" + DISTRONAME="OpenELEC_EDEN" # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" diff --git a/projects/Fusion/options b/projects/Fusion/options index d0654052b9..bd2c3eb193 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -1,5 +1,5 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC" + DISTRONAME="OpenELEC_EDEN" # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" diff --git a/projects/Generic/options b/projects/Generic/options index b6041558d6..2c50138c6d 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -1,5 +1,5 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC" + DISTRONAME="OpenELEC_EDEN" # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" diff --git a/projects/ION/options b/projects/ION/options index 686e01f069..bc279138b8 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -1,5 +1,5 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC" + DISTRONAME="OpenELEC_EDEN" # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" diff --git a/projects/Intel/options b/projects/Intel/options index b0e9b8c4bb..54b0b7bc5e 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -1,5 +1,5 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC" + DISTRONAME="OpenELEC_EDEN" # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" From 3e2a6e6377a938d9ecaf26d8ea84cde9ea1b3aca Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 30 May 2011 03:19:14 +0200 Subject: [PATCH 19/29] xbmc: update to xbmc-4150345 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/meta | 2 +- ...> xbmc-4150345-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...patch => xbmc-4150345-201-let_select_XBMCProjectM-0.1.patch} | 0 ...SXS-0.1.patch => xbmc-4150345-202-let_select_RSXS-0.1.patch} | 0 ...S-0.1.patch => xbmc-4150345-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...ch => xbmc-4150345-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...1.patch => xbmc-4150345-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...heck-0.6.patch => xbmc-4150345-404-add_lame_check-0.6.patch} | 0 ...-0.1.patch => xbmc-4150345-452-change_lcd_content-0.1.patch} | 0 ...atch => xbmc-4150345-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...> xbmc-4150345-462-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...0.1.patch => xbmc-4150345-463-add_remote_devinput-0.1.patch} | 0 ... xbmc-4150345-901-advancedsettings_alwaysextractflags.patch} | 0 13 files changed, 1 insertion(+), 1 deletion(-) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-4150345-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-201-let_select_XBMCProjectM-0.1.patch => xbmc-4150345-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-202-let_select_RSXS-0.1.patch => xbmc-4150345-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-4150345-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-4150345-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-4150345-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-404-add_lame_check-0.6.patch => xbmc-4150345-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-452-change_lcd_content-0.1.patch => xbmc-4150345-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-4150345-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-4150345-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-463-add_remote_devinput-0.1.patch => xbmc-4150345-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-f13b67d-901-advancedsettings_alwaysextractflags.patch => xbmc-4150345-901-advancedsettings_alwaysextractflags.patch} (100%) diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index c9e2519965..097428aeda 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="f13b67d" +PKG_VERSION="4150345" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-f13b67d-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-f13b67d-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-901-advancedsettings_alwaysextractflags.patch From 1ab49333ece5e9cdfb926baf32e4271fd0cf2170 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 30 May 2011 03:19:32 +0200 Subject: [PATCH 20/29] xbmc-theme-Confluence: update to xbmc-theme-Confluence-4150345 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index fe53635182..d90b2421fb 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="f13b67d" +PKG_VERSION="4150345" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 7abfdb2aabf6329d155cfb92a4a5ed0a20dbc16a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 10 Jun 2011 22:06:46 +0200 Subject: [PATCH 21/29] xbmc: update python callback error handling fix patch Signed-off-by: Stephan Raue --- ...hon_callback_error_handling_fix-0.1.patch} | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) rename packages/mediacenter/xbmc/patches/{xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch => xbmc-4150345-407-python_callback_error_handling_fix-0.1.patch} (51%) diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-407-python_callback_error_handling_fix-0.1.patch similarity index 51% rename from packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-407-python_callback_error_handling_fix-0.1.patch index d2c8afac28..717bae1539 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-4150345-407-python_callback_error_handling_fix-0.1.patch @@ -1,15 +1,27 @@ -diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/pyutil.cpp ---- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-06-10 21:14:07.881047162 +0200 -@@ -23,6 +23,7 @@ +From 295930bdb8091b7a1e81f6f0558ff537a78b1ea3 Mon Sep 17 00:00:00 2001 +From: Jim Carroll +Date: Fri, 10 Jun 2011 06:59:20 -0400 +Subject: [PATCH] Fixed a problem where a python error in one callback method + can effect the execution of subsequent callbacks as the + error state in the interpreter wasn't being cleared. + +--- + xbmc/interfaces/python/xbmcmodule/pyutil.cpp | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) + +diff --git a/xbmc/interfaces/python/xbmcmodule/pyutil.cpp b/xbmc/interfaces/python/xbmcmodule/pyutil.cpp +index c7d2892..1284de5 100644 +--- a/xbmc/interfaces/python/xbmcmodule/pyutil.cpp ++++ b/xbmc/interfaces/python/xbmcmodule/pyutil.cpp +@@ -24,6 +24,7 @@ #include #include #include "addons/Skin.h" +#include "utils/log.h" #include "tinyXML/tinyxml.h" #include "utils/CharsetConverter.h" - #include "CriticalSection.h" -@@ -202,7 +203,22 @@ + #include "threads/CriticalSection.h" +@@ -197,7 +198,22 @@ void _PyXBMC_MakePendingCalls() g_callQueue.erase(iter); lock.Leave(); if (p.func) @@ -32,3 +44,6 @@ diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp xbmc-10.1-D //(*((*iter).first))((*iter).second); lock.Enter(); iter = g_callQueue.begin(); +-- +1.7.5.4 + From 5d9fbbe1868f9e06892e1853f77cdac2710585f1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 11 Jun 2011 15:43:45 +0200 Subject: [PATCH 22/29] new package: add package 'yajl' Signed-off-by: Stephan Raue --- packages/devel/yajl/build | 34 ++++++++++++++++++++++++++++++++++ packages/devel/yajl/install | 27 +++++++++++++++++++++++++++ packages/devel/yajl/meta | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100755 packages/devel/yajl/build create mode 100755 packages/devel/yajl/install create mode 100644 packages/devel/yajl/meta diff --git a/packages/devel/yajl/build b/packages/devel/yajl/build new file mode 100755 index 0000000000..864d5fa956 --- /dev/null +++ b/packages/devel/yajl/build @@ -0,0 +1,34 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# 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 OpenELEC.tv; 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 +################################################################################ + +. config/options $1 + +cd $PKG_BUILD +mkdir -p build && cd build + +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + .. + +make + +$MAKEINSTALL diff --git a/packages/devel/yajl/install b/packages/devel/yajl/install new file mode 100755 index 0000000000..b95a868e25 --- /dev/null +++ b/packages/devel/yajl/install @@ -0,0 +1,27 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# 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 OpenELEC.tv; 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 +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/usr/lib + cp -P $PKG_BUILD/build/yajl-*/lib/libyajl.so* $INSTALL/usr/lib + diff --git a/packages/devel/yajl/meta b/packages/devel/yajl/meta new file mode 100644 index 0000000000..1e85ef428a --- /dev/null +++ b/packages/devel/yajl/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# 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 OpenELEC.tv; 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 +################################################################################ + +PKG_NAME="yajl" +PKG_VERSION="1.0.12" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="ISC" +PKG_SITE="http://lloyd.github.com/yajl/" +PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="devel" +PKG_SHORTDESC="yajl: Yet Another JSON Library (YAJL) is a small event-driven (SAX-style) JSON parser" +PKG_LONGDESC="Yet Another JSON Library (YAJL) is a small event-driven (SAX-style) JSON parser written in ANSI C, and a small validating JSON generator. YAJL is released under the permissive ISC license." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" From 2e7cd2c0bc0b4162a3a9045717fe930f4fd253ea Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 11 Jun 2011 15:45:44 +0200 Subject: [PATCH 23/29] xbmc: update to xbmc-9e1ad28 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/meta | 6 +-- ...thon_callback_error_handling_fix-0.1.patch | 49 ------------------- ...-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...d28-201-let_select_XBMCProjectM-0.1.patch} | 0 ...bmc-9e1ad28-202-let_select_RSXS-0.1.patch} | 0 ...c-9e1ad28-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...1ad28-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...xbmc-9e1ad28-404-add_lame_check-0.6.patch} | 0 ...-9e1ad28-452-change_lcd_content-0.1.patch} | 0 ...28-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...9e1ad28-463-add_remote_devinput-0.1.patch} | 0 ...advancedsettings_alwaysextractflags.patch} | 0 14 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-4150345-407-python_callback_error_handling_fix-0.1.patch rename packages/mediacenter/xbmc/patches/{xbmc-4150345-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-9e1ad28-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4150345-201-let_select_XBMCProjectM-0.1.patch => xbmc-9e1ad28-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4150345-202-let_select_RSXS-0.1.patch => xbmc-9e1ad28-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4150345-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-9e1ad28-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4150345-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-9e1ad28-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4150345-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-9e1ad28-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4150345-404-add_lame_check-0.6.patch => xbmc-9e1ad28-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4150345-452-change_lcd_content-0.1.patch => xbmc-9e1ad28-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4150345-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-9e1ad28-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4150345-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-9e1ad28-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4150345-463-add_remote_devinput-0.1.patch => xbmc-9e1ad28-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4150345-901-advancedsettings_alwaysextractflags.patch => xbmc-9e1ad28-901-advancedsettings_alwaysextractflags.patch} (100%) diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 097428aeda..8acda49922 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,14 +19,14 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="4150345" +PKG_VERSION="9e1ad28" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings" -PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" +PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba alsa bc xbmc-addon-settings" +PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc: XBMC Mediacenter" diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-407-python_callback_error_handling_fix-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-407-python_callback_error_handling_fix-0.1.patch deleted file mode 100644 index 717bae1539..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-4150345-407-python_callback_error_handling_fix-0.1.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 295930bdb8091b7a1e81f6f0558ff537a78b1ea3 Mon Sep 17 00:00:00 2001 -From: Jim Carroll -Date: Fri, 10 Jun 2011 06:59:20 -0400 -Subject: [PATCH] Fixed a problem where a python error in one callback method - can effect the execution of subsequent callbacks as the - error state in the interpreter wasn't being cleared. - ---- - xbmc/interfaces/python/xbmcmodule/pyutil.cpp | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -diff --git a/xbmc/interfaces/python/xbmcmodule/pyutil.cpp b/xbmc/interfaces/python/xbmcmodule/pyutil.cpp -index c7d2892..1284de5 100644 ---- a/xbmc/interfaces/python/xbmcmodule/pyutil.cpp -+++ b/xbmc/interfaces/python/xbmcmodule/pyutil.cpp -@@ -24,6 +24,7 @@ - #include - #include - #include "addons/Skin.h" -+#include "utils/log.h" - #include "tinyXML/tinyxml.h" - #include "utils/CharsetConverter.h" - #include "threads/CriticalSection.h" -@@ -197,7 +198,22 @@ void _PyXBMC_MakePendingCalls() - g_callQueue.erase(iter); - lock.Leave(); - if (p.func) -+ { - p.func(p.args); -+ -+ // Since the callback is likely to make it into python, and since -+ // not all of the callback functions handle errors, the error state -+ // may remain set from the previous call. As a result subsequent calls -+ // to callback functions exhibit odd behavior difficult to debug. -+ if (PyErr_Occurred()) -+ { -+ CLog::Log(LOGERROR,"Exception in python script callback execution"); -+ -+ // This clears the python error state and prints it to the log -+ PyErr_Print(); -+ } -+ -+ } - //(*((*iter).first))((*iter).second); - lock.Enter(); - iter = g_callQueue.begin(); --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4150345-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4150345-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-9e1ad28-901-advancedsettings_alwaysextractflags.patch From 8de561b23babeee38a497881fca9ceffc597e497 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 11 Jun 2011 15:46:05 +0200 Subject: [PATCH 24/29] xbmc-theme-Confluence: update to xbmc-theme-Confluence-9e1ad28 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index d90b2421fb..d3f1881d80 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="4150345" +PKG_VERSION="9e1ad28" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 58898c5763dad21b259db9da64058885c4b726fa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 11 Jun 2011 15:47:43 +0200 Subject: [PATCH 25/29] wavpack: remove package 'wavpack' Signed-off-by: Stephan Raue --- packages/audio/wavpack/build | 35 --------------------------------- packages/audio/wavpack/install | 27 ------------------------- packages/audio/wavpack/meta | 36 ---------------------------------- 3 files changed, 98 deletions(-) delete mode 100755 packages/audio/wavpack/build delete mode 100755 packages/audio/wavpack/install delete mode 100644 packages/audio/wavpack/meta diff --git a/packages/audio/wavpack/build b/packages/audio/wavpack/build deleted file mode 100755 index 2c2acbb431..0000000000 --- a/packages/audio/wavpack/build +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# 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 OpenELEC.tv; 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 -################################################################################ - -. config/options $1 - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - --enable-shared \ - -make - -$MAKEINSTALL diff --git a/packages/audio/wavpack/install b/packages/audio/wavpack/install deleted file mode 100755 index 236f10acaf..0000000000 --- a/packages/audio/wavpack/install +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# 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 OpenELEC.tv; 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 -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib - diff --git a/packages/audio/wavpack/meta b/packages/audio/wavpack/meta deleted file mode 100644 index a58e67d894..0000000000 --- a/packages/audio/wavpack/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# 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 OpenELEC.tv; 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 -################################################################################ - -PKG_NAME="wavpack" -PKG_VERSION="4.60.1" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.wavpack.com" -PKG_URL="http://www.wavpack.com/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libiconv" -PKG_BUILD_DEPENDS="toolchain libiconv" -PKG_PRIORITY="optional" -PKG_SECTION="audio" -PKG_SHORTDESC="wavpack: a completely open audio compression format" -PKG_LONGDESC="WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode. Although the technology is loosely based on previous versions of WavPack, the new version 4 format has been designed from the ground up to offer unparalleled performance and functionality." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" From 243c7c2024860d9ce8cb13ff4bc029fd5e7776f5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 12 Jun 2011 01:30:17 +0200 Subject: [PATCH 26/29] new package: add package 'libnfs' Signed-off-by: Stephan Raue --- packages/network/libnfs/build | 41 +++++++++++++ packages/network/libnfs/install | 30 ++++++++++ packages/network/libnfs/meta | 36 +++++++++++ ...b382d4409c4d561025132c99b8c1850b63ad.patch | 59 +++++++++++++++++++ ...6d6bcd625d0162cc7158b597e04ef3ee1379.patch | 28 +++++++++ tools/mkpkg/mkpkg_libnfs | 43 ++++++++++++++ 6 files changed, 237 insertions(+) create mode 100755 packages/network/libnfs/build create mode 100755 packages/network/libnfs/install create mode 100644 packages/network/libnfs/meta create mode 100644 packages/network/libnfs/patches/libnfs-81132c6-310bb382d4409c4d561025132c99b8c1850b63ad.patch create mode 100644 packages/network/libnfs/patches/libnfs-81132c6-d20a6d6bcd625d0162cc7158b597e04ef3ee1379.patch create mode 100755 tools/mkpkg/mkpkg_libnfs diff --git a/packages/network/libnfs/build b/packages/network/libnfs/build new file mode 100755 index 0000000000..c17dd6d985 --- /dev/null +++ b/packages/network/libnfs/build @@ -0,0 +1,41 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# 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 OpenELEC.tv; 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 +################################################################################ + +. config/options $1 + +# libnfs fails to build with LTO support + strip_lto + +cd $PKG_BUILD +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --sysconfdir=/etc \ + --without-examples \ + +make + +$MAKEINSTALL +ln -sf libnfs.so.1.0.0 $SYSROOT_PREFIX/usr/lib/libnfs.so.1.0 +ln -sf libnfs.so.1.0 $SYSROOT_PREFIX/usr/lib/libnfs.so.1 +ln -sf libnfs.so.1 $SYSROOT_PREFIX/usr/lib/libnfs.so + diff --git a/packages/network/libnfs/install b/packages/network/libnfs/install new file mode 100755 index 0000000000..66fce82317 --- /dev/null +++ b/packages/network/libnfs/install @@ -0,0 +1,30 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# 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 OpenELEC.tv; 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 +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/*.so* $INSTALL/usr/lib/ + ln -sf libnfs.so.1.0.0 $INSTALL/usr/lib/libnfs.so.1.0 + ln -sf libnfs.so.1.0 $INSTALL/usr/lib/libnfs.so.1 + ln -sf libnfs.so.1 $INSTALL/usr/lib/libnfs.so + diff --git a/packages/network/libnfs/meta b/packages/network/libnfs/meta new file mode 100644 index 0000000000..5d1b2ce0d6 --- /dev/null +++ b/packages/network/libnfs/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# 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 OpenELEC.tv; 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 +################################################################################ + +PKG_NAME="libnfs" +PKG_VERSION="81132c6" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="https://github.com/sahlberg/libnfs" +PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="network" +PKG_SHORTDESC="libnfs: a client library for accessing NFS shares over a network." +PKG_LONGDESC="LIBNFS is a client library for accessing NFS shares over a network." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="yes" diff --git a/packages/network/libnfs/patches/libnfs-81132c6-310bb382d4409c4d561025132c99b8c1850b63ad.patch b/packages/network/libnfs/patches/libnfs-81132c6-310bb382d4409c4d561025132c99b8c1850b63ad.patch new file mode 100644 index 0000000000..c7619dc139 --- /dev/null +++ b/packages/network/libnfs/patches/libnfs-81132c6-310bb382d4409c4d561025132c99b8c1850b63ad.patch @@ -0,0 +1,59 @@ +From 310bb382d4409c4d561025132c99b8c1850b63ad Mon Sep 17 00:00:00 2001 +From: Stephan Raue +Date: Sat, 11 Jun 2011 23:25:07 +0200 +Subject: [PATCH] add DESTDIR support, needed for crosscompiling; dont + hardcode /usr/include - use --includedir= instead on + configure time + +Signed-off-by: Stephan Raue +--- + Makefile.in | 25 ++++++++++--------------- + 1 files changed, 10 insertions(+), 15 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 64f03d8..d86a1b7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,6 +1,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + libdir = @libdir@ ++includedir = @includedir@ + bindir = @bindir@ + LIBS=@LIBS@ + INSTALLCMD = @install@ -c +@@ -109,22 +110,16 @@ rquota/libnfs-raw-rquota.o: rquota/libnfs-raw-rquota.c rquota/libnfs-raw-rquota. + $(CC) $(CFLAGS) -c rquota/libnfs-raw-rquota.c -o $@ + + install: $(LIBNFS_A) $(LIBNFS_SO) +-ifeq ("$(LIBDIR)x","x") +- mkdir -p $(libdir) +- $(INSTALLCMD) -m 755 $(LIBNFS_SO) $(libdir) +- $(INSTALLCMD) -m 755 $(LIBNFS_A) $(libdir) ++ mkdir -p $(DESTDIR)$(libdir) ++ $(INSTALLCMD) -m 755 $(LIBNFS_SO) $(DESTDIR)$(libdir) ++ $(INSTALLCMD) -m 755 $(LIBNFS_A) $(DESTDIR)$(libdir) + @ldconfig@ +-else +- mkdir -p $(LIBDIR) +- $(INSTALLCMD) -m 755 $(LIBISCSI_SO) $(LIBDIR) +- $(INSTALLCMD) -m 755 $(LIBNFS_A) $(LIBDIR) +-endif +- mkdir -p $(prefix)/include/nfsc +- $(INSTALLCMD) -m 644 include/libnfs.h $(prefix)/include/nfsc +- $(INSTALLCMD) -m 644 include/libnfs-private.h $(prefix)/include/nfsc +- $(INSTALLCMD) -m 644 mount/libnfs-raw-mount.h $(prefix)/include/nfsc +- $(INSTALLCMD) -m 644 nfs/libnfs-raw-nfs.h $(prefix)/include/nfsc +- $(INSTALLCMD) -m 644 portmap/libnfs-raw-portmap.h $(prefix)/include/nfsc ++ mkdir -p $(DESTDIR)$(includedir)/nfsc ++ $(INSTALLCMD) -m 644 include/libnfs.h $(DESTDIR)$(includedir)/nfsc ++ $(INSTALLCMD) -m 644 include/libnfs-private.h $(DESTDIR)$(includedir)/nfsc ++ $(INSTALLCMD) -m 644 mount/libnfs-raw-mount.h $(DESTDIR)$(includedir)/nfsc ++ $(INSTALLCMD) -m 644 nfs/libnfs-raw-nfs.h $(DESTDIR)$(includedir)/nfsc ++ $(INSTALLCMD) -m 644 portmap/libnfs-raw-portmap.h $(DESTDIR)$(includedir)/nfsc + + distclean: clean + rm -f config.h config.log config.status configure Makefile +-- +1.7.5.4 + diff --git a/packages/network/libnfs/patches/libnfs-81132c6-d20a6d6bcd625d0162cc7158b597e04ef3ee1379.patch b/packages/network/libnfs/patches/libnfs-81132c6-d20a6d6bcd625d0162cc7158b597e04ef3ee1379.patch new file mode 100644 index 0000000000..6b8926ddd7 --- /dev/null +++ b/packages/network/libnfs/patches/libnfs-81132c6-d20a6d6bcd625d0162cc7158b597e04ef3ee1379.patch @@ -0,0 +1,28 @@ +From d20a6d6bcd625d0162cc7158b597e04ef3ee1379 Mon Sep 17 00:00:00 2001 +From: Stephan Raue +Date: Sat, 11 Jun 2011 23:22:19 +0200 +Subject: [PATCH] Disable run of ldconfig if crosscompiling too + +Signed-off-by: Stephan Raue +--- + configure.ac | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9973c92..363e671 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,6 +64,10 @@ AC_ARG_WITH([ldconfig], + [ --without-ldconfig Disable call of ldconfig on make install], + [ldconfig='echo ldconfig disabled']) + ++if test x"$cross_compiling" = xyes; then ++ ldconfig='echo crosscompiling: ldconfig disabled' ++fi ++ + AC_CONFIG_HEADER(config.h) + + EXTRA_OBJ="" +-- +1.7.5.4 + diff --git a/tools/mkpkg/mkpkg_libnfs b/tools/mkpkg/mkpkg_libnfs new file mode 100755 index 0000000000..612c4302e6 --- /dev/null +++ b/tools/mkpkg/mkpkg_libnfs @@ -0,0 +1,43 @@ +#!/bin/sh +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# 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 OpenELEC.tv; 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 +################################################################################ + +echo "getting sources..." + if [ ! -d libnfs.git ]; then + git clone git://github.com/sahlberg/libnfs.git libnfs.git + fi + + cd libnfs.git + git pull + GIT_REV=`git log -n1 --format=%h` + cd .. + +echo "copying sources..." + rm -rf libnfs-$GIT_REV + cp -R libnfs.git libnfs-$GIT_REV + +echo "cleaning sources..." + rm -rf libnfs-$GIT_REV/.git + +echo "packing sources..." + tar cvjf libnfs-$GIT_REV.tar.bz2 libnfs-$GIT_REV + +echo "remove temporary sourcedir..." + rm -rf libnfs-$GIT_REV From be11c233ba260a71626bf513df62bae2d21060b1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 12 Jun 2011 01:32:00 +0200 Subject: [PATCH 27/29] xbmc: add libnfs support Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/build | 7 +++++++ packages/mediacenter/xbmc/meta | 5 +++++ projects/ATV/options | 3 +++ projects/Fusion/options | 3 +++ projects/Generic/options | 3 +++ projects/ION/options | 3 +++ projects/Intel/options | 3 +++ 7 files changed, 27 insertions(+) diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 9e05a32f46..cb98f21628 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -52,6 +52,12 @@ else XBMC_AVAHI="--disable-avahi" fi +if [ "$NFS_SUPPORT" = yes ]; then + XBMC_NFS="--enable-nfs" +else + XBMC_NFS="--disable-nfs" +fi + if [ "$WEBSERVER" = yes ]; then XBMC_WEBSERVER="--enable-webserver" else @@ -156,6 +162,7 @@ cd $PKG_BUILD --disable-ccache \ $XBMC_PULSEAUDIO \ --enable-rtmp \ + $XBMC_NFS \ --enable-ffmpeg-libvorbis \ --enable-lame \ $XBMC_DVDCSS \ diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 8acda49922..6a65d98106 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -45,6 +45,11 @@ if [ "$AVAHI_DAEMON" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS avahi" fi +if [ "$NFS_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libnfs" + PKG_DEPENDS="$PKG_DEPENDS libnfs" +fi + if [ "$WEBSERVER" = yes ]; then PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libmicrohttpd" PKG_DEPENDS="$PKG_DEPENDS libmicrohttpd" diff --git a/projects/ATV/options b/projects/ATV/options index ca54427f1a..6624015478 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -128,6 +128,9 @@ # build with netmount (mounting network drives on boot) support (yes / no) NETMOUNT="yes" +# build with libnfs support (mounting nfs shares with XBMC) (yes / no) + NFS_SUPPORT="yes" + # build and install with XBMC webfrontend (yes / no) WEBSERVER="yes" diff --git a/projects/Fusion/options b/projects/Fusion/options index bd2c3eb193..ef3252c8b6 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -128,6 +128,9 @@ # build with netmount (mounting network drives on boot) support (yes / no) NETMOUNT="yes" +# build with libnfs support (mounting nfs shares with XBMC) (yes / no) + NFS_SUPPORT="yes" + # build and install with XBMC webfrontend (yes / no) WEBSERVER="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 5054c929cf..dacedb4b0d 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -128,6 +128,9 @@ # build with netmount (mounting network drives on boot) support (yes / no) NETMOUNT="yes" +# build with libnfs support (mounting nfs shares with XBMC) (yes / no) + NFS_SUPPORT="yes" + # build and install with XBMC webfrontend (yes / no) WEBSERVER="yes" diff --git a/projects/ION/options b/projects/ION/options index e2a106f243..a06231b0d1 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -128,6 +128,9 @@ # build with netmount (mounting network drives on boot) support (yes / no) NETMOUNT="yes" +# build with libnfs support (mounting nfs shares with XBMC) (yes / no) + NFS_SUPPORT="yes" + # build and install with XBMC webfrontend (yes / no) WEBSERVER="yes" diff --git a/projects/Intel/options b/projects/Intel/options index 54b0b7bc5e..ac687fb585 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -128,6 +128,9 @@ # build with netmount (mounting network drives on boot) support (yes / no) NETMOUNT="yes" +# build with libnfs support (mounting nfs shares with XBMC) (yes / no) + NFS_SUPPORT="yes" + # build and install with XBMC webfrontend (yes / no) WEBSERVER="yes" From 4f63a042a9eddb7a9606ffc08c904c1a75b4c444 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 12 Jun 2011 01:32:53 +0200 Subject: [PATCH 28/29] xbmc: update to xbmc-ae07638 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/meta | 2 +- ...> xbmc-ae07638-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...patch => xbmc-ae07638-201-let_select_XBMCProjectM-0.1.patch} | 0 ...SXS-0.1.patch => xbmc-ae07638-202-let_select_RSXS-0.1.patch} | 0 ...S-0.1.patch => xbmc-ae07638-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...ch => xbmc-ae07638-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...1.patch => xbmc-ae07638-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...heck-0.6.patch => xbmc-ae07638-404-add_lame_check-0.6.patch} | 0 ...-0.1.patch => xbmc-ae07638-452-change_lcd_content-0.1.patch} | 0 ...atch => xbmc-ae07638-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...> xbmc-ae07638-462-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...0.1.patch => xbmc-ae07638-463-add_remote_devinput-0.1.patch} | 0 ... xbmc-ae07638-901-advancedsettings_alwaysextractflags.patch} | 0 13 files changed, 1 insertion(+), 1 deletion(-) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-ae07638-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-201-let_select_XBMCProjectM-0.1.patch => xbmc-ae07638-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-202-let_select_RSXS-0.1.patch => xbmc-ae07638-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-ae07638-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-ae07638-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-ae07638-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-404-add_lame_check-0.6.patch => xbmc-ae07638-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-452-change_lcd_content-0.1.patch => xbmc-ae07638-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-ae07638-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-ae07638-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-463-add_remote_devinput-0.1.patch => xbmc-ae07638-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-9e1ad28-901-advancedsettings_alwaysextractflags.patch => xbmc-ae07638-901-advancedsettings_alwaysextractflags.patch} (100%) diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 6a65d98106..72e3e0e039 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="9e1ad28" +PKG_VERSION="ae07638" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-9e1ad28-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-ae07638-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-9e1ad28-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-ae07638-901-advancedsettings_alwaysextractflags.patch From 120c882bf12a0533ffc6c67c20a012abbbef8496 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 12 Jun 2011 01:33:14 +0200 Subject: [PATCH 29/29] xbmc-theme-Confluence: update to xbmc-theme-Confluence-ae07638 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index d3f1881d80..46ba7f56a2 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="9e1ad28" +PKG_VERSION="ae07638" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL"