From cf7a171ae4c9dd540f3a083a1031a5dafc4ecd6a Mon Sep 17 00:00:00 2001 From: Gujs Date: Sun, 3 Apr 2011 23:34:10 +0200 Subject: [PATCH] xbmc-pvr: update to latest git version --- .../xbmc-pvr-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-pvr/build | 1 + packages/mediacenter/xbmc-pvr/meta | 7 +++---- ...eck_for_Confluence_at_configure-0.1.patch} | 0 ...3ef-201-let_select_XBMCProjectM-0.1.patch} | 0 ...ter-05bd3ef-202-let_select_RSXS-0.1.patch} | 4 ++-- ...r-05bd3ef-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...bd3ef-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ..._only_needed_for_internal_python-0.1.patch | 12 +++++++++++ ...-05bd3ef-452-change_lcd_content-0.1.patch} | 0 ...ef-452-ps3_remote_be_more_quiet-0.1.patch} | 0 ...-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...05bd3ef-463-add_remote_devinput-0.1.patch} | 0 ...advancedsettings_alwaysextractflags.patch} | 0 ..._only_needed_for_internal_python-0.1.patch | 21 ------------------- 16 files changed, 19 insertions(+), 28 deletions(-) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch => xbmc-pvr-master-05bd3ef-101-don_not_check_for_Confluence_at_configure-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch => xbmc-pvr-master-05bd3ef-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch => xbmc-pvr-master-05bd3ef-202-let_select_RSXS-0.1.patch} (97%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-pvr-master-05bd3ef-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-pvr-master-05bd3ef-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-pvr-master-05bd3ef-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-403-openssl_only_needed_for_internal_python-0.1.patch rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-452-change_lcd_content-0.1.patch => xbmc-pvr-master-05bd3ef-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-452-ps3_remote_be_more_quiet-0.1.patch => xbmc-pvr-master-05bd3ef-452-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-pvr-master-05bd3ef-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-463-add_remote_devinput-0.1.patch => xbmc-pvr-master-05bd3ef-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch => xbmc-pvr-master-05bd3ef-901-advancedsettings_alwaysextractflags.patch} (100%) delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta index 03bbb17de6..4218e3bfee 100644 --- a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr-theme-Confluence" -PKG_VERSION="master-2a1a563" +PKG_VERSION="master-05bd3ef" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build index 237dc994f9..ff67104751 100755 --- a/packages/mediacenter/xbmc-pvr/build +++ b/packages/mediacenter/xbmc-pvr/build @@ -137,6 +137,7 @@ do_autoreconf lib/libid3tag/libid3tag $XBMC_PULSEAUDIO \ --enable-ffmpeg-libvorbis \ --disable-faac \ + --enable-lame \ $XBMC_DVDCSS \ --disable-mid \ $XBMC_AVAHI \ diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index 417d40ad55..a6a2318c2e 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -19,15 +19,15 @@ ################################################################################ PKG_NAME="xbmc-pvr" -PKG_VERSION="master-2a1a563" +PKG_VERSION="master-05bd3ef" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" #PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_URL="http://gujs.openelec.tv/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings" -PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" +PKG_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_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc-pvr: XBMC Mediacenter" @@ -74,4 +74,3 @@ fi if [ "$PS3REMOTE_SUPPORT" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS PyBluez" fi - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-101-don_not_check_for_Confluence_at_configure-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-101-don_not_check_for_Confluence_at_configure-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-202-let_select_RSXS-0.1.patch similarity index 97% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-202-let_select_RSXS-0.1.patch index b9be5bba6c..5c1de763ae 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-202-let_select_RSXS-0.1.patch @@ -85,10 +85,10 @@ diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in VIS_DIRS=\ xbmc/visualizations/OpenGLSpectrum \ -@@ -323,8 +325,10 @@ +@@ -483,8 +485,10 @@ $(MAKE) -C xbmc/pvrclients/tvheadend screensavers: exports - ifneq (arm, @ARCH@) + ifneq ($(findstring arm,@ARCH@), arm) +ifneq (@BUILD_RSXS@,1) $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc endif diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-403-openssl_only_needed_for_internal_python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-403-openssl_only_needed_for_internal_python-0.1.patch new file mode 100644 index 0000000000..2daf7ad2fe --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-403-openssl_only_needed_for_internal_python-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur xbmc-10.0-Dharma/configure.in xbmc-10.0-Dharma.patch/configure.in +--- xbmc-10.0-Dharma/configure.in 2010-12-17 20:30:53.000000000 +0100 ++++ xbmc-10.0-Dharma.patch/configure.in 2011-01-06 03:41:05.387941174 +0100 +@@ -940,6 +938,8 @@ + USE_EXTERNAL_PYTHON=1 + AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.]) + else ++ AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) ++ AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) + AC_MSG_NOTICE($external_python_disabled) + USE_EXTERNAL_PYTHON=0 + fi diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-901-advancedsettings_alwaysextractflags.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch deleted file mode 100644 index f914bcde7b..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur xbmc-10.0-Dharma/configure.in xbmc-10.0-Dharma.patch/configure.in ---- xbmc-10.0-Dharma/configure.in 2010-12-17 20:30:53.000000000 +0100 -+++ xbmc-10.0-Dharma.patch/configure.in 2011-01-06 03:41:05.387941174 +0100 -@@ -546,8 +546,6 @@ - AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library)) --AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) --AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([wavpack], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([mpeg2], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library)) -@@ -940,6 +938,8 @@ - USE_EXTERNAL_PYTHON=1 - AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.]) - else -+ AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) -+ AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) - AC_MSG_NOTICE($external_python_disabled) - USE_EXTERNAL_PYTHON=0 - fi