From e296c68d17e8801fdb4feface9f89902ad37f9ef Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 21 Aug 2011 18:04:44 +0200 Subject: [PATCH 01/11] xbmc: add patch to fix wrong native type in python parse Signed-off-by: Stephan Raue --- ...-335-Python_parse_had_wrong_native_type-0.1.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch new file mode 100644 index 0000000000..27823a10ab --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp +--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp 2011-03-08 02:49:14.000000000 +0100 ++++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp 2011-08-21 17:13:13.382281536 +0200 +@@ -74,7 +74,7 @@ + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, +- (char*)"iOO|bl", ++ (char*)"iOO|bi", + (char**)keywords, + &handle, + &pURL, From 5db86930bf5c9676d495146ce401e76444b3df6b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 21 Aug 2011 20:12:54 +0200 Subject: [PATCH 02/11] xbmc: update to xbmc-ce5668d Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- ...> xbmc-ce5668d-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ... => xbmc-ce5668d-013-reenable_lcd_config_settings-0.1.patch} | 0 ...patch => xbmc-ce5668d-201-let_select_XBMCProjectM-0.1.patch} | 0 ...SXS-0.1.patch => xbmc-ce5668d-202-let_select_RSXS-0.1.patch} | 0 ...S-0.1.patch => xbmc-ce5668d-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...1.patch => xbmc-ce5668d-351-increase_YV12_buffers-0.1.patch} | 0 ...5668d-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch} | 0 ...-vaapi_increase_number_of_video_surface_allocated-0.1.patch} | 0 ...1.patch => xbmc-ce5668d-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...heck-0.6.patch => xbmc-ce5668d-404-add_lame_check-0.6.patch} | 0 ...8d-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...-0.1.patch => xbmc-ce5668d-452-change_lcd_content-0.1.patch} | 0 ...atch => xbmc-ce5668d-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...atch => xbmc-ce5668d-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...h-0.1.patch => xbmc-ce5668d-454-disable_backslash-0.1.patch} | 0 ...> xbmc-ce5668d-462-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...0.1.patch => xbmc-ce5668d-463-add_remote_devinput-0.1.patch} | 0 ...=> xbmc-ce5668d-464-add_eject_keymapping_for_lirc-0.1.patch} | 0 ... xbmc-ce5668d-901-advancedsettings_alwaysextractflags.patch} | 0 21 files changed, 2 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-ce5668d-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-013-reenable_lcd_config_settings-0.1.patch => xbmc-ce5668d-013-reenable_lcd_config_settings-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-201-let_select_XBMCProjectM-0.1.patch => xbmc-ce5668d-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-202-let_select_RSXS-0.1.patch => xbmc-ce5668d-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-ce5668d-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-351-increase_YV12_buffers-0.1.patch => xbmc-ce5668d-351-increase_YV12_buffers-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch => xbmc-ce5668d-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch => xbmc-ce5668d-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-ce5668d-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-404-add_lame_check-0.6.patch => xbmc-ce5668d-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-ce5668d-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-452-change_lcd_content-0.1.patch => xbmc-ce5668d-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-ce5668d-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-ce5668d-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-454-disable_backslash-0.1.patch => xbmc-ce5668d-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-ce5668d-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-463-add_remote_devinput-0.1.patch => xbmc-ce5668d-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-464-add_eject_keymapping_for_lirc-0.1.patch => xbmc-ce5668d-464-add_eject_keymapping_for_lirc-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-a3c804b-901-advancedsettings_alwaysextractflags.patch => xbmc-ce5668d-901-advancedsettings_alwaysextractflags.patch} (100%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 92b96832a2..5b710c9e2e 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="a3c804b" +PKG_VERSION="ce5668d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 0fa61a0a44..fa799e30dc 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="a3c804b" +PKG_VERSION="ce5668d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-013-reenable_lcd_config_settings-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-013-reenable_lcd_config_settings-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-013-reenable_lcd_config_settings-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-351-increase_YV12_buffers-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-351-increase_YV12_buffers-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-351-increase_YV12_buffers-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-464-add_eject_keymapping_for_lirc-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-464-add_eject_keymapping_for_lirc-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-464-add_eject_keymapping_for_lirc-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-a3c804b-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-ce5668d-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-a3c804b-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-ce5668d-901-advancedsettings_alwaysextractflags.patch From b83cc3c26653988752509546ed0ec096f20b8eae Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 22 Aug 2011 06:26:16 +0200 Subject: [PATCH 03/11] xbmc: add patches to prefer yv12 output from crystalhd codec when running nouveau driver, remove old implementation - thanks much davilla Signed-off-by: Stephan Raue --- ...r_for_MESA_older_then_7.7.1_on_linux.patch | 111 ++++++++++++++++++ ...hd_codec_when_running_nouveau_driver.patch | 89 ++++++++++++++ ...a-321-CrystalHD_use_yuy2_to_yv12-0.1.patch | 12 -- 3 files changed, 200 insertions(+), 12 deletions(-) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-031-disable_overlay_renderer_for_MESA_older_then_7.7.1_on_linux.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-035-prefer_yv12_output_from_crystalhd_codec_when_running_nouveau_driver.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-031-disable_overlay_renderer_for_MESA_older_then_7.7.1_on_linux.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-031-disable_overlay_renderer_for_MESA_older_then_7.7.1_on_linux.patch new file mode 100644 index 0000000000..81f2957450 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-031-disable_overlay_renderer_for_MESA_older_then_7.7.1_on_linux.patch @@ -0,0 +1,111 @@ +diff -Naur xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej +--- xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej 1970-01-01 01:00:00.000000000 +0100 ++++ xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej 2011-08-22 05:09:40.801478536 +0200 +@@ -0,0 +1,38 @@ ++--- xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++++ xbmc/cores/dvdplayer/DVDPlayerVideo.cpp ++@@ -20,6 +20,7 @@ ++ */ ++ ++ #include "system.h" +++#include "windowing/WindowingFactory.h" ++ #include "settings/AdvancedSettings.h" ++ #include "settings/GUISettings.h" ++ #include "settings/Settings.h" ++@@ -829,16 +830,17 @@ ++ ++ if(pSource->format == DVDVideoPicture::FMT_YUV420P) ++ { ++-#ifdef _LINUX ++- // for now use cpu for ssa overlays as it currently allocates and ++- // frees textures for each frame this causes a hugh memory leak ++- // on some mesa intel drivers ++- ++- if(m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SPU) ++- || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE) ++- || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA) ) ++- render = OVERLAY_BUF; ++-#endif +++ if(g_Windowing.GetRenderQuirks() & RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER) +++ { +++ // for now use cpu for ssa overlays as it currently allocates and +++ // frees textures for each frame this causes a hugh memory leak +++ // on some mesa intel drivers +++ +++ if(m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SPU) +++ || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE) +++ || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA) ) +++ render = OVERLAY_BUF; +++ } ++ ++ if(render == OVERLAY_BUF) ++ { +diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystem.cpp xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.cpp +--- xbmc-10.1-Dharma/xbmc/RenderSystem.cpp 2011-03-08 02:49:14.000000000 +0100 ++++ xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.cpp 2011-08-22 05:10:30.353131282 +0200 +@@ -29,6 +29,7 @@ + m_RenderVersionMajor = 0; + m_RenderVersionMinor = 0; + m_renderCaps = 0; ++ m_renderQuirks = 0; + m_minDXTPitch = 0; + } + +diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystemGL.cpp xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp +--- xbmc-10.1-Dharma/xbmc/RenderSystemGL.cpp 2011-03-08 02:49:14.000000000 +0100 ++++ xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp 2011-08-22 05:10:58.079496562 +0200 +@@ -65,8 +65,22 @@ + } + } + #endif +- if (m_RenderVendor.Equals("Tungsten Graphics, Inc.")) ++ if (m_RenderVendor.Equals("Tungsten Graphics, Inc.") ++ || m_RenderVendor.Equals("Tungsten Graphics, Inc")) + { ++ unsigned major, minor, micro; ++ if(sscanf(m_RenderVersion.c_str(), "%*s Mesa %u.%u.%u", &major, &minor, µ) == 3) ++ { ++ ++ if((major < 7) ++ || (major == 7 && minor < 7) ++ || (major == 7 && minor == 7 && micro < 1)) ++ m_renderQuirks |= RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER; ++ ++ } ++ else ++ CLog::Log(LOGNOTICE, "CRenderSystemGL::CheckOpenGLQuirks - unable to parse mesa version string"); ++ + if(m_RenderRenderer.Find("Poulsbo") >= 0) + m_renderCaps &= ~RENDER_CAPS_DXT_NPOT; + } +diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystem.h xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h +--- xbmc-10.1-Dharma/xbmc/RenderSystem.h 2011-03-08 02:49:14.000000000 +0100 ++++ xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h 2011-08-22 05:10:38.495238548 +0200 +@@ -52,6 +52,11 @@ + RENDER_CAPS_DXT_NPOT = (1 << 2) + }; + ++enum ++{ ++ RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER = 1 << 0, ++}; ++ + class CRenderSystemBase + { + public: +@@ -94,6 +99,7 @@ + bool SupportsNPOT(bool dxt) const; + unsigned int GetMaxTextureSize() const { return m_maxTextureSize; } + unsigned int GetMinDXTPitch() const { return m_minDXTPitch; } ++ unsigned int GetRenderQuirks() const { return m_renderQuirks; } + + protected: + bool m_bRenderCreated; +@@ -108,6 +114,7 @@ + int m_RenderVersionMinor; + int m_RenderVersionMajor; + unsigned int m_renderCaps; ++ unsigned int m_renderQuirks; + }; + + #endif // RENDER_SYSTEM_H diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-035-prefer_yv12_output_from_crystalhd_codec_when_running_nouveau_driver.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-035-prefer_yv12_output_from_crystalhd_codec_when_running_nouveau_driver.patch new file mode 100644 index 0000000000..e2dc06d263 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-035-prefer_yv12_output_from_crystalhd_codec_when_running_nouveau_driver.patch @@ -0,0 +1,89 @@ +diff -Naur xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-10.1-Dharma.patch2/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp +--- xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-08-22 05:07:59.915149830 +0200 ++++ xbmc-10.1-Dharma.patch2/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-08-22 05:19:43.825427880 +0200 +@@ -39,6 +39,7 @@ + #include "utils/fastmemcpy.h" + #include "Codecs/DllSwScale.h" + #include "utils/TimeUtils.h" ++#include "xbmc/WindowingFactory.h" + + namespace BCM + { +@@ -233,6 +234,7 @@ + int m_width; + int m_height; + uint64_t m_timestamp; ++ bool m_output_YV12; + uint64_t m_PictureNumber; + uint8_t m_color_space; + unsigned int m_color_range; +@@ -335,6 +337,12 @@ + m_sw_scale_ctx = NULL; + m_dllSwScale = new DllSwScale; + m_dllSwScale->Load(); ++ ++ ++ if (g_Windowing.GetRenderQuirks() & RENDER_QUIRKS_YV12_PREFERED) ++ m_output_YV12 = true; ++ else ++ m_output_YV12 = false; + } + + CMPCOutputThread::~CMPCOutputThread() +@@ -773,15 +781,20 @@ + if (!pBuffer) + { + // No free pre-allocated buffers so make one +-#ifdef _WIN32 +- // force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability. +- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height); +-#else +- if (m_color_space == BCM::MODE422_YUY2) +- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUY2, m_width, m_height); ++ if (m_output_YV12) ++ { ++ // output YV12, nouveau driver has slow NV12, YUY2 capability. ++ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height); ++ } ++ + else +- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_NV12, m_width, m_height); +-#endif ++ { ++ if (m_color_space == BCM::MODE422_YUY2) ++ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUY2, m_width, m_height); ++ else ++ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_NV12, m_width, m_height); ++ } ++ + CLog::Log(LOGDEBUG, "%s: Added a new Buffer, ReadyListCount: %d", __MODULE_NAME__, m_ReadyList.Count()); + while (!m_bStop && m_ReadyList.Count() > 10) + Sleep(1); +diff -Naur xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp xbmc-10.1-Dharma.patch2/xbmc/RenderSystemGL.cpp +--- xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp 2011-08-22 05:10:58.079496562 +0200 ++++ xbmc-10.1-Dharma.patch2/xbmc/RenderSystemGL.cpp 2011-08-22 05:20:56.265383606 +0200 +@@ -65,6 +65,9 @@ + } + } + #endif ++ if (m_RenderVendor.ToLower() == "nouveau") ++ m_renderQuirks |= RENDER_QUIRKS_YV12_PREFERED; ++ + if (m_RenderVendor.Equals("Tungsten Graphics, Inc.") + || m_RenderVendor.Equals("Tungsten Graphics, Inc")) + { +diff -Naur xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h xbmc-10.1-Dharma.patch2/xbmc/RenderSystem.h +--- xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h 2011-08-22 05:10:38.495238548 +0200 ++++ xbmc-10.1-Dharma.patch2/xbmc/RenderSystem.h 2011-08-22 05:19:43.847428169 +0200 +@@ -57,6 +57,11 @@ + RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER = 1 << 0, + }; + ++enum ++{ ++ RENDER_QUIRKS_YV12_PREFERED = 1 << 1, ++}; ++ + class CRenderSystemBase + { + public: 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 From 148a130dc4603ec4374042be28631d4966b7e2c4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 25 Aug 2011 01:04:37 +0200 Subject: [PATCH 04/11] xbmc: update to xbmc-e6b1484 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/meta | 6 +++--- ...mc-e6b1484-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...xbmc-e6b1484-013-reenable_lcd_config_settings-0.1.patch} | 0 ...h => xbmc-e6b1484-201-let_select_XBMCProjectM-0.1.patch} | 0 ...0.1.patch => xbmc-e6b1484-202-let_select_RSXS-0.1.patch} | 0 ...1.patch => xbmc-e6b1484-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...tch => xbmc-e6b1484-351-increase_YV12_buffers-0.1.patch} | 0 ...4-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch} | 0 ...pi_increase_number_of_video_surface_allocated-0.1.patch} | 0 ...tch => xbmc-e6b1484-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...-0.6.patch => xbmc-e6b1484-404-add_lame_check-0.6.patch} | 0 ...08-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} | 0 ....patch => xbmc-e6b1484-452-change_lcd_content-0.1.patch} | 0 ... => xbmc-e6b1484-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ... => xbmc-e6b1484-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...1.patch => xbmc-e6b1484-454-disable_backslash-0.1.patch} | 0 ...mc-e6b1484-462-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...patch => xbmc-e6b1484-463-add_remote_devinput-0.1.patch} | 0 ...bmc-e6b1484-464-add_eject_keymapping_for_lirc-0.1.patch} | 0 ...c-e6b1484-901-advancedsettings_alwaysextractflags.patch} | 0 21 files changed, 4 insertions(+), 4 deletions(-) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-e6b1484-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-013-reenable_lcd_config_settings-0.1.patch => xbmc-e6b1484-013-reenable_lcd_config_settings-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-201-let_select_XBMCProjectM-0.1.patch => xbmc-e6b1484-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-202-let_select_RSXS-0.1.patch => xbmc-e6b1484-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-e6b1484-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-351-increase_YV12_buffers-0.1.patch => xbmc-e6b1484-351-increase_YV12_buffers-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch => xbmc-e6b1484-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch => xbmc-e6b1484-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-e6b1484-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-404-add_lame_check-0.6.patch => xbmc-e6b1484-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-e6b1484-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-452-change_lcd_content-0.1.patch => xbmc-e6b1484-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-e6b1484-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-e6b1484-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-454-disable_backslash-0.1.patch => xbmc-e6b1484-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-e6b1484-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-463-add_remote_devinput-0.1.patch => xbmc-e6b1484-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-464-add_eject_keymapping_for_lirc-0.1.patch => xbmc-e6b1484-464-add_eject_keymapping_for_lirc-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-ce5668d-901-advancedsettings_alwaysextractflags.patch => xbmc-e6b1484-901-advancedsettings_alwaysextractflags.patch} (100%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 5b710c9e2e..40e7cda8f7 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="ce5668d" +PKG_VERSION="e6b1484" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index fa799e30dc..12b88c90a4 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,14 +19,14 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="ce5668d" +PKG_VERSION="e6b1484" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -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_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_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc: XBMC Mediacenter" diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-013-reenable_lcd_config_settings-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-013-reenable_lcd_config_settings-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-013-reenable_lcd_config_settings-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-351-increase_YV12_buffers-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-351-increase_YV12_buffers-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-351-increase_YV12_buffers-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-464-add_eject_keymapping_for_lirc-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-464-add_eject_keymapping_for_lirc-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-464-add_eject_keymapping_for_lirc-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-ce5668d-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-ce5668d-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-e6b1484-901-advancedsettings_alwaysextractflags.patch From ee55af0442e21b4e96869c4837ba3fea83d0e74b Mon Sep 17 00:00:00 2001 From: terratec Date: Fri, 19 Aug 2011 21:45:39 +0200 Subject: [PATCH 05/11] remove double project options --- projects/ATV/options | 3 --- projects/Fusion/options | 3 --- projects/Generic/options | 3 --- projects/ION/options | 3 --- projects/Intel/options | 3 --- 5 files changed, 15 deletions(-) diff --git a/projects/ATV/options b/projects/ATV/options index d8a6752204..24627e62ca 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -152,9 +152,6 @@ # build and install Avahi (Zeroconf) daemon (yes / no) AVAHI_DAEMON="yes" -# build and install with NFS mount support in XBMC (yes / no) - NFS_SUPPORT="yes" - # build and install Samba Server (yes / no) SAMBA_SERVER="yes" diff --git a/projects/Fusion/options b/projects/Fusion/options index 2f651bd789..40399f805a 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -152,9 +152,6 @@ # build and install Avahi (Zeroconf) daemon (yes / no) AVAHI_DAEMON="yes" -# build and install with NFS mount support in XBMC (yes / no) - NFS_SUPPORT="yes" - # build and install Samba Server (yes / no) SAMBA_SERVER="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 8a21d7b163..dc334343ec 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -152,9 +152,6 @@ # build and install Avahi (Zeroconf) daemon (yes / no) AVAHI_DAEMON="yes" -# build and install with NFS mount support in XBMC (yes / no) - NFS_SUPPORT="yes" - # build and install Samba Server (yes / no) SAMBA_SERVER="yes" diff --git a/projects/ION/options b/projects/ION/options index 614e6a0484..f599510297 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -152,9 +152,6 @@ # build and install Avahi (Zeroconf) daemon (yes / no) AVAHI_DAEMON="yes" -# build and install with NFS mount support in XBMC (yes / no) - NFS_SUPPORT="yes" - # build and install Samba Server (yes / no) SAMBA_SERVER="yes" diff --git a/projects/Intel/options b/projects/Intel/options index 434580a3a4..4668ece979 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -152,9 +152,6 @@ # build and install Avahi (Zeroconf) daemon (yes / no) AVAHI_DAEMON="yes" -# build and install with NFS mount support in XBMC (yes / no) - NFS_SUPPORT="yes" - # build and install Samba Server (yes / no) SAMBA_SERVER="yes" From b417291d4922ca21e1404984781069e029ce7dd9 Mon Sep 17 00:00:00 2001 From: terratec Date: Sun, 21 Aug 2011 15:44:29 +0200 Subject: [PATCH 06/11] xf86-video-intel: fix double entry --- packages/x11/driver/xf86-video-intel/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index 97f6cb2ee8..5845324062 100644 --- a/packages/x11/driver/xf86-video-intel/meta +++ b/packages/x11/driver/xf86-video-intel/meta @@ -26,7 +26,7 @@ PKG_LICENSE="OSS" PKG_SITE="http://intellinuxgraphics.org/" PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="udev" -PKG_BUILD_DEPENDS="toolchain util-macros util-macros fontsproto udev xorg-server" +PKG_BUILD_DEPENDS="toolchain util-macros fontsproto udev xorg-server" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" PKG_SHORTDESC="xf86-video-intel: The Xorg driver for Intel video chips" From 1ef50ca99fbc9c5b9305d811c6d8409a521c2b5d Mon Sep 17 00:00:00 2001 From: terratec Date: Sun, 21 Aug 2011 15:52:54 +0200 Subject: [PATCH 07/11] fix double LINUX_NEXT option --- projects/ATV/options | 3 --- projects/Fusion/options | 3 --- projects/Generic/options | 5 +---- projects/ION/options | 3 --- projects/Intel/options | 3 --- projects/Ultra/options | 3 --- 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/projects/ATV/options b/projects/ATV/options index bec23fa8b3..c445d2d636 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -183,9 +183,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="nouveau" -# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no" diff --git a/projects/Fusion/options b/projects/Fusion/options index b91d3a2e02..d981829916 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -183,9 +183,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau" GRAPHIC_DRIVERS="fglrx" -# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no" diff --git a/projects/Generic/options b/projects/Generic/options index 65c41f6cea..e7d47643aa 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -183,10 +183,7 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau" GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware" -# Use VDPAU video# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - -# acceleration (needs nVidia driver and a supported card) +# Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="yes" # Use VAAPI video acceleration (needs intel i965 driver and a supported card) diff --git a/projects/ION/options b/projects/ION/options index b36a7ef27b..ab433cf985 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -183,9 +183,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="nvidia" -# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="yes" diff --git a/projects/Intel/options b/projects/Intel/options index a153404603..0f28276113 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -183,9 +183,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="i915 i965" -# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no" diff --git a/projects/Ultra/options b/projects/Ultra/options index e35d0f6171..73a151bf8f 100644 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -183,9 +183,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="nvidia" -# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="yes" From 1b8bb8045e7d306f63219751df84df2ab01341f6 Mon Sep 17 00:00:00 2001 From: terratec Date: Sun, 21 Aug 2011 16:02:25 +0200 Subject: [PATCH 08/11] scripts/image: fix installer support comment --- scripts/image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/image b/scripts/image index 03747fec92..6485ffaa63 100755 --- a/scripts/image +++ b/scripts/image @@ -139,7 +139,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" # Update support [ "$UPDATE_SUPPORT" = "yes" ] && $SCRIPTS/install autoupdate -# Update support +# Installer support [ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer # Devtools... (not for Release) From a6c68f37c4263e0080f47e4e7d74c27779891112 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 25 Aug 2011 01:41:58 +0200 Subject: [PATCH 09/11] projects/Fusion/options: remove -mssse3 support for Llano compatibility Signed-off-by: Stephan Raue --- projects/Fusion/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Fusion/options b/projects/Fusion/options index d981829916..e1c4f6fdb9 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -75,7 +75,7 @@ OPTIMIZATIONS="speed" # Project CFLAGS - PROJECT_CFLAGS="-mfpmath=sse -msse2 -mssse3" + PROJECT_CFLAGS="-mfpmath=sse -msse2" # -mssse3 removed for Llano compatibility # LTO (Link Time Optimazion) support LTO_SUPPORT="no" From d26b61b83378a420c007d4326d501904ab3af165 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 25 Aug 2011 01:46:41 +0200 Subject: [PATCH 10/11] xbmc: remove some already merged patches Signed-off-by: Stephan Raue --- ...r_for_MESA_older_then_7.7.1_on_linux.patch | 111 ------------------ ...hd_codec_when_running_nouveau_driver.patch | 89 -------------- 2 files changed, 200 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-031-disable_overlay_renderer_for_MESA_older_then_7.7.1_on_linux.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-035-prefer_yv12_output_from_crystalhd_codec_when_running_nouveau_driver.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-031-disable_overlay_renderer_for_MESA_older_then_7.7.1_on_linux.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-031-disable_overlay_renderer_for_MESA_older_then_7.7.1_on_linux.patch deleted file mode 100644 index 81f2957450..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-031-disable_overlay_renderer_for_MESA_older_then_7.7.1_on_linux.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -Naur xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej ---- xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej 2011-08-22 05:09:40.801478536 +0200 -@@ -0,0 +1,38 @@ -+--- xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -++++ xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -+@@ -20,6 +20,7 @@ -+ */ -+ -+ #include "system.h" -++#include "windowing/WindowingFactory.h" -+ #include "settings/AdvancedSettings.h" -+ #include "settings/GUISettings.h" -+ #include "settings/Settings.h" -+@@ -829,16 +830,17 @@ -+ -+ if(pSource->format == DVDVideoPicture::FMT_YUV420P) -+ { -+-#ifdef _LINUX -+- // for now use cpu for ssa overlays as it currently allocates and -+- // frees textures for each frame this causes a hugh memory leak -+- // on some mesa intel drivers -+- -+- if(m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SPU) -+- || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE) -+- || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA) ) -+- render = OVERLAY_BUF; -+-#endif -++ if(g_Windowing.GetRenderQuirks() & RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER) -++ { -++ // for now use cpu for ssa overlays as it currently allocates and -++ // frees textures for each frame this causes a hugh memory leak -++ // on some mesa intel drivers -++ -++ if(m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SPU) -++ || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE) -++ || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA) ) -++ render = OVERLAY_BUF; -++ } -+ -+ if(render == OVERLAY_BUF) -+ { -diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystem.cpp xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.cpp ---- xbmc-10.1-Dharma/xbmc/RenderSystem.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.cpp 2011-08-22 05:10:30.353131282 +0200 -@@ -29,6 +29,7 @@ - m_RenderVersionMajor = 0; - m_RenderVersionMinor = 0; - m_renderCaps = 0; -+ m_renderQuirks = 0; - m_minDXTPitch = 0; - } - -diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystemGL.cpp xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp ---- xbmc-10.1-Dharma/xbmc/RenderSystemGL.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp 2011-08-22 05:10:58.079496562 +0200 -@@ -65,8 +65,22 @@ - } - } - #endif -- if (m_RenderVendor.Equals("Tungsten Graphics, Inc.")) -+ if (m_RenderVendor.Equals("Tungsten Graphics, Inc.") -+ || m_RenderVendor.Equals("Tungsten Graphics, Inc")) - { -+ unsigned major, minor, micro; -+ if(sscanf(m_RenderVersion.c_str(), "%*s Mesa %u.%u.%u", &major, &minor, µ) == 3) -+ { -+ -+ if((major < 7) -+ || (major == 7 && minor < 7) -+ || (major == 7 && minor == 7 && micro < 1)) -+ m_renderQuirks |= RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER; -+ -+ } -+ else -+ CLog::Log(LOGNOTICE, "CRenderSystemGL::CheckOpenGLQuirks - unable to parse mesa version string"); -+ - if(m_RenderRenderer.Find("Poulsbo") >= 0) - m_renderCaps &= ~RENDER_CAPS_DXT_NPOT; - } -diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystem.h xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h ---- xbmc-10.1-Dharma/xbmc/RenderSystem.h 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h 2011-08-22 05:10:38.495238548 +0200 -@@ -52,6 +52,11 @@ - RENDER_CAPS_DXT_NPOT = (1 << 2) - }; - -+enum -+{ -+ RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER = 1 << 0, -+}; -+ - class CRenderSystemBase - { - public: -@@ -94,6 +99,7 @@ - bool SupportsNPOT(bool dxt) const; - unsigned int GetMaxTextureSize() const { return m_maxTextureSize; } - unsigned int GetMinDXTPitch() const { return m_minDXTPitch; } -+ unsigned int GetRenderQuirks() const { return m_renderQuirks; } - - protected: - bool m_bRenderCreated; -@@ -108,6 +114,7 @@ - int m_RenderVersionMinor; - int m_RenderVersionMajor; - unsigned int m_renderCaps; -+ unsigned int m_renderQuirks; - }; - - #endif // RENDER_SYSTEM_H diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-035-prefer_yv12_output_from_crystalhd_codec_when_running_nouveau_driver.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-035-prefer_yv12_output_from_crystalhd_codec_when_running_nouveau_driver.patch deleted file mode 100644 index e2dc06d263..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-035-prefer_yv12_output_from_crystalhd_codec_when_running_nouveau_driver.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -Naur xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-10.1-Dharma.patch2/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp ---- xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-08-22 05:07:59.915149830 +0200 -+++ xbmc-10.1-Dharma.patch2/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-08-22 05:19:43.825427880 +0200 -@@ -39,6 +39,7 @@ - #include "utils/fastmemcpy.h" - #include "Codecs/DllSwScale.h" - #include "utils/TimeUtils.h" -+#include "xbmc/WindowingFactory.h" - - namespace BCM - { -@@ -233,6 +234,7 @@ - int m_width; - int m_height; - uint64_t m_timestamp; -+ bool m_output_YV12; - uint64_t m_PictureNumber; - uint8_t m_color_space; - unsigned int m_color_range; -@@ -335,6 +337,12 @@ - m_sw_scale_ctx = NULL; - m_dllSwScale = new DllSwScale; - m_dllSwScale->Load(); -+ -+ -+ if (g_Windowing.GetRenderQuirks() & RENDER_QUIRKS_YV12_PREFERED) -+ m_output_YV12 = true; -+ else -+ m_output_YV12 = false; - } - - CMPCOutputThread::~CMPCOutputThread() -@@ -773,15 +781,20 @@ - if (!pBuffer) - { - // No free pre-allocated buffers so make one --#ifdef _WIN32 -- // force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability. -- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height); --#else -- if (m_color_space == BCM::MODE422_YUY2) -- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUY2, m_width, m_height); -+ if (m_output_YV12) -+ { -+ // output YV12, nouveau driver has slow NV12, YUY2 capability. -+ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height); -+ } -+ - else -- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_NV12, m_width, m_height); --#endif -+ { -+ if (m_color_space == BCM::MODE422_YUY2) -+ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUY2, m_width, m_height); -+ else -+ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_NV12, m_width, m_height); -+ } -+ - CLog::Log(LOGDEBUG, "%s: Added a new Buffer, ReadyListCount: %d", __MODULE_NAME__, m_ReadyList.Count()); - while (!m_bStop && m_ReadyList.Count() > 10) - Sleep(1); -diff -Naur xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp xbmc-10.1-Dharma.patch2/xbmc/RenderSystemGL.cpp ---- xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp 2011-08-22 05:10:58.079496562 +0200 -+++ xbmc-10.1-Dharma.patch2/xbmc/RenderSystemGL.cpp 2011-08-22 05:20:56.265383606 +0200 -@@ -65,6 +65,9 @@ - } - } - #endif -+ if (m_RenderVendor.ToLower() == "nouveau") -+ m_renderQuirks |= RENDER_QUIRKS_YV12_PREFERED; -+ - if (m_RenderVendor.Equals("Tungsten Graphics, Inc.") - || m_RenderVendor.Equals("Tungsten Graphics, Inc")) - { -diff -Naur xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h xbmc-10.1-Dharma.patch2/xbmc/RenderSystem.h ---- xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h 2011-08-22 05:10:38.495238548 +0200 -+++ xbmc-10.1-Dharma.patch2/xbmc/RenderSystem.h 2011-08-22 05:19:43.847428169 +0200 -@@ -57,6 +57,11 @@ - RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER = 1 << 0, - }; - -+enum -+{ -+ RENDER_QUIRKS_YV12_PREFERED = 1 << 1, -+}; -+ - class CRenderSystemBase - { - public: From 2c0ba7143ae4c1f16268cf562e82dedcb607bf14 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 25 Aug 2011 01:47:08 +0200 Subject: [PATCH 11/11] xbmc: remove some already merged patches Signed-off-by: Stephan Raue --- ...-335-Python_parse_had_wrong_native_type-0.1.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch deleted file mode 100644 index 27823a10ab..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp ---- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp 2011-08-21 17:13:13.382281536 +0200 -@@ -74,7 +74,7 @@ - if (!PyArg_ParseTupleAndKeywords( - args, - kwds, -- (char*)"iOO|bl", -+ (char*)"iOO|bi", - (char**)keywords, - &handle, - &pURL,