From 6a0f270d3525f21eb64c97f2fdcbb4d29f14912f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Aug 2011 21:18:15 +0200 Subject: [PATCH] xbmc: remove some old patches Signed-off-by: Stephan Raue --- ...1-add_support_to_specify_GIT_REV-0.1.patch | 39 ------ ...013-reenable_lcd_config_settings-0.1.patch | 13 -- ...2d0382-351-increase_YV12_buffers-0.1.patch | 34 ----- ...52-store_reordered_opaque_to_pic-0.1.patch | 24 ---- ...2d0382-402-enable_yasm_in_ffmpeg-0.1.patch | 21 --- .../xbmc-32d0382-404-add_lame_check-0.6.patch | 125 ------------------ ...c-32d0382-452-change_lcd_content-0.1.patch | 12 -- ...382-453-add_openelec.tv_RSS_news-0.1.patch | 11 -- ...382-453-ps3_remote_be_more_quiet-0.1.patch | 29 ---- ...2-add_remote_irtrans_mediacenter-0.1.patch | 52 -------- ...-32d0382-463-add_remote_devinput-0.1.patch | 71 ---------- ...64-add_eject_keymapping_for_lirc-0.1.patch | 11 -- ...-advancedsettings_alwaysextractflags.patch | 23 ---- 13 files changed, 465 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-001-add_support_to_specify_GIT_REV-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-013-reenable_lcd_config_settings-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-351-increase_YV12_buffers-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-352-store_reordered_opaque_to_pic-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-402-enable_yasm_in_ffmpeg-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-404-add_lame_check-0.6.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-452-change_lcd_content-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-453-add_openelec.tv_RSS_news-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-453-ps3_remote_be_more_quiet-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-462-add_remote_irtrans_mediacenter-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-463-add_remote_devinput-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-464-add_eject_keymapping_for_lirc-0.1.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-32d0382-901-advancedsettings_alwaysextractflags.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-001-add_support_to_specify_GIT_REV-0.1.patch deleted file mode 100644 index 89a229d0d0..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-001-add_support_to_specify_GIT_REV-0.1.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 --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" -@@ -1090,7 +1098,6 @@ - fi - fi - --AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) - - # Checks for header files. - AC_HEADER_DIRENT -@@ -1279,12 +1286,6 @@ - final_message="$final_message\n Avahi:\tNo" - fi - --if test "$HAVE_GIT" = "yes"; then -- 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" --fi - if test "$host_vendor" = "apple"; then - echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h - else diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-013-reenable_lcd_config_settings-0.1.patch deleted file mode 100644 index c8bb48ac28..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-013-reenable_lcd_config_settings-0.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 @@ - AddString(vs, "videoscreen.testpattern",226,"", BUTTON_CONTROL_STANDARD); - #endif - #if defined(_LINUX) && !defined(__APPLE__) -- AddBool(NULL, "videoscreen.haslcd", 4501, false); -+ AddSeparator(vs, "videoscreen.sep2"); -+ AddBool(vs, "videoscreen.haslcd", 4501, false); - #endif - - CSettingsCategory* ao = AddCategory(4, "audiooutput", 772); diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-351-increase_YV12_buffers-0.1.patch deleted file mode 100644 index bc842ab6d0..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-351-increase_YV12_buffers-0.1.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0c2185d62f858f7b41461b4141e731dc7ec01ca6 Mon Sep 17 00:00:00 2001 -From: FernetMenta -Date: Thu, 11 Aug 2011 18:35:18 +0200 -Subject: [PATCH] LinuxRendererGL: increase buffers to 3 - ---- - xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -index 18c6da4..79a9d90 100644 ---- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -+++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -@@ -223,7 +223,7 @@ bool CLinuxRendererGL::ValidateRenderer() - - void CLinuxRendererGL::ManageTextures() - { -- m_NumYV12Buffers = 2; -+ m_NumYV12Buffers = 3; - //m_iYV12RenderBuffer = 0; - return; - } -@@ -720,7 +720,7 @@ unsigned int CLinuxRendererGL::PreInit() - m_resolution = RES_PAL_4x3; - - m_iYV12RenderBuffer = 0; -- m_NumYV12Buffers = 2; -+ m_NumYV12Buffers = 3; - - // setup the background colour - m_clearColour = (float)(g_advancedSettings.m_videoBlackBarColour & 0xff) / 0xff; --- -1.7.5.4 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-352-store_reordered_opaque_to_pic-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-352-store_reordered_opaque_to_pic-0.1.patch deleted file mode 100644 index b93edd8f4e..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-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 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-402-enable_yasm_in_ffmpeg-0.1.patch deleted file mode 100644 index b8f5b8afcf..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-402-enable_yasm_in_ffmpeg-0.1.patch +++ /dev/null @@ -1,21 +0,0 @@ -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",) - 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)) \ -+ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \ - --disable-muxers \ - --enable-muxer=spdif \ - --enable-muxer=adts \ diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-404-add_lame_check-0.6.patch deleted file mode 100644 index a459219108..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-404-add_lame_check-0.6.patch +++ /dev/null @@ -1,125 +0,0 @@ -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. ==" -+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. ==" -@@ -244,6 +246,12 @@ - [use_ffmpeg_libvorbis=$enableval], - [use_ffmpeg_libvorbis=no]) - -+AC_ARG_ENABLE([lame], -+ [AS_HELP_STRING([--enable-lame], -+ [enable lame support (default is yes)])], -+ [use_lame=$enableval], -+ [use_lame=yes]) -+ - AC_ARG_ENABLE([dvdcss], - [AS_HELP_STRING([--enable-dvdcss], - [enable DVDCSS support (default is yes)])], -@@ -758,6 +766,20 @@ - USE_PULSE=0 - fi - -+# LAME -+if test "$use_lame" = "yes"; then -+ AC_CHECK_LIB([mp3lame], [main], -+ AC_DEFINE([HAVE_LIBMP3LAME], [1], [Define to 1 if you have the 'libmp3lame' library (-lmp3lame).]), -+ use_lame=no;AC_MSG_RESULT($lame_not_found)) -+else -+ AC_MSG_RESULT($lame_disabled) -+fi -+if test "$use_lame" = "yes"; then -+ AC_SUBST([HAVE_LIBMP3LAME], 1) -+else -+ AC_SUBST([HAVE_LIBMP3LAME], 0) -+fi -+ - # HAL - if test "$host_vendor" = "apple" ; then - use_hal="no" -@@ -1311,6 +1333,12 @@ - final_message="$final_message\n HAL Support:\tNo" - fi - -+if test "$use_lame" = "yes"; then -+ final_message="$final_message\n LAME:\t\tYes" -+else -+ final_message="$final_message\n LAME:\t\tNo" -+fi -+ - # DVDCSS - if test "$use_dvdcss" = "yes"; then - AC_MSG_NOTICE($dvdcss_enabled) -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 "utils/StringUtils.h" - #include "Util.h" -+ -+#ifdef HAVE_LIBMP3LAME - #include "EncoderLame.h" -+#endif -+ - #include "EncoderWav.h" - #include "EncoderVorbis.h" - #include "EncoderFFmpeg.h" -@@ -78,9 +82,16 @@ - case CDDARIP_ENCODER_FLAC: - m_pEncoder = new CEncoderFlac(); - break; -- default: -+#ifdef HAVE_LIBMP3LAME -+ case CDDARIP_ENCODER_LAME: - m_pEncoder = new CEncoderLame(); - break; -+#else -+ default: -+ CLog::Log(LOGERROR,"invalid encoder selected"); -+ return false; -+ break; -+#endif - } - - // we have to set the tags before we init the Encoder -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 \ - -+ifeq (@HAVE_LIBMP3LAME@,1) -+ SRCS+=EncoderLame.cpp -+endif -+ - LIB=cdrip.a - - 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; -+#ifdef HAVE_LIBMP3LAME - encoders.insert(make_pair(34000,CDDARIP_ENCODER_LAME)); -+#endif - encoders.insert(make_pair(34001,CDDARIP_ENCODER_VORBIS)); - encoders.insert(make_pair(34002,CDDARIP_ENCODER_WAV)); - encoders.insert(make_pair(34005,CDDARIP_ENCODER_FLAC)); diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-452-change_lcd_content-0.1.patch deleted file mode 100644 index 0427b534f9..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-452-change_lcd_content-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -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] - - -- XBMC running... -+ *** OpenELEC *** - $INFO[System.Time] $INFO[System.Date] - Freemem: $INFO[System.FreeMemory] - $INFO[System.ScreenWidth]x$INFO[System.ScreenHeight] $INFO[System.ScreenMode] diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-453-add_openelec.tv_RSS_news-0.1.patch deleted file mode 100644 index 5b32c0cce7..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-453-add_openelec.tv_RSS_news-0.1.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur xbmc-10.1-Dharma/userdata/RssFeeds.xml xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml ---- xbmc-10.1-Dharma/userdata/RssFeeds.xml 2011-03-08 02:49:24.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml 2011-06-14 17:07:08.450880123 +0200 -@@ -3,6 +3,7 @@ - - - -+ http://openelec.tv/news?format=feed&type=rss - http://feeds.feedburner.com/xbmc - - diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-453-ps3_remote_be_more_quiet-0.1.patch deleted file mode 100644 index 6b2f879e1c..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-453-ps3_remote_be_more_quiet-0.1.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - while target_connected is False: -- xbmc.send_notification("Action Required!", -- "Hold Start+Enter on your remote.", -- bticon) - print "Searching for %s" % target_name - print "(Hold Start + Enter on remote to make it discoverable)" - time.sleep(2) -@@ -72,7 +69,6 @@ - except Exception, e: - print "Error performing bluetooth discovery" - print str(e) -- xbmc.send_notification("Error", "Unable to find devices.", bticon) - time.sleep(5) - continue - -@@ -109,7 +105,6 @@ - print "ERROR - Could Not Connect. Trying again..." - time.sleep(2) - else: -- xbmc.send_notification("Error", "No remotes were found.", bticon) - print "Could not find BD Remote Control. Trying again..." - time.sleep(2) - return (remote,target_address) diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-462-add_remote_irtrans_mediacenter-0.1.patch deleted file mode 100644 index 0edef5a7a5..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-462-add_remote_irtrans_mediacenter-0.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 - -+ -+ pause -+ stop -+ fwd -+ rew -+ left -+ right -+ up -+ down -+ -+ ch+ -+ ch- -+ back -+ clear -+ play -+ info -+ next -+ prev -+ teletext -+ ehome -+ rec -+ vol+ -+ vol- -+ mute -+ power -+ video -+ music -+ pictures -+ tv -+ 1 -+ 2 -+ 3 -+ 4 -+ 5 -+ 6 -+ 7 -+ 8 -+ 9 -+ 0 -+ red -+ green -+ yellow -+ blue -+ - diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-463-add_remote_devinput-0.1.patch deleted file mode 100644 index 85d635b61b..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-463-add_remote_devinput-0.1.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lircmap.xml ---- xbmc-10.1-Dharma/system/Lircmap.xml 2011-06-18 01:43:43.132101246 +0200 -+++ xbmc-10.1-Dharma.patch/system/Lircmap.xml 2011-06-18 01:44:53.777025290 +0200 -@@ -365,7 +365,6 @@ - - - cx23885_remote -- devinput - KEY_LEFT - KEY_RIGHT - KEY_UP -@@ -452,4 +451,59 @@ - yellow - blue - -+ -+ -+ KEY_LEFT -+ KEY_RIGHT -+ KEY_UP -+ KEY_DOWN -+ -+ KEY_ENTER -+ KEY_DELETE -+ KEY_PROG1 -+ KEY_EXIT -+ KEY_RECORD -+ KEY_PLAY -+ KEY_PAUSE -+ KEY_STOP -+ KEY_FASTFORWARD -+ KEY_REWIND -+ KEY_VOLUMEUP -+ KEY_VOLUMEDOWN -+ KEY_CHANNELUP -+ KEY_CHANNELDOWN -+ KEY_NEXT -+ KEY_PREVIOUS -+ KEY_EPG -+ KEY_SUBTITLE -+ KEY_LANGUAGE -+ KEY_INFO -+ KEY_ZOOM -+ KEY_MUTE -+ KEY_POWER -+ KEY_EJECT -+ KEY_DVD -+ KEY_MENU -+ KEY_VIDEO -+ KEY_AUDIO -+ KEY_CAMERA -+ KEY_TUNER -+ KEY_TEXT -+ KEY_NUMERIC_1 -+ KEY_NUMERIC_2 -+ KEY_NUMERIC_3 -+ KEY_NUMERIC_4 -+ KEY_NUMERIC_5 -+ KEY_NUMERIC_6 -+ KEY_NUMERIC_7 -+ KEY_NUMERIC_8 -+ KEY_NUMERIC_9 -+ KEY_NUMERIC_0 -+ KEY_NUMERIC_STAR -+ KEY_NUMERIC_POUND -+ KEY_RED -+ KEY_GREEN -+ KEY_YELLOW -+ KEY_BLUE -+ - diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-464-add_eject_keymapping_for_lirc-0.1.patch deleted file mode 100644 index 56c56016b5..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-464-add_eject_keymapping_for_lirc-0.1.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur xbmc-10.1-Dharma/system/keymaps/remote.xml xbmc-10.1-Dharma.patch/system/keymaps/remote.xml ---- xbmc-10.1-Dharma/system/keymaps/remote.xml 2011-03-08 02:49:23.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/system/keymaps/remote.xml 2011-06-18 01:48:26.887811969 +0200 -@@ -63,6 +63,7 @@ - VolumeDown - Mute - XBMC.ShutDown() -+ XBMC.EjectTray() - XBMC.ActivateWindow(MyVideos) - XBMC.ActivateWindow(MyMusic) - XBMC.ActivateWindow(MyPictures) diff --git a/packages/mediacenter/xbmc/patches/xbmc-32d0382-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-32d0382-901-advancedsettings_alwaysextractflags.patch deleted file mode 100644 index 336d778455..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-32d0382-901-advancedsettings_alwaysextractflags.patch +++ /dev/null @@ -1,23 +0,0 @@ -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); -+ AddBool(vid, "myvideos.alwaysextractflags",20433, false); - AddBool(vid, "myvideos.filemetadata", 20419, true); - AddBool(NULL, "myvideos.extractthumb",20433, true); - -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); - } - } -- else if (m_item.HasVideoInfoTag() && !m_item.GetVideoInfoTag()->HasStreamDetails()) -+ else if (m_item.HasVideoInfoTag() && (!m_item.GetVideoInfoTag()->HasStreamDetails() || g_guiSettings.GetBool("myvideos.alwaysextractflags"))) - { - CLog::Log(LOGDEBUG,"%s - trying to extract filestream details from video file %s", __FUNCTION__, m_path.c_str()); - result = CDVDFileInfo::GetFileStreamDetails(&m_item);