Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2

2025-07-24 11:16:51 +00:00 · 2013-07-14 20:50:24 +02:00 · 2013-07-14 20:50:24 +02:00 · 12d15bf92a
commit 12d15bf92a
parent 53495545ee 8efdf18b18
13 changed files with 7217 additions and 597 deletions
--- a/packages/3rdparty/x11/lib/libXcursor/meta
+++ b/packages/3rdparty/x11/lib/libXcursor/meta
@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libXfixes libXrender libX11"
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS="toolchain libX11 libXfixes libXrender"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libXcursor: X Cursor Library"
--- a/packages/mediacenter/xbmc-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-theme-Confluence/meta
@ -21,7 +21,7 @@
 PKG_NAME="xbmc-theme-Confluence"
 PKG_VERSION="12.2.0"
 if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="a1265f1"
+  PKG_VERSION="e565394"
 elif [ "$XBMC" = "xbmc-aml" ]; then
  PKG_VERSION="aml-frodo-d9119f2"
 fi
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@ -21,7 +21,7 @@
 PKG_NAME="xbmc"
 PKG_VERSION="12.2.0"
 if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="a1265f1"
+  PKG_VERSION="e565394"
 elif [ "$XBMC" = "xbmc-aml" ]; then
  PKG_VERSION="aml-frodo-d9119f2"
 fi
--- a/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch
+++ b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch
@ -1,7 +1,7 @@
 diff -rupN xbmc-upstream/xbmc/Application.cpp xbmc-vbs/xbmc/Application.cpp
 --- xbmc-upstream/xbmc/Application.cpp	2013-06-12 00:24:40.486262597 +0200
 +++ xbmc-vbs/xbmc/Application.cpp	2013-06-12 01:23:11.948400122 +0200
-@@ -5907,3 +5907,33 @@ CPerformanceStats &CApplication::GetPerf
+@@ -5907,3 +5907,37 @@ CPerformanceStats &CApplication::GetPerf
 }
 #endif
 
@ -12,6 +12,10 @@ diff -rupN xbmc-upstream/xbmc/Application.cpp xbmc-vbs/xbmc/Application.cpp
 +#if defined(HAS_FILESYSTEM_SMB) && !defined(_WIN32)
 +  smb.Deinit();
 +#endif
+
+#if defined(HAS_FILESYSTEM_NFS)
+  gNfsConnection.Deinit();
+#endif
 +}
 +
 +void CApplication::StopAddonServices()
@ -59,6 +63,18 @@ diff -rupN xbmc-upstream/xbmc/filesystem/SmbFile.cpp xbmc-vbs/xbmc/filesystem/Sm
   if (!m_context)
   {
 #ifdef TARGET_POSIX
+diff -rupN xbmc-upstream/xbmc/filesystem/NFSFile.cpp xbmc-vbs/xbmc/filesystem/NFSFile.cpp
+--- xbmc-upstream/xbmc/filesystem/NFSFile.cpp	2013-07-12 22:18:51.062605410 +0200
+++ xbmc-vbs/xbmc/filesystem/NFSFile.cpp	2013-07-12 22:19:27.069861082 +0200
+@@ -308,6 +308,8 @@
+
+ void CNfsConnection::Deinit()
+ {
+  CLog::Log(LOGNOTICE,"CNfsConnection::Deinit");
+
+   if(m_pNfsContext && m_pLibNfs->IsLoaded())
+   {
+     destroyOpenContexts();
 diff -rupN xbmc-upstream/xbmc/powermanagement/PowerManager.cpp xbmc-vbs/xbmc/powermanagement/PowerManager.cpp
 --- xbmc-upstream/xbmc/powermanagement/PowerManager.cpp	2013-06-12 00:24:41.634276292 +0200
 +++ xbmc-vbs/xbmc/powermanagement/PowerManager.cpp	2013-06-12 01:15:32.166859998 +0200
--- a/packages/mediacenter/xbmc/patches/e565394/xbmc-321-texturepacker-hostflags-and-rework.patch
+++ b/packages/mediacenter/xbmc/patches/e565394/xbmc-321-texturepacker-hostflags-and-rework.patch
--- a/packages/mediacenter/xbmc/patches/e565394/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/e565394/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
--- a/packages/mediacenter/xbmc/patches/e565394/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/e565394/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
--- a/packages/mediacenter/xbmc/patches/e565394/xbmc-602-add_as.xml_busy_dialog_delay_control.patch
+++ b/packages/mediacenter/xbmc/patches/e565394/xbmc-602-add_as.xml_busy_dialog_delay_control.patch
--- a/packages/mediacenter/xbmc/patches/e565394/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch
+++ b/packages/mediacenter/xbmc/patches/e565394/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch
--- a/packages/mediacenter/xbmc/patches/e565394/xbmc-995.01-xvba_support-a3dbeb0.patch
+++ b/packages/mediacenter/xbmc/patches/e565394/xbmc-995.01-xvba_support-a3dbeb0.patch
--- a/packages/mediacenter/xbmc/patches/e565394/xbmc-995.10-disable-alt-tab.patch
+++ b/packages/mediacenter/xbmc/patches/e565394/xbmc-995.10-disable-alt-tab.patch
--- a/packages/mediacenter/xbmc/patches/e565394/xbmc-999.01-automake-1.13.patch
+++ b/packages/mediacenter/xbmc/patches/e565394/xbmc-999.01-automake-1.13.patch
--- a/packages/unofficial
+++ b/packages/unofficial
@ -1 +1 @@
-Subproject commit d251ddd5d62edbf8dc5e7313b1e762fdb4cc73b7
+Subproject commit 464a7aa0fc2b6c12042c2f302029d0bba1807f8f