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

packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-02_vdr-2.1.2-buildfix.patch

@@ -0,0 +1,19 @@
+commit e8bb2e8e0ef3602fc8cb252cee541bed5d45fc5c
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Sat Oct 19 22:19:10 2013 +0300
+
+    vdr 2.1.2 buildfix
+
+diff --git a/uservars.h b/uservars.h
+index f098750..a0e047c 100644
+--- a/uservars.h
++++ b/uservars.h
+@@ -538,7 +538,7 @@ class cVideodirVar : public cInternalVar {
+     cVideodirVar() : cInternalVar("videodir") {}
+     string Evaluate(const cEvent*, bool escapeStrings = false)
+ 	{
+-	    return VideoDirectory;
++	    return cVideoDirectory::Name();
+ 	}
+ };
+ 

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-05_vdr-2.1.2-buildfix.patch

@@ -0,0 +1,76 @@
+commit 0f8a281027f852ed5968361bcb7420ed242d0476
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Sat Oct 19 22:15:14 2013 +0300
+
+    vdr 2.1.2 buildfix
+
+diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
+index 80f145b..6da5285 100644
+--- a/pages/recordings.ecpp
++++ b/pages/recordings.ecpp
+@@ -79,7 +79,7 @@ for (deletions_type::const_iterator it = deletions.begin(); it != deletions.end(
+ deletions.clear();
+ 
+ int FreeMB, UsedMB;
+-int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
++int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
+ int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
+ int Hours = Minutes / 60;
+ Minutes %= 60;
+diff --git a/recman.cpp b/recman.cpp
+index 6a2fc00..9ed88f0 100644
+--- a/recman.cpp
++++ b/recman.cpp
+@@ -112,7 +112,7 @@ namespace vdrlive {
+ 		if (found == string::npos)
+ 			return false;
+ 
+-		string newname = string(VideoDirectory) + "/" + name + oldname.substr(found);
++		string newname = string(cVideoDirectory::Name()) + "/" + name + oldname.substr(found);
+ 
+ 		if (!MoveDirectory(oldname.c_str(), newname.c_str(), copy)) {
+ 			esyslog("[LIVE]: renaming failed from '%s' to '%s'", oldname.c_str(), newname.c_str());
+diff --git a/tntconfig.cpp b/tntconfig.cpp
+index 3325776..161fdc4 100644
+--- a/tntconfig.cpp
++++ b/tntconfig.cpp
+@@ -279,7 +279,7 @@ namespace vdrlive {
+ 		// inserted by 'tadi' -- not verified, not counterchecked yet!
+ 		//app.mapUrl("^/vlc/(.+)", "static@tntnet")
+ 		//	.setPathInfo("/$1")
+-		//	.pushArg(string("DocumentRoot=") + VideoDirectory);
++		//	.pushArg(string("DocumentRoot=") + cVideoDirectory::Name());
+ 
+ 		// the following selects the theme specific 'theme.css' file
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+diff --git a/tools.cpp b/tools.cpp
+index c744d06..cb3529e 100644
+--- a/tools.cpp
++++ b/tools.cpp
+@@ -365,7 +365,7 @@ namespace vdrlive {
+ 			stat(source.c_str(), &st1);
+ 			stat(target.c_str(),&st2);
+ 			if (!copy && (st1.st_dev == st2.st_dev)) {
+-				if (!RenameVideoFile(source.c_str(), target.c_str())) {
++				if (!cVideoDirectory::RenameVideoFile(source.c_str(), target.c_str())) {
+ 					esyslog("[LIVE]: rename failed from %s to %s", source.c_str(), target.c_str());
+ 					return false;
+ 				}
+@@ -461,7 +461,7 @@ namespace vdrlive {
+ 						size_t found = source.find_last_of(delim);
+ 						if (found != std::string::npos) {
+ 							source = source.substr(0, found);
+-							while (source != VideoDirectory) {
++							while (source != cVideoDirectory::Name()) {
+ 								found = source.find_last_of(delim);
+ 								if (found == std::string::npos)
+ 									break;
+@@ -478,7 +478,7 @@ namespace vdrlive {
+ 					size_t found = target.find_last_of(delim);
+ 					if (found != std::string::npos) {
+ 						target = target.substr(0, found);
+-						while (target != VideoDirectory) {
++						while (target != cVideoDirectory::Name()) {
+ 							found = target.find_last_of(delim);
+ 							if (found == std::string::npos)
+ 								break;

packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-streamdev"
-PKG_VERSION="329129d"
+PKG_VERSION="a9c2adb"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_vdr-2.1.2-buildfix.patch

@@ -0,0 +1,25 @@
+From 18f51127373375ce189be498a64cc286114f142f Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 19 Oct 2013 21:40:14 +0300
+Subject: [PATCH] vdr 2.1.2 buildfix
+
+---
+ server/connectionVTP.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/server/connectionVTP.c b/server/connectionVTP.c
+index 55c92de..57bb64b 100644
+--- a/server/connectionVTP.c
++++ b/server/connectionVTP.c
+@@ -1377,7 +1377,7 @@ bool cConnectionVTP::CmdSTAT(const char *Option)
+ 	if (*Option) {
+ 		if (strcasecmp(Option, "DISK") == 0) {
+ 			int FreeMB, UsedMB;
+-			int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
++			int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
+ 			Reply(250, "%dMB %dMB %d%%", FreeMB + UsedMB, FreeMB, Percent);
+ 		}
+ 		else if (strcasecmp(Option, "NAME") == 0) {
+-- 
+1.7.2.5
+

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/cd5023b/vdr-plugin-vnsiserver-02_vdr-2.1.2-buildfix.patch

@@ -0,0 +1,45 @@
+commit 23a2343b962777ae0dc206934abf1202c271f1e6
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Sat Oct 19 21:56:23 2013 +0300
+
+    vdr 2.1.2 buildfix
+
+diff --git a/videobuffer.c b/videobuffer.c
+index 0c26807..c393827 100644
+--- a/videobuffer.c
++++ b/videobuffer.c
+@@ -386,7 +386,7 @@ bool cVideoBufferFile::Init()
+       m_Filename = cString::sprintf("%s/Timeshift-%d.vnsi", TimeshiftBufferDir, m_ClientID);
+   }
+   else
+-    m_Filename = cString::sprintf("%s/Timeshift-%d.vnsi", VideoDirectory, m_ClientID);
++    m_Filename = cString::sprintf("%s/Timeshift-%d.vnsi", cVideoDirectory::Name(), m_ClientID);
+ 
+   m_Fd = open(m_Filename, O_RDWR | O_CREAT | O_TRUNC, S_IRWXU);
+   if (m_Fd == -1)
+diff --git a/vnsiclient.c b/vnsiclient.c
+index b724ce7..ecbcd7f 100644
+--- a/vnsiclient.c
++++ b/vnsiclient.c
+@@ -1403,7 +1403,7 @@ bool cVNSIClient::processTIMER_Update() /* OPCODE 85 */
+ bool cVNSIClient::processRECORDINGS_GetDiskSpace() /* OPCODE 100 */
+ {
+   int FreeMB;
+-  int Percent = VideoDiskSpace(&FreeMB);
++  int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB);
+   int Total   = (FreeMB / (100 - Percent)) * 100;
+ 
+   m_resp->add_U32(Total);
+diff --git a/vnsiserver.c b/vnsiserver.c
+index 5748da8..568d481 100644
+--- a/vnsiserver.c
++++ b/vnsiserver.c
+@@ -213,7 +213,7 @@ void cVNSIServer::Action(void)
+   }
+   else
+   {
+-    cmd = cString::sprintf("rm -f %s/*.vnsi", VideoDirectory);
++    cmd = cString::sprintf("rm -f %s/*.vnsi", cVideoDirectory::Name());
+   }
+   int ret = system(cmd);
+ 

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/e3cd383/vdr-plugin-vnsiserver-02_makefile-largefile.patch

@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 92fc90d..4196724 100644
---- a/Makefile
-+++ b/Makefile
-@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)
- 
- INCLUDES += -I$(VDRDIR)/include -I$(VDRDIR)
- 
--DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"'
-+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"' -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
- 
- ifeq ($(DEBUG),1)
- DEFINES += -DDEBUG

packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_vdr-2.1.2-buildfix.patch

@@ -0,0 +1,19 @@
+commit 6d5c30323f49c7960c873a423ec948834bbe8737
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Sat Oct 19 22:24:10 2013 +0300
+
+    vdr 2.1.2 buildfix
+
+diff --git a/xmltv2vdr.cpp b/xmltv2vdr.cpp
+index b367508..7b61c61 100644
+--- a/xmltv2vdr.cpp
++++ b/xmltv2vdr.cpp
+@@ -274,7 +274,7 @@ cGlobals::cGlobals()
+     imgdelafter=30;
+     soundex=false;
+ 
+-    if (asprintf(&epgfile_store,"%s/epg.db",VideoDirectory)==-1) {};
++    if (asprintf(&epgfile_store,"%s/epg.db",cVideoDirectory::Name())==-1) {};
+ 
+     if (!CheckEPGDir("/var/run/vdr"))
+     {

packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-vdr-2.1.2-buildfix.patch

@@ -0,0 +1,32 @@
+commit 45b2e4ce57e345a9b9344d5b8d8f46155b872a27
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Sat Oct 19 21:48:49 2013 +0300
+
+    vdr 2.1.2 buildfix
+
+diff --git a/src/config/config.c b/src/config/config.c
+index e058e96..1aaf9b8 100644
+--- a/src/config/config.c
++++ b/src/config/config.c
+@@ -45,7 +45,7 @@ cXVDRServerConfig::cXVDRServerConfig()
+ }
+ 
+ void cXVDRServerConfig::Load() {
+-  cLiveQueue::SetTimeShiftDir(VideoDirectory);
++  cLiveQueue::SetTimeShiftDir(cVideoDirectory::Name());
+   cRecordingsCache::GetInstance().LoadResumeData();
+ 
+   if(!cConfig<cSetupLine>::Load(AddDirectory(ConfigDirectory, GENERAL_CONFIG_FILE), true, false))
+diff --git a/src/xvdr/xvdrclient.c b/src/xvdr/xvdrclient.c
+index a1a9460..e15dd8f 100644
+--- a/src/xvdr/xvdrclient.c
++++ b/src/xvdr/xvdrclient.c
+@@ -1385,7 +1385,7 @@ bool cXVDRClient::processTIMER_Update() /* OPCODE 85 */
+ bool cXVDRClient::processRECORDINGS_GetDiskSpace() /* OPCODE 100 */
+ {
+   int FreeMB;
+-  int Percent = VideoDiskSpace(&FreeMB);
++  int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB);
+   int Total   = (FreeMB / (100 - Percent)) * 100;
+ 
+   m_resp->put_U32(Total);

packages/3rdparty/multimedia/vdr/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="vdr"
-PKG_VERSION="2.1.1"
+PKG_VERSION="2.1.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/compress/zip/package.mk

@@ -48,4 +48,5 @@ make_target() {
 makeinstall_target() {
   mkdir -p $INSTALL/usr/bin
     cp zip $INSTALL/usr/bin
+    $STRIP $INSTALL/usr/bin/zip
 }

packages/initramfs/sysutils/busybox-initramfs/scripts/init

@@ -80,6 +80,11 @@
         ;;
       disk=*)
         disk="${arg#*=}"
+        case $disk in
+          CIFS=*|SMB=*|ISCSI=*|NBD=*|NFS=*)
+            STORAGE_NETBOOT=yes
+            ;;
+        esac
         ;;
       textmode)
         INIT_ARGS="$INIT_ARGS --unit=textmode.target"
@@ -615,6 +620,10 @@
   if [ "$UPDATE_DISABLED" = "yes" ] ; then
     echo "" > /sysroot/dev/.update_disabled
   fi
+# swap can not be used over nfs.(see scripts/mount-swap)
+  if [ "$STORAGE_NETBOOT" = "yes" ] ; then
+    echo "" > /sysroot/dev/.storage_netboot
+  fi
 # switch to new sysroot and start real init
   exec /bin/busybox switch_root /sysroot /lib/systemd/systemd $INIT_ARGS
 

packages/linux-drivers/vboxguest/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vboxguest"
-PKG_VERSION="4.2.16"
+PKG_VERSION="4.3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="3.11.5"
+PKG_VERSION="3.11.6"
 PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_REV="1"
 PKG_ARCH="any"

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="13.alpha-923f1c8"
+PKG_VERSION="13.alpha-ed1d9c7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-theme-Confluence/patches/12.2.0/xbmc-theme-Confluence-990.07-PR2449-2.patch

@@ -1,35 +0,0 @@
-From efbf84893cb0d5d41232a29cd1f51f7d5cf53cb4 Mon Sep 17 00:00:00 2001
-From: xbmc <fernetmenta@online.de>
-Date: Sat, 16 Mar 2013 15:54:04 +0100
-Subject: [PATCH] skin.confluence: adjust row label 2 in VideoFullScreen to
- line break in codec info
-
----
- addons/skin.confluence/720p/VideoFullScreen.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/720p/VideoFullScreen.xml b/720p/VideoFullScreen.xml
-index 43cf714..8bdc8c8 100644
---- a/720p/VideoFullScreen.xml
-+++ b/720p/VideoFullScreen.xml
-@@ -339,7 +339,7 @@
- 			<control type="label" id="11">
- 				<description>row 2 label</description>
- 				<posx>50</posx>
--				<posy>40</posy>
-+				<posy>55</posy>
- 				<width>1180</width>
- 				<height>30</height>
- 				<align>left</align>
-@@ -350,7 +350,7 @@
- 			<control type="label" id="12">
- 				<description>row 3 label</description>
- 				<posx>50</posx>
--				<posy>85</posy>
-+				<posy>100</posy>
- 				<width>1180</width>
- 				<height>30</height>
- 				<align>left</align>
--- 
-1.8.1.5
-

packages/mediacenter/xbmc/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="13.alpha-923f1c8"
+PKG_VERSION="13.alpha-ed1d9c7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/patches/12.2-9714e7e/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk

@@ -1,99 +0,0 @@
-diff -Naur xbmc-12.1/xbmc/cores/omxplayer/OMXPlayerAudio.cpp xbmc-12.1.patch/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
---- xbmc-12.1/xbmc/cores/omxplayer/OMXPlayerAudio.cpp	2013-04-07 22:10:57.264461705 +0200
-+++ xbmc-12.1.patch/xbmc/cores/omxplayer/OMXPlayerAudio.cpp	2013-04-07 22:18:08.064718783 +0200
-@@ -80,6 +80,7 @@
-   m_send_eos      = false;
-   m_bad_state     = false;
-   m_hints_current.Clear();
-+  m_output_stalled = false;
- 
-   m_av_clock->SetMasterClock(false);
- 
-@@ -154,6 +155,7 @@
-   m_stalled         = m_messageQueue.GetPacketCount(CDVDMsg::DEMUXER_PACKET) == 0;
-   m_use_passthrough = (g_guiSettings.GetInt("audiooutput.mode") == AUDIO_HDMI) ? true : false ;
-   m_use_hw_decode   = g_advancedSettings.m_omxHWAudioDecode;
-+  m_output_stalled  = m_stalled;
- }
- 
- bool OMXPlayerAudio::CloseStream(bool bWaitForBuffers)
-@@ -442,11 +444,11 @@
-   }
- 
-   if(bDropPacket)
--    m_stalled = false;
-+    m_stalled = m_output_stalled = false;
- 
-   if(m_omxAudio.GetCacheTime() < 0.1 /*&& min(99,m_messageQueue.GetLevel() + MathUtils::round_int(100.0/8.0*GetCacheTime())) > 10*/)
-   {
--    m_stalled = true;
-+    m_stalled = m_output_stalled = true;
-     if(!m_av_clock->OMXAudioBuffer() && m_av_clock->HasVideo() && m_speed == DVD_PLAYSPEED_NORMAL)
-     {
-       clock_gettime(CLOCK_REALTIME, &m_starttime);
-@@ -454,6 +456,9 @@
-     }
-   }
- 
-+  if (m_stalled && m_omxAudio.GetCacheTime() > 0.0)
-+    m_stalled = false;
-+
-   // signal to our parent that we have initialized
-   if(m_started == false)
-   {
-@@ -478,6 +483,7 @@
- 
-     if (ret == MSGQ_TIMEOUT)
-     {
-+      m_stalled = true;
-       Sleep(10);
-       continue;
-     }
-@@ -497,12 +503,14 @@
-       CLog::Log(LOGINFO, "Audio: dts:%.0f pts:%.0f size:%d (s:%d f:%d d:%d l:%d) s:%d %d/%d late:%d,%d", pPacket->dts, pPacket->pts,
-            (int)pPacket->iSize, m_started, m_flush, bPacketDrop, m_stalled, m_speed, 0, 0, (int)m_omxAudio.GetAudioRenderingLatency(), (int)m_hints_current.samplerate);
-       #endif
-+
-+      m_stalled = false;
-       if(Decode(pPacket, m_speed > DVD_PLAYSPEED_NORMAL || m_speed < 0 || bPacketDrop))
-       {
--        if (m_stalled && (m_omxAudio.GetCacheTime() > (AUDIO_BUFFER_SECONDS * 0.75f)))
-+        if (m_output_stalled && (m_omxAudio.GetCacheTime() > (AUDIO_BUFFER_SECONDS * 0.75f)))
-         {
-           CLog::Log(LOGINFO, "COMXPlayerAudio - Switching to normal playback");
--          m_stalled = false;
-+          m_stalled = m_output_stalled = false;
-           if(m_av_clock->HasVideo() && m_av_clock->OMXAudioBuffer())
-             m_av_clock->OMXAudioBufferStop();
-         }
-@@ -510,9 +518,9 @@
-       // hard unlock audio out buffering
-       clock_gettime(CLOCK_REALTIME, &m_endtime);
-       //int iLevel = min(99,m_messageQueue.GetLevel() + MathUtils::round_int(100.0/8.0*GetCacheTime()));
--      if(/*iLevel < 10 &&*/ m_stalled && m_av_clock->OMXAudioBuffer() && (m_endtime.tv_sec - m_starttime.tv_sec) > 1)
-+      if(/*iLevel < 10 &&*/ m_output_stalled && m_av_clock->OMXAudioBuffer() && (m_endtime.tv_sec - m_starttime.tv_sec) > 1)
-       {
--        m_stalled = false;
-+        m_stalled = m_output_stalled = false;
-         if(m_av_clock->HasVideo() && m_av_clock->OMXAudioBuffer())
-           m_av_clock->OMXAudioBufferStop();
-       }
-@@ -563,6 +571,7 @@
-       m_av_clock->UnLock();
-       m_syncclock = true;
-       m_stalled   = true;
-+      m_output_stalled = true;
-       m_started   = false;
- 
-       if (m_pAudioCodec)
-diff -Naur xbmc-12.1/xbmc/cores/omxplayer/OMXPlayerAudio.h xbmc-12.1.patch/xbmc/cores/omxplayer/OMXPlayerAudio.h
---- xbmc-12.1/xbmc/cores/omxplayer/OMXPlayerAudio.h	2013-04-07 22:10:57.262461708 +0200
-+++ xbmc-12.1.patch/xbmc/cores/omxplayer/OMXPlayerAudio.h	2013-04-07 22:13:15.931280700 +0200
-@@ -76,6 +76,7 @@
- 
-   bool                      m_stalled;
-   bool                      m_started;
-+  bool                      m_output_stalled;
- 
-   BitstreamStats            m_audioStats;
- 

packages/mediacenter/xbmc/patches/12.2-9714e7e/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk

@@ -1,69 +0,0 @@
-From eacf9a512d118e50a9777ae05460a2a344a408e6 Mon Sep 17 00:00:00 2001
-From: xbmc <fernetmenta@online.de>
-Date: Thu, 28 Mar 2013 15:18:53 +0100
-Subject: [PATCH] OMXPlayer: some caching fixes for pvr
-
----
- xbmc/cores/omxplayer/OMXPlayer.cpp | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
-index 28addd3..34f3acb 100644
---- a/xbmc/cores/omxplayer/OMXPlayer.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
-@@ -1243,13 +1243,13 @@ void COMXPlayer::Process()
-     if (!IsValidStream(m_CurrentAudio)    && m_player_audio.IsStalled())    CloseAudioStream(true);
-     if (!IsValidStream(m_CurrentVideo)    && m_player_video.IsStalled())    CloseVideoStream(true);
-     if (!IsValidStream(m_CurrentSubtitle) && m_player_subtitle.IsStalled()) CloseSubtitleStream(true);
--    if (!IsValidStream(m_CurrentTeletext))                                  CloseTeletextStream(true);
-+//    if (!IsValidStream(m_CurrentTeletext))                                  CloseTeletextStream(true);
- 
-     // see if we can find something better to play
-     if (IsBetterStream(m_CurrentAudio,    pStream)) OpenAudioStream   (pStream->iId, pStream->source);
-     if (IsBetterStream(m_CurrentVideo,    pStream)) OpenVideoStream   (pStream->iId, pStream->source);
-     if (IsBetterStream(m_CurrentSubtitle, pStream)) OpenSubtitleStream(pStream->iId, pStream->source);
--    if (IsBetterStream(m_CurrentTeletext, pStream)) OpenTeletextStream(pStream->iId, pStream->source);
-+//    if (IsBetterStream(m_CurrentTeletext, pStream)) OpenTeletextStream(pStream->iId, pStream->source);
- 
-     if(m_change_volume)
-     {
-@@ -2233,7 +2233,8 @@ void COMXPlayer::HandleMessages()
-         // 1. disable audio
-         // 2. skip frames and adjust their pts or the clock
-         m_playSpeed = speed;
--        m_caching = CACHESTATE_DONE;
-+        if (m_caching != CACHESTATE_PVR && m_playSpeed != DVD_PLAYSPEED_NORMAL)
-+          SetCaching(CACHESTATE_DONE);
-         m_av_clock.SetSpeed(speed);
-         m_av_clock.OMXSetSpeed(speed);
-         m_player_audio.SetSpeed(speed);
-@@ -3106,7 +3107,7 @@ bool COMXPlayer::CloseAudioStream(bool bWaitForBuffers)
- 
-   CLog::Log(LOGNOTICE, "Closing audio stream");
- 
--  if(bWaitForBuffers)
-+  if(bWaitForBuffers && m_caching != CACHESTATE_PVR)
-     SetCaching(CACHESTATE_DONE);
- 
-   m_player_audio.CloseStream(bWaitForBuffers);
-@@ -3122,7 +3123,7 @@ bool COMXPlayer::CloseVideoStream(bool bWaitForBuffers)
- 
-   CLog::Log(LOGNOTICE, "Closing video stream");
- 
--  if(bWaitForBuffers)
-+  if(bWaitForBuffers && m_caching != CACHESTATE_PVR)
-     SetCaching(CACHESTATE_DONE);
- 
-   m_player_video.CloseStream(bWaitForBuffers);
-@@ -3151,7 +3152,7 @@ bool COMXPlayer::CloseTeletextStream(bool bWaitForBuffers)
- 
-   CLog::Log(LOGNOTICE, "Closing teletext stream");
- 
--  if(bWaitForBuffers)
-+  if(bWaitForBuffers && m_caching != CACHESTATE_PVR)
-     SetCaching(CACHESTATE_DONE);
- 
-   m_player_teletext.CloseStream(bWaitForBuffers);
--- 
-1.8.1.5
-

packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch

@@ -1,19 +0,0 @@
-diff -Naur xbmc-frodo-5ea1d22/xbmc/interfaces/python/XBPython.cpp xbmc-frodo-5ea1d22.patch/xbmc/interfaces/python/XBPython.cpp
---- xbmc-frodo-5ea1d22/xbmc/interfaces/python/XBPython.cpp	2012-09-05 13:28:20.000000000 +0200
-+++ xbmc-frodo-5ea1d22.patch/xbmc/interfaces/python/XBPython.cpp	2012-09-05 15:50:42.642317031 +0200
-@@ -525,11 +525,10 @@
-       // at http://docs.python.org/using/cmdline.html#environment-variables
- 
- #if !defined(_WIN32) && !defined(TARGET_ANDROID)
--      /* PYTHONOPTIMIZE is set off intentionally when using external Python.
--         Reason for this is because we cannot be sure what version of Python
--         was used to compile the various Python object files (i.e. .pyo,
--         .pyc, etc.). */
--        // check if we are running as real xbmc.app or just binary
-+      // Required for python to find optimized code (pyo) files
-+      setenv("PYTHONOPTIMIZE", "1", 1);
-+
-+      // check if we are running as real xbmc.app or just binary
-       if (!CUtil::GetFrameworksPath(true).IsEmpty())
-       {
-         // using external python, it's build looking for xxx/lib/python2.6

packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-452-change_lcd_content-0.1.patch

@@ -1,12 +0,0 @@
-diff -Naur xbmc-pvr-3513480/userdata/LCD.xml xbmc-pvr-3513480.patch/userdata/LCD.xml
---- xbmc-pvr-3513480/userdata/LCD.xml	2011-04-25 02:36:33.000000000 +0200
-+++ xbmc-pvr-3513480.patch/userdata/LCD.xml	2011-04-25 05:27:34.956125133 +0200
-@@ -21,7 +21,7 @@
-       <line>Freemem: $INFO[System.FreeMemory]</line>
-    </video>
-    <general>
--      <line>XBMC running...</line>
-+      <line>*** OpenELEC ***</line>
-       <line>$INFO[System.Time] $INFO[System.Date]</line>
-       <line>Freemem: $INFO[System.FreeMemory]</line>
-       <line>$INFO[System.ScreenWidth]x$INFO[System.ScreenHeight] $INFO[System.ScreenMode]</line>

packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.00-remove-windowed-display-mode.patch

@@ -1,13 +0,0 @@
-diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
-index cbf0acb..f789e18 100644
---- a/xbmc/settings/GUIWindowSettingsCategory.cpp
-+++ b/xbmc/settings/GUIWindowSettingsCategory.cpp
-@@ -2434,7 +2434,7 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES
-     pControl->Clear();
- 
-     CStdString strScreen;
--    if (g_advancedSettings.m_canWindowed)
-+    if (g_advancedSettings.m_canWindowed && !g_application.IsStandAlone())
-       pControl->AddLabel(g_localizeStrings.Get(242), -1);
- 
- #if !defined(HAS_GLX)

packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.26-keep-old-repo-content-if-update-fails.patch

@@ -1,24 +0,0 @@
-From 6a4d9b842a29fa9b0c233517826baffe5caec0cb Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Wed, 11 Sep 2013 22:52:10 +0300
-Subject: [PATCH] keep old repo content if update fails
-
----
- xbmc/addons/Repository.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/xbmc/addons/Repository.cpp b/xbmc/addons/Repository.cpp
-index 0958d47..77b1d9a 100644
---- a/xbmc/addons/Repository.cpp
-+++ b/xbmc/addons/Repository.cpp
-@@ -273,6 +273,7 @@ VECADDONS CRepositoryUpdateJob::GrabAddons(RepositoryPtr& repo)
-     {
-       CLog::Log(LOGERROR,"Repository %s returned no add-ons, listing may have failed",repo->Name().c_str());
-       reposum = checksum; // don't update the checksum
-+      database.GetRepository(repo->ID(),addons); // keep old addons
-     }
-     database.AddRepository(repo->ID(),addons,reposum);
-   }
--- 
-1.7.2.5
-

packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.29-alsa-LOGDEBUG.patch

@@ -1,12 +0,0 @@
-diff -Naur xbmc-12.2-68a881d/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp xbmc-12.2-68a881d.patch/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
---- xbmc-12.2-68a881d/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp	2013-09-12 19:41:16.000000000 +0200
-+++ xbmc-12.2-68a881d.patch/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp	2013-09-13 00:12:05.538128585 +0200
-@@ -1180,7 +1180,7 @@
-   char *errorStr;
-   if (vasprintf(&errorStr, fmt, arg) >= 0)
-   {
--    CLog::Log(LOGINFO, "CAESinkALSA - ALSA: %s:%d:(%s) %s%s%s",
-+    CLog::Log(LOGDEBUG, "CAESinkALSA - ALSA: %s:%d:(%s) %s%s%s",
-               file, line, function, errorStr, err ? ": " : "", err ? snd_strerror(err) : "");
-     free(errorStr);
-   }

packages/mediacenter/xbmc/patches/12.2-9714e7e/xbmc-990.30-After-suspend-wait-for-the-first-NIC-to-come-up.patch

@@ -1,74 +0,0 @@
-From 7cd450bb2b8ea18277efff955202bf3b36573898 Mon Sep 17 00:00:00 2001
-From: verybadsoldier <vbs@springrts.de>
-Date: Sun, 1 Sep 2013 17:10:19 +0200
-Subject: [PATCH] After suspend wait for the first NIC to come up before
- continuing
-
----
- xbmc/powermanagement/PowerManager.cpp | 24 ++++++++++++++++++++++++
- xbmc/powermanagement/PowerManager.h   |  2 ++
- 2 files changed, 26 insertions(+)
-
-diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp
-index a68910b..8e93492 100644
---- a/xbmc/powermanagement/PowerManager.cpp
-+++ b/xbmc/powermanagement/PowerManager.cpp
-@@ -23,6 +23,7 @@
- #include "Application.h"
- #include "cores/AudioEngine/AEFactory.h"
- #include "input/KeyboardStat.h"
-+#include "network/Network.h"
- #include "settings/GUISettings.h"
- #include "windowing/WindowingFactory.h"
- #include "utils/log.h"
-@@ -207,6 +207,8 @@ void CPowerManager::OnWake()
- {
-   CLog::Log(LOGNOTICE, "%s: Running resume jobs", __FUNCTION__);
- 
-+  WaitForNic();
-+
-   // reset out timers
-   g_application.ResetShutdownTimers();
- 
-@@ -254,3 +256,25 @@ void CPowerManager::OnLowBattery()
- 
-   CAnnouncementManager::Announce(System, "xbmc", "OnLowBattery");
- }
-+
-+void CPowerManager::WaitForNic()
-+{
-+    CLog::Log(LOGDEBUG, "%s: Waithing for first NIC to come up", __FUNCTION__);
-+
-+    const unsigned maxLoopCount = 50u;
-+    const unsigned sleepTimeMs = 200u;
-+
-+    for(unsigned i=0; i < maxLoopCount; ++i)
-+    {
-+        CNetworkInterface* pIface = g_application.getNetwork().GetFirstConnectedInterface();
-+        if (pIface && pIface->IsEnabled() && pIface->IsConnected())
-+        {
-+            CLog::Log(LOGDEBUG, "%s: NIC is up after waiting %d ms", __FUNCTION__, i * sleepTimeMs);
-+            return;
-+        }
-+
-+        Sleep(sleepTimeMs);
-+    }
-+
-+    CLog::Log(LOGDEBUG, "%s: NIC did not come up within %d ms... Lets give up...", __FUNCTION__, maxLoopCount * sleepTimeMs);
-+}
-diff --git a/xbmc/powermanagement/PowerManager.h b/xbmc/powermanagement/PowerManager.h
-index deb4b66..476cdc1 100644
---- a/xbmc/powermanagement/PowerManager.h
-+++ b/xbmc/powermanagement/PowerManager.h
-@@ -73,6 +73,8 @@ class CPowerManager : public IPowerEventsCallback
- 
-   void OnLowBattery();
- 
-+  void WaitForNic();
-+
-   IPowerSyscall *m_instance;
- };
- 
--- 
-1.8.4
-

packages/mediacenter/xbmc/patches/13.alpha-923f1c8/xbmc-453-add_openelec.tv_RSS_news-0.1.patch

@@ -1,11 +0,0 @@
-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 @@
-   <!-- RSS feeds. To have multiple feeds, just add a feed to the set. You can also have multiple sets. 	!-->
-   <!-- To use different sets in your skin, each must be called from skin with a unique id.             	!-->
-   <set id="1">
-+    <feed updateinterval="30">http://feeds.openelec.tv/news</feed>
-     <feed updateinterval="30">http://feeds.xbmc.org/xbmc</feed>
-   </set>
- </rssfeeds>

packages/mediacenter/xbmc/patches/13.alpha-923f1c8/xbmc-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch

@@ -1,66 +0,0 @@
-From 35400b9a93e5c2c9aa6dc389736af293fc623a5b Mon Sep 17 00:00:00 2001
-From: davilla <davilla@4pi.com>
-Date: Thu, 3 Jan 2013 11:20:22 -0500
-Subject: [PATCH] [aml] fixed context menu 'remove safely' selection
-
----
- xbmc/linux/PosixMountProvider.cpp   | 10 ++++++++++
- xbmc/linux/PosixMountProvider.h     |  2 +-
- xbmc/storage/linux/UDevProvider.cpp |  7 ++++++-
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/linux/PosixMountProvider.cpp b/xbmc/linux/PosixMountProvider.cpp
-index 2420491..27d639e 100644
---- a/xbmc/linux/PosixMountProvider.cpp
-+++ b/xbmc/linux/PosixMountProvider.cpp
-@@ -127,6 +127,16 @@ void CPosixMountProvider::GetDrives(VECSOURCES &drives)
-   return result;
- }
- 
-+bool CPosixMountProvider::Eject(CStdString mountpath)
-+{
-+  // just go ahead and try to umount the disk
-+  // if it does umount, life is good, if not, no loss.
-+  std::string cmd = "umount " + mountpath;
-+  system(cmd.c_str());
-+
-+  return true;
-+}
-+
- bool CPosixMountProvider::PumpDriveChangeEvents(IStorageEventsCallback *callback)
- {
-   VECSOURCES drives;
-diff --git a/xbmc/linux/PosixMountProvider.h b/xbmc/linux/PosixMountProvider.h
-index da0506c..02ff302 100644
---- a/xbmc/linux/PosixMountProvider.h
-+++ b/xbmc/linux/PosixMountProvider.h
-@@ -34,7 +34,7 @@ class CPosixMountProvider : public IStorageProvider
- 
-   virtual std::vector<CStdString> GetDiskUsage();
- 
--  virtual bool Eject(CStdString mountpath) { return false; }
-+  virtual bool Eject(CStdString mountpath);
- 
-   virtual bool PumpDriveChangeEvents(IStorageEventsCallback *callback);
- private:
-diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp
-index 21b6b50..d9e6a4f 100644
---- a/xbmc/storage/linux/UDevProvider.cpp
-+++ b/xbmc/storage/linux/UDevProvider.cpp
-@@ -179,7 +179,12 @@ void CUDevProvider::GetRemovableDrives(VECSOURCES &removableDrives)
- 
- bool CUDevProvider::Eject(CStdString mountpath)
- {
--  return false;
-+  // just go ahead and try to umount the disk
-+  // if it does umount, life is good, if not, no loss.
-+  std::string cmd = "umount " + mountpath;
-+  system(cmd.c_str());
-+
-+  return true;
- }
- 
- std::vector<CStdString> CUDevProvider::GetDiskUsage()
--- 
-1.8.4
-

packages/mediacenter/xbmc/patches/13.alpha-923f1c8/xbmc-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch

@@ -1,39 +0,0 @@
-From 023acdbbe7b3766e3e1bf509e92d967903aee680 Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Sat, 31 Aug 2013 18:19:43 +0300
-Subject: [PATCH] use udevil to umount. escape mountpath
-
----
- xbmc/linux/PosixMountProvider.cpp   |    2 +-
- xbmc/storage/linux/UDevProvider.cpp |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/linux/PosixMountProvider.cpp b/xbmc/linux/PosixMountProvider.cpp
-index bbf47fa..2004b44 100644
---- a/xbmc/linux/PosixMountProvider.cpp
-+++ b/xbmc/linux/PosixMountProvider.cpp
-@@ -130,7 +130,7 @@ bool CPosixMountProvider::Eject(CStdString mountpath)
- {
-   // just go ahead and try to umount the disk
-   // if it does umount, life is good, if not, no loss.
--  std::string cmd = "umount " + mountpath;
-+  std::string cmd = "udevil umount \"" + mountpath + "\"";
-   system(cmd.c_str());
- 
-   return true;
-diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp
-index e9c86ab..2f3a5ea 100644
---- a/xbmc/storage/linux/UDevProvider.cpp
-+++ b/xbmc/storage/linux/UDevProvider.cpp
-@@ -183,7 +183,7 @@ bool CUDevProvider::Eject(CStdString mountpath)
- {
-   // just go ahead and try to umount the disk
-   // if it does umount, life is good, if not, no loss.
--  std::string cmd = "umount " + mountpath;
-+  std::string cmd = "udevil umount \"" + mountpath + "\"";
-   system(cmd.c_str());
- 
-   return true;
--- 
-1.7.2.5
-

packages/multimedia/rtmpdump/install

@@ -24,9 +24,6 @@
 
 mkdir -p $INSTALL/usr/bin
   cp -P $PKG_BUILD/rtmpdump $INSTALL/usr/bin
-  cp -P $PKG_BUILD/rtmpgw $INSTALL/usr/bin
-  cp -P $PKG_BUILD/rtmpsrv $INSTALL/usr/bin
-  cp -P $PKG_BUILD/rtmpsuck $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/librtmp/*.so* $INSTALL/usr/lib

packages/network/connman/system.d/connman.service

@@ -11,6 +11,8 @@ Restart=on-failure
 EnvironmentFile=-/run/openelec/debug/connman.conf
 ExecStartPre=/usr/lib/connman/connman-setup
 ExecStart=/usr/sbin/connmand -nr $CONNMAN_DEBUG
+# send SIGKILL on stop to keep ip configuration
+KillSignal=SIGKILL
 StandardOutput=null
 
 [Install]

packages/security/openssl/build

@@ -71,3 +71,5 @@ make CC="$CC" \
      RANLIB="$RANLIB" \
      MAKEDEPPROG="$CC" \
      depend all build-shared install
+
+$STRIP apps/openssl

packages/sysutils/busybox/scripts/createlog

@@ -41,25 +41,23 @@ getlog_cmd() {
 rm -rf $BASEDIR/$LOGDIR
 mkdir -p $BASEDIR/$LOGDIR
 
-# OS Info
-#  LOGFILE="00_OS.log"
-#  getlog_cmd cat /etc/issue
-
 # XBMC.log
   LOGFILE="01_XBMC.log"
   for i in `find /storage/.xbmc/temp/ -type f -name "*.log"`; do
     getlog_cmd cat $i
   done
 
-# Kernel.log
-  LOGFILE="02_Kernel.log"
-  getlog_cmd lsmod
+# System.log
+  LOGFILE="02_System.log"
   getlog_cmd dmesg
+  getlog_cmd lsmod
+  getlog_cmd ps xa
 
 # Hardware.log
   LOGFILE="03_Hardware.log"
-  getlog_cmd lspci -vvv
+  getlog_cmd lspci -vvvvnn
   getlog_cmd lsusb -vvv
+  getlog_cmd lsusb -t
   getlog_cmd cat /proc/cpuinfo
 
 # Audio.log
@@ -70,7 +68,11 @@ mkdir -p $BASEDIR/$LOGDIR
 
 # Network.log
   LOGFILE="05_Network.log"
-  getlog_cmd ifconfig
+  getlog_cmd ifconfig -a
+  getlog_cmd netstat -rn
+  getlog_cmd netstat -nalp
+  getlog_cmd connmanctl services
+  getlog_cmd cat /etc/resolv.conf
 
 # varlog.log
   LOGFILE="06_varlog.log"
@@ -88,13 +90,17 @@ mkdir -p $BASEDIR/$LOGDIR
   getlog_cmd cat /proc/mounts
   getlog_cmd df -h
 
-# DMI.log
-#  LOGFILE="08_dmi.log"
-#  getlog_cmd dmidecode
+# Journal (current)
+  LOGFILE="09_Journal-cur.log"
+  getlog_cmd journalctl --no-pager -b -0
+
+# Journal (prev)
+  LOGFILE="10_Journal-prev.log"
+  getlog_cmd journalctl --no-pager -b -1
 
 # pack logfiles
   mkdir -p /storage/logfiles
-#  tar cvjf /storage/logfiles/log-$DATE.tar.bz2 $LOGDIR -C $BASEDIR
   zip -jq /storage/logfiles/log-$DATE.zip $BASEDIR/$LOGDIR/*
+
 # remove logdir
   rm -rf $BASEDIR/$LOGDIR

packages/sysutils/util-linux/scripts/mount-swap

@@ -20,11 +20,17 @@
 ################################################################################
 
 . /etc/swap.conf
+. /etc/profile
 
 if [ -f /storage/.config/swap.conf ]; then
   . /storage/.config/swap.conf
 fi
 
+if [ -e /dev/.storage_netboot ] ; then
+  logger -t Boot "### netbooting... swap disabled ###"
+  exit 0
+fi
+
 SWAP=`blkid -t TYPE="swap" -o device`
 
 case $1 in

packages/x11/driver/xf86-video-virtualbox/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-virtualbox"
-PKG_VERSION="4.2.16"
+PKG_VERSION="4.3.0"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"

packages/x11/other/dwm/package.mk

@@ -42,7 +42,3 @@ make_target() {
 configure_target() {
   :
 }
-
-post_install() {
-  enable_service windowmanager.service
-}

packages/x11/other/fontconfig/package.mk

@@ -51,11 +51,5 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin/fc-cat
-  rm -rf $INSTALL/usr/bin/fc-list
-  rm -rf $INSTALL/usr/bin/fc-match
-  rm -rf $INSTALL/usr/bin/fc-pattern
-  rm -rf $INSTALL/usr/bin/fc-query
-  rm -rf $INSTALL/usr/bin/fc-scan
-  rm -rf $INSTALL/usr/bin/fc-validate
+  rm -rf $INSTALL/usr/bin
 }

packages/x11/other/ratpoison/package.mk

@@ -54,7 +54,3 @@ post_makeinstall_target() {
   mkdir -p $INSTALL/etc
     cp $PKG_DIR/config/ratpoisonrc $INSTALL/etc
 }
-
-post_install() {
-  enable_service windowmanager.service
-}