diff --git a/packages/mediacenter/xbmc-rpi-theme-Confluence/meta b/packages/mediacenter/xbmc-rpi-theme-Confluence/meta index 4e85a66cfc..91708e40d8 100644 --- a/packages/mediacenter/xbmc-rpi-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-rpi-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-rpi-theme-Confluence" -PKG_VERSION="39c680e" +PKG_VERSION="9e56f42" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-rpi/meta b/packages/mediacenter/xbmc-rpi/meta index 7e065bf1ed..df46fc4e0f 100644 --- a/packages/mediacenter/xbmc-rpi/meta +++ b/packages/mediacenter/xbmc-rpi/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-rpi" -PKG_VERSION="39c680e" +PKG_VERSION="9e56f42" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-607-enable_ae_for_movie_gui.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-607-enable_ae_for_movie_gui.patch deleted file mode 100644 index ec99d7d9aa..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-607-enable_ae_for_movie_gui.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff --git a/configure.in b/configure.in -index 4639609..8110a98 100755 ---- a/configure.in -+++ b/configure.in -@@ -585,7 +585,7 @@ case $use_platform in - use_armv6="yes" - use_armvfp="yes" - use_hardcoded_tables="yes" -- use_alsa="no" -+ use_alsa="yes" - USE_TEXTUREPACKER_NATIVE_ROOT="$TEXTUREPACKER_NATIVE_ROOT" - ARCH="arm" - AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI") -diff --git a/xbmc/cores/AudioEngine/AEFactory.cpp b/xbmc/cores/AudioEngine/AEFactory.cpp -index 78b22d5..fdf797e 100644 ---- a/xbmc/cores/AudioEngine/AEFactory.cpp -+++ b/xbmc/cores/AudioEngine/AEFactory.cpp -@@ -115,10 +115,6 @@ void CAEFactory::UnLoadEngine() - - bool CAEFactory::StartEngine() - { --#if defined(TARGET_RASPBERRY_PI) -- return true; --#endif -- - if (!AE) - return false; - -diff --git a/xbmc/cores/AudioEngine/AESinkFactory.cpp b/xbmc/cores/AudioEngine/AESinkFactory.cpp -index cab4ff8..020ce3d 100644 ---- a/xbmc/cores/AudioEngine/AESinkFactory.cpp -+++ b/xbmc/cores/AudioEngine/AESinkFactory.cpp -@@ -27,7 +27,7 @@ - #if defined(TARGET_WINDOWS) - #include "Sinks/AESinkWASAPI.h" - #include "Sinks/AESinkDirectSound.h" --#elif (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) && !defined(TARGET_RASPBERRY_PI) -+#elif (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) - #if defined(HAS_ALSA) - #include "Sinks/AESinkALSA.h" - #endif -@@ -105,7 +105,7 @@ IAESink *CAESinkFactory::Create(std::string &device, AEAudioFormat &desiredForma - else - TRY_SINK(DirectSound) /* Always fall back to DirectSound */ - --#elif (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) && !defined(TARGET_RASPBERRY_PI) -+#elif (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) - - #if defined(HAS_ALSA) - if (driver.empty() || driver == "ALSA") -@@ -153,7 +153,7 @@ void CAESinkFactory::EnumerateEx(AESinkInfoList &list) - ENUMERATE_SINK(ALSA); - #endif - --#if (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) && !defined(TARGET_RASPBERRY_PI) -+#if (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) - ENUMERATE_SINK(OSS); - #endif - -diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index 7e26b38..b192f48 100644 ---- a/xbmc/cores/omxplayer/OMXPlayer.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -73,6 +73,9 @@ - - #include "LangInfo.h" - -+#include "cores/AudioEngine/AEFactory.h" -+#include "cores/AudioEngine/Utils/AEUtil.h" -+ - using namespace XFILE; - - // **************************************************************** -@@ -920,6 +923,9 @@ void COMXPlayer::Process() - return; - } - -+ /* shutdown AE */ -+ CAEFactory::Shutdown(); -+ - m_player_video.EnableFullscreen(true); - - OpenDefaultStreams(); -@@ -1882,6 +1888,13 @@ void COMXPlayer::OnExit() - - // set event to inform openfile something went wrong in case openfile is still waiting for this event - m_ready.Set(); -+ -+ /* start AE again */ -+ CAEFactory::LoadEngine(); -+ CAEFactory::StartEngine(); -+ -+ CAEFactory::SetMute (g_settings.m_bMute); -+ CAEFactory::SetSoundMode(g_guiSettings.GetInt("audiooutput.guisoundmode")); - } - - void COMXPlayer::HandleMessages() -diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index c9c366c..eecc18e 100644 ---- a/xbmc/settings/AdvancedSettings.cpp -+++ b/xbmc/settings/AdvancedSettings.cpp -@@ -72,11 +72,7 @@ void CAdvancedSettings::Initialize() - m_karaokeAlwaysEmptyOnCdgs = 1; - m_karaokeUseSongSpecificBackground = 0; - --#if defined(HAVE_OMXPLAYER) -- m_audioDefaultPlayer = "omxplayer"; --#else - m_audioDefaultPlayer = "paplayer"; --#endif - m_audioPlayCountMinimumPercent = 90.0f; - m_audioHost = "default"; - -diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp -index a18b102..4e664d3 100644 ---- a/xbmc/settings/GUISettings.cpp -+++ b/xbmc/settings/GUISettings.cpp -@@ -476,7 +476,7 @@ void CGUISettings::Initialize() - #if !defined(TARGET_DARWIN_IOS) && !defined(TARGET_RASPBERRY_PI) - AddBool(aocat, "audiooutput.multichannellpcm" , 348, true ); - #endif --#if !defined(TARGET_DARWIN) && !defined(TARGET_RASPBERRY_PI) -+#if !defined(TARGET_DARWIN) - AddBool(aocat, "audiooutput.truehdpassthrough", 349, true ); - AddBool(aocat, "audiooutput.dtshdpassthrough" , 347, true ); - #endif -@@ -490,11 +490,6 @@ void CGUISettings::Initialize() - #endif - AddString(ao, "audiooutput.audiodevice", 545, defaultDeviceName.c_str(), SPIN_CONTROL_TEXT); - AddString(NULL, "audiooutput.passthroughdevice", 546, defaultDeviceName.c_str(), SPIN_CONTROL_TEXT); --#elif defined(TARGET_RASPBERRY_PI) -- CStdString defaultDeviceName = "Default"; -- AddString(NULL, "audiooutput.audiodevice", 545, defaultDeviceName.c_str(), SPIN_CONTROL_TEXT); -- AddString(NULL, "audiooutput.passthroughdevice", 546, defaultDeviceName.c_str(), SPIN_CONTROL_TEXT); --#else - AddSeparator(ao, "audiooutput.sep1"); - AddString (ao, "audiooutput.audiodevice" , 545, CStdString(CAEFactory::GetDefaultDevice(false)), SPIN_CONTROL_TEXT); - AddString (ao, "audiooutput.passthroughdevice", 546, CStdString(CAEFactory::GetDefaultDevice(true )), SPIN_CONTROL_TEXT); -diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp -index 19e5e00..84f92f7 100644 ---- a/xbmc/settings/GUIWindowSettingsCategory.cpp -+++ b/xbmc/settings/GUIWindowSettingsCategory.cpp -@@ -1838,13 +1838,13 @@ void CGUIWindowSettingsCategory::OnSettingChanged(CBaseSettingControl *pSettingC - if (strSetting.Equals("audiooutput.audiodevice")) - { - CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(pSettingControl->GetID()); --#if defined(TARGET_DARWIN) || defined(TARGET_RASPBERRY_PI) -+#if defined(TARGET_DARWIN) - g_guiSettings.SetString("audiooutput.audiodevice", pControl->GetCurrentLabel()); - #else - g_guiSettings.SetString("audiooutput.audiodevice", m_AnalogAudioSinkMap[pControl->GetCurrentLabel()]); - #endif - } --#if !defined(TARGET_DARWIN) && !defined(TARGET_RASPBERRY_PI) -+#if !defined(TARGET_DARWIN) - else if (strSetting.Equals("audiooutput.passthroughdevice")) - { - CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(pSettingControl->GetID()); -@@ -2708,7 +2708,7 @@ void CGUIWindowSettingsCategory::FillInAudioDevices(CSetting* pSetting, bool Pas - int selectedValue = -1; - AEDeviceList sinkList; - CAEFactory::EnumerateOutputDevices(sinkList, Passthrough); --#if !defined(TARGET_DARWIN) && !defined(TARGET_RASPBERRY_PI) -+#if !defined(TARGET_DARWIN) - if (sinkList.size()==0) - { - pControl->AddLabel("Error - no devices found", 0); -@@ -2737,7 +2737,7 @@ void CGUIWindowSettingsCategory::FillInAudioDevices(CSetting* pSetting, bool Pas - } - - numberSinks = sinkList.size(); --#if !defined(TARGET_DARWIN) && !defined(TARGET_RASPBERRY_PI) -+#if !defined(TARGET_DARWIN) - } - #endif - diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-990.01-fix_memoryleak.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-990.01-fix_memoryleak.patch deleted file mode 100644 index 877cab473a..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-990.01-fix_memoryleak.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9213ab6847e78007f8083b92794150397ffdc2f3 Mon Sep 17 00:00:00 2001 -From: Cory Fields -Date: Sun, 1 Jul 2012 18:41:48 -0400 -Subject: [PATCH] jpeg: fix nasty memory leak. Thanks vdrfan for finding and - jmarshall for the fix - -libjpeg was taking our allocated mem and eating it. If we're going to -preallocate, we need to specify that size. ---- - xbmc/guilib/JpegIO.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/guilib/JpegIO.cpp b/xbmc/guilib/JpegIO.cpp -index e496ad1..07dfe7f 100644 ---- a/xbmc/guilib/JpegIO.cpp -+++ b/xbmc/guilib/JpegIO.cpp -@@ -435,7 +435,7 @@ bool CJpegIO::CreateThumbnailFromSurface(unsigned char* buffer, unsigned int wid - struct jpeg_compress_struct cinfo; - struct my_error_mgr jerr; - JSAMPROW row_pointer[1]; -- long unsigned int outBufSize = 0; -+ long unsigned int outBufSize = width * height; - unsigned char* result; - unsigned char* src = buffer; - unsigned char* rgbbuf, *src2, *dst2; -@@ -446,7 +446,7 @@ bool CJpegIO::CreateThumbnailFromSurface(unsigned char* buffer, unsigned int wid - return false; - } - -- result = (unsigned char*) malloc(width * height); //Initial buffer. Grows as-needed. -+ result = (unsigned char*) malloc(outBufSize); //Initial buffer. Grows as-needed. - if (result == NULL) - { - CLog::Log(LOGERROR, "JpegIO::CreateThumbnailFromSurface error allocating memory for image buffer"); --- -1.7.10 - diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-990.02-fix-omx-ommission.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-990.02-fix-omx-ommission.patch deleted file mode 100644 index bad3a816cb..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-990.02-fix-omx-ommission.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp ---- a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp 2012-07-03 14:34:17.000000000 +0100 -+++ b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp 2012-07-03 14:49:14.000000000 +0100 -@@ -227,6 +227,12 @@ - VECPLAYERCORES vecCores; - GetPlayers(item, vecCores); - -+#if defined(HAVE_OMXPLAYER) -+ for (int i = 0; i < vecCores.size();i++) -+ if (vecCores.at(i) == PCID_OMXPLAYER) -+ return EPC_OMXPLAYER; -+#endif -+ - //If we have any players return the first one - if( vecCores.size() > 0 ) return vecCores.at(0); - diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-464-add_eject_keymapping_for_lirc-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-464-add_eject_keymapping_for_lirc-0.1.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-464-add_eject_keymapping_for_lirc-0.1.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-601-dont_show_unneeded_sysinfo.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-601-dont_show_unneeded_sysinfo.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-601-dont_show_unneeded_sysinfo.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-601-dont_show_unneeded_sysinfo.patch diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-981-toggleButtonState.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-981-toggleButtonState.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-39c680e-981-toggleButtonState.patch rename to packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-9e56f42-981-toggleButtonState.patch