diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta index b440712fb5..cbe14b0b6e 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="5c6848a" +PKG_VERSION="522042f" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build index cb98f21628..04d58bc8da 100755 --- a/packages/mediacenter/xbmc-pvr/build +++ b/packages/mediacenter/xbmc-pvr/build @@ -22,6 +22,12 @@ . config/options $1 +if [ "$XBMC_SCR_RSXS" = yes ]; then + XBMC_RSXS="--enable-rsxs" +else + XBMC_RSXS="--disable-rsxs" +fi + if [ "$XBMC_VIS_PROJECTM" = yes ]; then XBMC_PROJECTM="--enable-xbmcprojectm" else @@ -157,8 +163,9 @@ cd $PKG_BUILD --enable-joystick \ --enable-xrandr \ --disable-goom \ + $XBMC_RSXS \ $XBMC_PROJECTM \ - --disable-rsxs \ + --enable-x11 \ --disable-ccache \ $XBMC_PULSEAUDIO \ --enable-rtmp \ diff --git a/packages/mediacenter/xbmc-pvr/fonts/cwheib-1.ttf b/packages/mediacenter/xbmc-pvr/fonts/cwheib-1.ttf deleted file mode 100644 index cf1ac59e06..0000000000 Binary files a/packages/mediacenter/xbmc-pvr/fonts/cwheib-1.ttf and /dev/null differ diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index aaadad2568..7668242bad 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -19,15 +19,15 @@ ################################################################################ PKG_NAME="xbmc-pvr" -PKG_VERSION="5c6848a" +PKG_VERSION="522042f" 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/sources/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist 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 libplist 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_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist 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 libplist 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-pvr: XBMC Mediacenter" @@ -36,6 +36,23 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" +# for libX11 support + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext" + PKG_DEPENDS="$PKG_DEPENDS libX11 libXext" + +# for libXrandr support + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXrandr" + PKG_DEPENDS="$PKG_DEPENDS libXrandr" + +# for dbus support + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS dbus" + PKG_DEPENDS="$PKG_DEPENDS dbus" + +if [ "$XBMC_SCR_RSXS" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXt libXmu" + PKG_DEPENDS="$PKG_DEPENDS libXt libXmu" +fi + if [ "$FAAC_SUPPORT" = yes ]; then PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS faac" PKG_DEPENDS="$PKG_DEPENDS faac" diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 76% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-001-add_support_to_specify_GIT_REV-0.1.patch index 89a229d0d0..c013e0ae3a 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-001-add_support_to_specify_GIT_REV-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-001-add_support_to_specify_GIT_REV-0.1.patch @@ -1,7 +1,7 @@ -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 @@ +diff -Naur xbmc-9389dc8/configure.in xbmc-9389dc8.patch/configure.in +--- xbmc-9389dc8/configure.in 2011-09-01 17:21:47.000000000 +0200 ++++ xbmc-9389dc8.patch/configure.in 2011-09-01 23:30:40.419399392 +0200 +@@ -428,6 +428,14 @@ esac AC_SUBST([ARCH]) @@ -16,7 +16,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in # platform debug flags if test "$use_debug" = "yes"; then final_message="$final_message\n Debugging:\tYes" -@@ -1090,7 +1098,6 @@ +@@ -1177,7 +1185,6 @@ fi fi @@ -24,7 +24,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in # Checks for header files. AC_HEADER_DIRENT -@@ -1279,12 +1286,6 @@ +@@ -1408,12 +1415,6 @@ final_message="$final_message\n Avahi:\tNo" fi diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-013-reenable_lcd_config_settings-0.1.patch similarity index 54% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-013-reenable_lcd_config_settings-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-013-reenable_lcd_config_settings-0.1.patch index c8bb48ac28..656dcac934 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-013-reenable_lcd_config_settings-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-013-reenable_lcd_config_settings-0.1.patch @@ -1,7 +1,7 @@ -diff -Naur xbmc-eedceeb/xbmc/settings/GUISettings.cpp xbmc-eedceeb.patch/xbmc/settings/GUISettings.cpp ---- xbmc-eedceeb/xbmc/settings/GUISettings.cpp 2011-06-18 21:30:30.000000000 +0200 -+++ xbmc-eedceeb.patch/xbmc/settings/GUISettings.cpp 2011-06-18 22:02:53.535611620 +0200 -@@ -422,7 +422,8 @@ +diff -Naur xbmc-9389dc8/xbmc/settings/GUISettings.cpp xbmc-9389dc8.patch/xbmc/settings/GUISettings.cpp +--- xbmc-9389dc8/xbmc/settings/GUISettings.cpp 2011-09-01 23:34:05.267139356 +0200 ++++ xbmc-9389dc8.patch/xbmc/settings/GUISettings.cpp 2011-09-01 23:34:52.098765331 +0200 +@@ -423,7 +423,8 @@ AddString(vs, "videoscreen.testpattern",226,"", BUTTON_CONTROL_STANDARD); #endif #if defined(_LINUX) && !defined(__APPLE__) diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-201-let_select_XBMCProjectM-0.1.patch similarity index 72% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-201-let_select_XBMCProjectM-0.1.patch index d41fd60337..0697a233fc 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-201-let_select_XBMCProjectM-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-201-let_select_XBMCProjectM-0.1.patch @@ -1,7 +1,7 @@ -diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in ---- xbmc-30a9070/configure.in 2011-07-28 06:20:11.000000000 +0200 -+++ xbmc-30a9070.patch/configure.in 2011-07-28 09:03:13.184376904 +0200 -@@ -66,6 +66,8 @@ +diff -Naur xbmc-9389dc8/configure.in xbmc-9389dc8.patch/configure.in +--- xbmc-9389dc8/configure.in 2011-09-01 23:34:05.488142309 +0200 ++++ xbmc-9389dc8.patch/configure.in 2011-09-01 23:51:26.371021628 +0200 +@@ -68,6 +68,8 @@ xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. ==" goom_enabled="== GOOM enabled. ==" goom_disabled="== GOOM disabled. ==" @@ -10,7 +10,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" pulse_disabled="== PulseAudio support manually disabled. ==" dvdcss_enabled="== DVDCSS support enabled. ==" -@@ -207,6 +209,12 @@ +@@ -219,6 +221,12 @@ [use_goom=$enableval], [use_goom=no]) @@ -23,23 +23,23 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in AC_ARG_ENABLE([ccache], [AS_HELP_STRING([--enable-ccache], [enable building with ccache feature (default is auto)])], -@@ -804,6 +812,15 @@ +@@ -850,6 +858,15 @@ fi fi +# XBMCPROJECTM -+if test "$use_xbmcprojectm" = "yes" && test "use_gl" == "yes"; then -+ AC_MSG_NOTICE($xbmcprojectm_enabled) -+ DISABLE_XBMCPROJECTM=0 -+else ++if test "$use_xbmcprojectm" = "no" || test "$use_gl" = "no"; then + AC_MSG_NOTICE($xbmcprojectm_disabled) + DISABLE_XBMCPROJECTM=1 ++else ++ AC_MSG_NOTICE($xbmcprojectm_enabled) ++ DISABLE_XBMCPROJECTM=0 +fi + # libRTMP if test "$use_librtmp" != "no"; then AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],, -@@ -1258,6 +1275,12 @@ +@@ -1324,6 +1341,12 @@ final_message="$final_message\n GOOM:\t\tNo" fi @@ -52,7 +52,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in if test "$use_libbluray" = "yes"; then final_message="$final_message\n Bluray:\tYes" else -@@ -1486,6 +1509,7 @@ +@@ -1553,6 +1576,7 @@ AC_SUBST(SDL_DEFINES) AC_SUBST(BUILD_DVDCSS) AC_SUBST(DISABLE_GOOM) @@ -60,7 +60,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(PYTHON_VERSION) AC_SUBST(OUTPUT_FILES) -@@ -1729,7 +1753,7 @@ +@@ -1797,7 +1821,7 @@ fi set +x fi @@ -69,20 +69,19 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ ./configure \ -diff -Naur xbmc-30a9070/Makefile.in xbmc-30a9070.patch/Makefile.in ---- xbmc-30a9070/Makefile.in 2011-07-28 06:20:13.000000000 +0200 -+++ xbmc-30a9070.patch/Makefile.in 2011-07-28 09:03:13.186376930 +0200 -@@ -143,8 +143,11 @@ +diff -Naur xbmc-9389dc8/Makefile.in xbmc-9389dc8.patch/Makefile.in +--- xbmc-9389dc8/Makefile.in 2011-09-01 23:34:05.581143554 +0200 ++++ xbmc-9389dc8.patch/Makefile.in 2011-09-01 23:52:59.832272157 +0200 +@@ -144,8 +144,10 @@ ifeq (@USE_OPENGL@,1) VIS_DIRS+=\ xbmc/visualizations/OpenGLSpectrum \ - xbmc/visualizations/WaveForm \ -- xbmc/visualizations/XBMCProjectM \ +- xbmc/visualizations/XBMCProjectM + xbmc/visualizations/WaveForm -+ +ifneq (@DISABLE_XBMCPROJECTM@,1) -+VIS_DIRS+=xbmc/visualizations/XBMCProjectM ++ VIS_DIRS+=xbmc/visualizations/XBMCProjectM +endif - endif - ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1)) + + ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1)) diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-202-let_select_RSXS-0.1.patch similarity index 98% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-202-let_select_RSXS-0.1.patch index f2544b77ba..cb6b5fe46e 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-202-let_select_RSXS-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-202-let_select_RSXS-0.1.patch @@ -77,7 +77,7 @@ diff -Naur xbmc-30a9070/Makefile.in xbmc-30a9070.patch/Makefile.in SS_DIRS= ifeq (@USE_OPENGL@,1) +ifneq (@DISABLE_RSXS@,1) - SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc + SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc endif +endif diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-351-increase_YV12_buffers-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-351-increase_YV12_buffers-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-351-increase_YV12_buffers-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-464-add_eject_keymapping_for_lirc-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-464-add_eject_keymapping_for_lirc-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-464-add_eject_keymapping_for_lirc-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-901-advancedsettings_alwaysextractflags.patch similarity index 61% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-901-advancedsettings_alwaysextractflags.patch index af37c9b5a7..336d778455 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-901-advancedsettings_alwaysextractflags.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-901-advancedsettings_alwaysextractflags.patch @@ -1,7 +1,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 @@ +diff -Naur xbmc-a8d22f6/xbmc/settings/GUISettings.cpp xbmc-a8d22f6.patch/xbmc/settings/GUISettings.cpp +--- xbmc-a8d22f6/xbmc/settings/GUISettings.cpp 2011-08-02 15:01:17.000000000 +0200 ++++ xbmc-a8d22f6.patch/xbmc/settings/GUISettings.cpp 2011-08-02 15:25:47.205925050 +0200 +@@ -654,6 +654,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,9 +9,9 @@ diff -Naur xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp xbmc-pvr-3513480.patch AddBool(vid, "myvideos.filemetadata", 20419, true); AddBool(NULL, "myvideos.extractthumb",20433, true); -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 +diff -Naur xbmc-a8d22f6/xbmc/ThumbLoader.cpp xbmc-a8d22f6.patch/xbmc/ThumbLoader.cpp +--- xbmc-a8d22f6/xbmc/ThumbLoader.cpp 2011-08-02 15:01:19.000000000 +0200 ++++ xbmc-a8d22f6.patch/xbmc/ThumbLoader.cpp 2011-08-02 15:24:54.831265675 +0200 @@ -146,7 +146,7 @@ m_item.SetThumbnailImage(m_target); } diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-902-vdpau_fix_deinterlacing_if_flag_toggles.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-902-vdpau_fix_deinterlacing_if_flag_toggles.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-902-vdpau_fix_deinterlacing_if_flag_toggles.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-522042f-902-vdpau_fix_deinterlacing_if_flag_toggles.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-352-store_reordered_opaque_to_pic-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-352-store_reordered_opaque_to_pic-0.1.patch deleted file mode 100644 index b93edd8f4e..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-352-store_reordered_opaque_to_pic-0.1.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d25fbc8248be3cc0b208614faca394c56157cf1a Mon Sep 17 00:00:00 2001 -From: FernetMenta -Date: Fri, 12 Aug 2011 12:39:37 +0200 -Subject: [PATCH] vaapi: store reordered_opaque to pic - ---- - xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -index d9d2bd2..bcc3fe1 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -@@ -205,6 +205,7 @@ int CDecoder::GetBuffer(AVCodecContext *avctx, AVFrame *pic) - pic->linesize[1] = 0; - pic->linesize[2] = 0; - pic->linesize[3] = 0; -+ pic->reordered_opaque= avctx->reordered_opaque; - return 0; - } - --- -1.7.5.4 -