From 8b4aff7d69a33bfc86362c4fc2f3e286f0edf7c4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 15 Mar 2013 14:59:47 +0100 Subject: [PATCH] xbmc: update to xbmc-12.0.7 Signed-off-by: Stephan Raue --- .../mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- ...bmc-453-add_openelec.tv_RSS_news-0.1.patch | 8 +-- ...ec-extra-guards-around-m_queryThread.patch | 51 ------------------- ...90.22-cec-init_m_queryThread_to_NULL.patch | 25 --------- ..._generate_problem_with_binary_string.patch | 22 -------- tools/mkpkg/mkpkg_xbmc-frodo | 2 +- 7 files changed, 7 insertions(+), 105 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.21-cec-extra-guards-around-m_queryThread.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.22-cec-init_m_queryThread_to_NULL.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.23-Fix_code_generate_problem_with_binary_string.patch diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 8624112f66..a7dd88d984 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="12.0.6" +PKG_VERSION="12.0.7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 09f8fbe5d5..edbbd70b55 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.0.6" +PKG_VERSION="12.0.7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-453-add_openelec.tv_RSS_news-0.1.patch index 5b32c0cce7..ff8b12e703 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-453-add_openelec.tv_RSS_news-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-453-add_openelec.tv_RSS_news-0.1.patch @@ -1,11 +1,11 @@ -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 +diff -Naur xbmc-12.0.7/userdata/RssFeeds.xml xbmc-12.0.7.patch/userdata/RssFeeds.xml +--- xbmc-12.0.7/userdata/RssFeeds.xml 2013-03-15 14:25:26.000000000 +0100 ++++ xbmc-12.0.7.patch/userdata/RssFeeds.xml 2013-03-15 14:40:54.695338102 +0100 @@ -3,6 +3,7 @@ + http://openelec.tv/news?format=feed&type=rss - http://feeds.feedburner.com/xbmc + http://feeds.xbmc.org/xbmc diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.21-cec-extra-guards-around-m_queryThread.patch b/packages/mediacenter/xbmc/patches/xbmc-990.21-cec-extra-guards-around-m_queryThread.patch deleted file mode 100644 index e882e54d75..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-990.21-cec-extra-guards-around-m_queryThread.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 5385b26621a8d966f187f7b63dfaa8f336beb9a5 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Tue, 12 Mar 2013 10:20:27 +0100 -Subject: [PATCH] [cec] extra guards around m_queryThread - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 4cdd3c4..6509c5d 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -99,8 +99,8 @@ class DllLibCEC : public DllDynamic, DllLibCECInterface - m_bStop = true; - } - -- SAFE_DELETE(m_queryThread); - StopThread(true); -+ delete m_queryThread; - - if (m_dll && m_cecAdapter) - { -@@ -389,7 +389,7 @@ void CPeripheralCecAdapter::Process(void) - Sleep(5); - } - -- SAFE_DELETE(m_queryThread); -+ m_queryThread->StopThread(true); - - bool bSendStandbyCommands(false); - { -@@ -1105,9 +1105,12 @@ void CPeripheralCecAdapter::OnSettingChanged(const CStdString &strChangedSetting - } - else if (IsRunning()) - { -- CLog::Log(LOGDEBUG, "%s - sending the updated configuration to libCEC", __FUNCTION__); -- SetConfigurationFromSettings(); -- m_queryThread->UpdateConfiguration(&m_configuration); -+ if (m_queryThread->IsRunning()) -+ { -+ CLog::Log(LOGDEBUG, "%s - sending the updated configuration to libCEC", __FUNCTION__); -+ SetConfigurationFromSettings(); -+ m_queryThread->UpdateConfiguration(&m_configuration); -+ } - } - else - { --- -1.7.10 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.22-cec-init_m_queryThread_to_NULL.patch b/packages/mediacenter/xbmc/patches/xbmc-990.22-cec-init_m_queryThread_to_NULL.patch deleted file mode 100644 index 2145ca975b..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-990.22-cec-init_m_queryThread_to_NULL.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9526c4ce7da5c70d8ba79a5c21e9d95c918ebadb Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Tue, 12 Mar 2013 11:08:55 +0100 -Subject: [PATCH] [cec] and let's init m_queryThread to NULL so we won't crash - on exit when CEC has been disabled - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 6509c5d..61233bb 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -135,6 +135,7 @@ void CPeripheralCecAdapter::ResetMembers(void) - m_bActiveSourceBeforeStandby = false; - m_bOnPlayReceived = false; - m_bPlaybackPaused = false; -+ m_queryThread = NULL; - - m_currentButton.iButton = 0; - m_currentButton.iDuration = 0; --- -1.7.10 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.23-Fix_code_generate_problem_with_binary_string.patch b/packages/mediacenter/xbmc/patches/xbmc-990.23-Fix_code_generate_problem_with_binary_string.patch deleted file mode 100644 index 56420955ee..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-990.23-Fix_code_generate_problem_with_binary_string.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 1a5e251cc4382ad3e918af68072f2ba08e26574b Mon Sep 17 00:00:00 2001 -From: ulion -Date: Tue, 12 Mar 2013 06:40:54 +0800 -Subject: [PATCH] Fix code generate problem with binary string. - ---- - xbmc/interfaces/python/typemaps/python.string.outtm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/interfaces/python/typemaps/python.string.outtm b/xbmc/interfaces/python/typemaps/python.string.outtm -index cdfba2e..c396166 100644 ---- a/xbmc/interfaces/python/typemaps/python.string.outtm -+++ b/xbmc/interfaces/python/typemaps/python.string.outtm -@@ -22,4 +22,4 @@ - %> - ${result} = <% - if(method.@feature_python_coerceToUnicode) { %>PyUnicode_DecodeUTF8(${api}.c_str(),${api}.size(),"replace");<% } -- else { %>PyString_FromString(${api}.c_str());<% } %> -+ else { %>PyString_FromStringAndSize(${api}.c_str(), ${api}.length());<% } %> --- -1.7.10 - diff --git a/tools/mkpkg/mkpkg_xbmc-frodo b/tools/mkpkg/mkpkg_xbmc-frodo index b51f2cf9a5..2106a596e7 100755 --- a/tools/mkpkg/mkpkg_xbmc-frodo +++ b/tools/mkpkg/mkpkg_xbmc-frodo @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.0.6" +PKG_VERSION="12.0.7" GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git" DEST_DIR="$PKG_NAME-frodo"