From 2fe2e34465d8a1949aee7d81abf5ddb68bcfff31 Mon Sep 17 00:00:00 2001 From: newphreak Date: Sun, 5 Aug 2012 14:31:57 +0300 Subject: [PATCH 1/9] xbmc: fix search dialogs behaviour. tryfix #740 --- ....1-999.055-search-dialogs-workaround.patch | 27 +++++++++++++++++++ ....1-999.055-search-dialogs-workaround.patch | 27 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-11.0.1-999.055-search-dialogs-workaround.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999.055-search-dialogs-workaround.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-11.0.1-999.055-search-dialogs-workaround.patch b/packages/mediacenter/xbmc/patches/xbmc-11.0.1-999.055-search-dialogs-workaround.patch new file mode 100644 index 0000000000..f37fef13c2 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-11.0.1-999.055-search-dialogs-workaround.patch @@ -0,0 +1,27 @@ +diff --git a/xbmc/filesystem/PluginDirectory.cpp b/xbmc/filesystem/PluginDirectory.cpp +index 9e519fb..b64267b 100644 +--- a/xbmc/filesystem/PluginDirectory.cpp ++++ b/xbmc/filesystem/PluginDirectory.cpp +@@ -479,7 +479,7 @@ bool CPluginDirectory::WaitOnScriptResult(const CStdString &scriptPath, const CS + } + + // check whether we should pop up the progress dialog +- if (!progressBar && XbmcThreads::SystemClockMillis() - startTime > timeBeforeProgressBar) ++ if (!progressBar && XbmcThreads::SystemClockMillis() - startTime > timeBeforeProgressBar && !g_windowManager.HasModalDialog()) + { // loading takes more then 1.5 secs, show a progress dialog + progressBar = (CGUIDialogProgress *)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS); + +diff --git a/xbmc/interfaces/python/xbmcmodule/keyboard.cpp b/xbmc/interfaces/python/xbmcmodule/keyboard.cpp +index 0330215..0604a65 100644 +--- a/xbmc/interfaces/python/xbmcmodule/keyboard.cpp ++++ b/xbmc/interfaces/python/xbmcmodule/keyboard.cpp +@@ -92,6 +92,9 @@ namespace PYXBMC + + if (!PyArg_ParseTuple(args, (char*)"|i", &autoClose)) return NULL; + ++ if (g_windowManager.IsWindowActive(WINDOW_DIALOG_PROGRESS)) ++ g_windowManager.CloseDialogs(); ++ + PyXBMCGUILock(); + pKeyboard->Initialize(); + pKeyboard->SetHeading(self->strHeading); diff --git a/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999.055-search-dialogs-workaround.patch b/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999.055-search-dialogs-workaround.patch new file mode 100644 index 0000000000..f37fef13c2 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999.055-search-dialogs-workaround.patch @@ -0,0 +1,27 @@ +diff --git a/xbmc/filesystem/PluginDirectory.cpp b/xbmc/filesystem/PluginDirectory.cpp +index 9e519fb..b64267b 100644 +--- a/xbmc/filesystem/PluginDirectory.cpp ++++ b/xbmc/filesystem/PluginDirectory.cpp +@@ -479,7 +479,7 @@ bool CPluginDirectory::WaitOnScriptResult(const CStdString &scriptPath, const CS + } + + // check whether we should pop up the progress dialog +- if (!progressBar && XbmcThreads::SystemClockMillis() - startTime > timeBeforeProgressBar) ++ if (!progressBar && XbmcThreads::SystemClockMillis() - startTime > timeBeforeProgressBar && !g_windowManager.HasModalDialog()) + { // loading takes more then 1.5 secs, show a progress dialog + progressBar = (CGUIDialogProgress *)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS); + +diff --git a/xbmc/interfaces/python/xbmcmodule/keyboard.cpp b/xbmc/interfaces/python/xbmcmodule/keyboard.cpp +index 0330215..0604a65 100644 +--- a/xbmc/interfaces/python/xbmcmodule/keyboard.cpp ++++ b/xbmc/interfaces/python/xbmcmodule/keyboard.cpp +@@ -92,6 +92,9 @@ namespace PYXBMC + + if (!PyArg_ParseTuple(args, (char*)"|i", &autoClose)) return NULL; + ++ if (g_windowManager.IsWindowActive(WINDOW_DIALOG_PROGRESS)) ++ g_windowManager.CloseDialogs(); ++ + PyXBMCGUILock(); + pKeyboard->Initialize(); + pKeyboard->SetHeading(self->strHeading); From d031d366d3009debd3395f49e007bf58fc9b159c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 5 Aug 2012 20:06:46 +0300 Subject: [PATCH 2/9] libevent: update to libevent-2.0.19-stable --- packages/devel/libevent/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/libevent/meta b/packages/devel/libevent/meta index a15765185e..b32a8bd73a 100644 --- a/packages/devel/libevent/meta +++ b/packages/devel/libevent/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libevent" -PKG_VERSION="2.0.16-stable" +PKG_VERSION="2.0.19-stable" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="BSD" From 70fb29ae9c4159dea9793b413379e7341e95179d Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 5 Aug 2012 20:07:20 +0300 Subject: [PATCH 3/9] transmission: update to transmission-2.61 --- packages/addons/service/downloadmanager/transmission/build | 2 +- .../addons/service/downloadmanager/transmission/changelog.txt | 4 ++++ packages/addons/service/downloadmanager/transmission/meta | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/addons/service/downloadmanager/transmission/build b/packages/addons/service/downloadmanager/transmission/build index 9ab1d51475..8cef07953e 100755 --- a/packages/addons/service/downloadmanager/transmission/build +++ b/packages/addons/service/downloadmanager/transmission/build @@ -34,7 +34,7 @@ cd $PKG_BUILD --localstatedir=/var \ --disable-static \ --enable-shared \ - --disable-utp \ + --enable-utp \ --enable-largefile \ --disable-nls \ --disable-cli \ diff --git a/packages/addons/service/downloadmanager/transmission/changelog.txt b/packages/addons/service/downloadmanager/transmission/changelog.txt index 640242cc74..a4009e2075 100644 --- a/packages/addons/service/downloadmanager/transmission/changelog.txt +++ b/packages/addons/service/downloadmanager/transmission/changelog.txt @@ -1,3 +1,7 @@ +2.1.5 +- update to transmission-2.61 +- update libevent to libevent-2.0.19-stable + 2.1.4 - update to transmission-2.52 diff --git a/packages/addons/service/downloadmanager/transmission/meta b/packages/addons/service/downloadmanager/transmission/meta index 2e4b635fbb..806b0a1364 100644 --- a/packages/addons/service/downloadmanager/transmission/meta +++ b/packages/addons/service/downloadmanager/transmission/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="transmission" -PKG_VERSION="2.52" -PKG_REV="4" +PKG_VERSION="2.61" +PKG_REV="5" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.transmissionbt.com/" From aae3eb78dafacf6791d379f72e402f58261399a1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 5 Aug 2012 20:56:17 +0300 Subject: [PATCH 4/9] SABnzbd: update to SABnzbd-0.7.3 --- packages/3rdparty/download/SABnzbd/meta | 2 +- ...atch => SABnzbd-0.7.3-001_remove_default_settings-0.3.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/3rdparty/download/SABnzbd/patches/{SABnzbd-0.7.0-001_remove_default_settings-0.3.patch => SABnzbd-0.7.3-001_remove_default_settings-0.3.patch} (100%) diff --git a/packages/3rdparty/download/SABnzbd/meta b/packages/3rdparty/download/SABnzbd/meta index 33f21569c4..4473da13b1 100644 --- a/packages/3rdparty/download/SABnzbd/meta +++ b/packages/3rdparty/download/SABnzbd/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="SABnzbd" -PKG_VERSION="0.7.0" +PKG_VERSION="0.7.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.0-001_remove_default_settings-0.3.patch b/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.3-001_remove_default_settings-0.3.patch similarity index 100% rename from packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.0-001_remove_default_settings-0.3.patch rename to packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.3-001_remove_default_settings-0.3.patch From 2e3c4c56aeb5f394e82a1bd4971790b0dce19577 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 5 Aug 2012 20:57:13 +0300 Subject: [PATCH 5/9] SickBeard: update to SickBeard-b7cf06e --- packages/3rdparty/download/SickBeard/meta | 2 +- ...e-001-remove_logo_update-header_and_donate_button-0.1.patch} | 0 ... => SickBeard-b7cf06e-002-remove_default_settings-0.3.patch} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename packages/3rdparty/download/SickBeard/patches/{SickBeard-b3a7afe-001-remove_logo_update-header_and_donate_button-0.1.patch => SickBeard-b7cf06e-001-remove_logo_update-header_and_donate_button-0.1.patch} (100%) rename packages/3rdparty/download/SickBeard/patches/{SickBeard-b3a7afe-002-remove_default_settings-0.3.patch => SickBeard-b7cf06e-002-remove_default_settings-0.3.patch} (100%) diff --git a/packages/3rdparty/download/SickBeard/meta b/packages/3rdparty/download/SickBeard/meta index 55394a1b27..ecba022bda 100644 --- a/packages/3rdparty/download/SickBeard/meta +++ b/packages/3rdparty/download/SickBeard/meta @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="SickBeard" -PKG_VERSION="b3a7afe" +PKG_VERSION="b7cf06e" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-b3a7afe-001-remove_logo_update-header_and_donate_button-0.1.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-b7cf06e-001-remove_logo_update-header_and_donate_button-0.1.patch similarity index 100% rename from packages/3rdparty/download/SickBeard/patches/SickBeard-b3a7afe-001-remove_logo_update-header_and_donate_button-0.1.patch rename to packages/3rdparty/download/SickBeard/patches/SickBeard-b7cf06e-001-remove_logo_update-header_and_donate_button-0.1.patch diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-b3a7afe-002-remove_default_settings-0.3.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-b7cf06e-002-remove_default_settings-0.3.patch similarity index 100% rename from packages/3rdparty/download/SickBeard/patches/SickBeard-b3a7afe-002-remove_default_settings-0.3.patch rename to packages/3rdparty/download/SickBeard/patches/SickBeard-b7cf06e-002-remove_default_settings-0.3.patch From a44e791eb4baa710616a14759cb18cba3a681a57 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 5 Aug 2012 20:57:37 +0300 Subject: [PATCH 6/9] Headphones: update to Headphones-d07dc39 --- packages/3rdparty/download/Headphones/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/download/Headphones/meta b/packages/3rdparty/download/Headphones/meta index f2723e0b1e..197cbe2886 100644 --- a/packages/3rdparty/download/Headphones/meta +++ b/packages/3rdparty/download/Headphones/meta @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="Headphones" -PKG_VERSION="89c2a8c" +PKG_VERSION="d07dc39" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 5ec6e3b140f94fd0f9ccdebfebfe4cd749779e18 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 5 Aug 2012 20:57:53 +0300 Subject: [PATCH 7/9] CouchPotato: update to CouchPotato-806bed6 --- packages/3rdparty/download/CouchPotato/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/download/CouchPotato/meta b/packages/3rdparty/download/CouchPotato/meta index 2f277e9d3a..eee3a28763 100644 --- a/packages/3rdparty/download/CouchPotato/meta +++ b/packages/3rdparty/download/CouchPotato/meta @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="CouchPotato" -PKG_VERSION="2cb84f0" +PKG_VERSION="806bed6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From e9af0b7c083c107bcb5304f61ae848a8d53e3558 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 5 Aug 2012 20:58:09 +0300 Subject: [PATCH 8/9] CouchPotatoServer: update to CouchPotatoServer-e1d7440 --- packages/3rdparty/download/CouchPotatoServer/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/download/CouchPotatoServer/meta b/packages/3rdparty/download/CouchPotatoServer/meta index 964a4eb891..d85ff85a46 100644 --- a/packages/3rdparty/download/CouchPotatoServer/meta +++ b/packages/3rdparty/download/CouchPotatoServer/meta @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="CouchPotatoServer" -PKG_VERSION="7367f7d" +PKG_VERSION="e1d7440" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From ba81f8c9f3f2f44d1d9725048a8cea0c6863645c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 5 Aug 2012 21:01:25 +0300 Subject: [PATCH 9/9] mkpkg_couchpotatoserver: preserve .git in source --- tools/mkpkg/mkpkg_couchpotatoserver | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/mkpkg/mkpkg_couchpotatoserver b/tools/mkpkg/mkpkg_couchpotatoserver index df4639abb1..4f4c7c8d03 100755 --- a/tools/mkpkg/mkpkg_couchpotatoserver +++ b/tools/mkpkg/mkpkg_couchpotatoserver @@ -27,7 +27,6 @@ echo "getting sources..." cd CouchPotatoServer.git git pull GIT_REV=`git log -n1 --format=%h` - rm -rf .git cd .. echo "copying sources..."