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