jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2012-08-05 20:29:22 +02:00
commit af4c005341
15 changed files with 67 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/3rdparty/download/CouchPotato/meta vendored
View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="CouchPotato"
PKG_VERSION="2cb84f0"
PKG_VERSION="806bed6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

2
packages/3rdparty/download/CouchPotatoServer/meta vendored
View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="CouchPotatoServer"
PKG_VERSION="7367f7d"
PKG_VERSION="e1d7440"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

2
packages/3rdparty/download/Headphones/meta vendored
View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="Headphones"
PKG_VERSION="89c2a8c"
PKG_VERSION="d07dc39"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

2
packages/3rdparty/download/SABnzbd/meta vendored
View File

@ -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"

0
packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.0-001_remove_default_settings-0.3.patch → packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.3-001_remove_default_settings-0.3.patch vendored
View File

2
packages/3rdparty/download/SickBeard/meta vendored
View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="SickBeard"
PKG_VERSION="b3a7afe"
PKG_VERSION="b7cf06e"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

0
packages/3rdparty/download/SickBeard/patches/SickBeard-b3a7afe-001-remove_logo_update-header_and_donate_button-0.1.patch → packages/3rdparty/download/SickBeard/patches/SickBeard-b7cf06e-001-remove_logo_update-header_and_donate_button-0.1.patch vendored
View File

0
packages/3rdparty/download/SickBeard/patches/SickBeard-b3a7afe-002-remove_default_settings-0.3.patch → packages/3rdparty/download/SickBeard/patches/SickBeard-b7cf06e-002-remove_default_settings-0.3.patch vendored
View File

2
packages/addons/service/downloadmanager/transmission/build
View File

@ -34,7 +34,7 @@ cd $PKG_BUILD
--localstatedir=/var \
--disable-static \
--enable-shared \
--disable-utp \
--enable-utp \
--enable-largefile \
--disable-nls \
--disable-cli \

4
packages/addons/service/downloadmanager/transmission/changelog.txt
View File

@ -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

4
packages/addons/service/downloadmanager/transmission/meta
View File

@ -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/"

2
packages/devel/libevent/meta
View File

@ -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"

27
packages/mediacenter/xbmc/patches/xbmc-11.0.1-999.055-search-dialogs-workaround.patch Normal file
View File

@ -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);

27
packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999.055-search-dialogs-workaround.patch Normal file
View File

@ -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);

1
tools/mkpkg/mkpkg_couchpotatoserver
View File

@ -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..."