xbmc: update to xbmc-57e5b66

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/mediacenter/xbmc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="538d8e1"
+PKG_VERSION="57e5b66"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/patches/xbmc-538d8e1-322-add_sshd_dialog-0.1.patch

@@ -1,97 +0,0 @@
-diff --git a/language/English/strings.xml b/language/English/strings.xml
-index 1583695..bdea670 100644
---- a/language/English/strings.xml
-+++ b/language/English/strings.xml
-@@ -1728,6 +1728,7 @@
-   <string id="20257">VDR Streamdev client</string>
-   <string id="20258">MythTV client</string>
-   <string id="20259">Network Filesystem (NFS)</string>
-+  <string id="20260">Secure Shell (SSH/SFTP)</string>
- 
-   <string id="20300">Web server directory (HTTP)</string>
-   <string id="20301">Web server directory (HTTPS)</string>
-diff --git a/xbmc/network/GUIDialogNetworkSetup.cpp b/xbmc/network/GUIDialogNetworkSetup.cpp
-index b39efd4..fc274f9 100644
---- a/xbmc/network/GUIDialogNetworkSetup.cpp
-+++ b/xbmc/network/GUIDialogNetworkSetup.cpp
-@@ -144,6 +144,9 @@ void CGUIDialogNetworkSetup::OnInitWindow()
- #ifdef HAS_FILESYSTEM_NFS
-   pSpin->AddLabel(g_localizeStrings.Get(20259), NET_PROTOCOL_NFS);
- #endif
-+#ifdef HAS_FILESYSTEM_SFTP
-+  pSpin->AddLabel(g_localizeStrings.Get(20260), NET_PROTOCOL_SFTP);
-+#endif
- 
-   pSpin->SetValue(m_protocol);
-   OnProtocolChange();
-@@ -210,6 +213,8 @@ void CGUIDialogNetworkSetup::OnProtocolChange()
-     m_port = "6543";
-   else if (m_protocol == NET_PROTOCOL_NFS)
-     m_port = "2049";
-+  else if (m_protocol == NET_PROTOCOL_SFTP)
-+    m_port = "22";
- 
-   UpdateButtons();
- }
-@@ -244,6 +249,7 @@ void CGUIDialogNetworkSetup::UpdateButtons()
-       m_protocol == NET_PROTOCOL_RSS ||
-       m_protocol == NET_PROTOCOL_DAV ||
-       m_protocol == NET_PROTOCOL_DAVS||
-+      m_protocol == NET_PROTOCOL_SFTP||
-       m_protocol == NET_PROTOCOL_NFS)
-   {
-     SET_CONTROL_LABEL(CONTROL_REMOTE_PATH, 1011);  // Remote Path
-@@ -276,6 +282,7 @@ void CGUIDialogNetworkSetup::UpdateButtons()
-                                                    m_protocol == NET_PROTOCOL_MYTH ||
-                                                    m_protocol == NET_PROTOCOL_RSS ||
-                                                    m_protocol == NET_PROTOCOL_DAAP ||
-+                                                   m_protocol == NET_PROTOCOL_SFTP ||
-                                                    m_protocol == NET_PROTOCOL_NFS);
- 
-   SendMessage(GUI_MSG_SET_TYPE, CONTROL_PORT_NUMBER, CGUIEditControl::INPUT_TYPE_NUMBER, 1018);
-@@ -302,6 +309,7 @@ void CGUIDialogNetworkSetup::UpdateButtons()
-                                                                               m_protocol == NET_PROTOCOL_VTP ||
-                                                                               m_protocol == NET_PROTOCOL_MYTH ||
-                                                                               m_protocol == NET_PROTOCOL_TUXBOX||
-+                                                                              m_protocol == NET_PROTOCOL_SFTP ||
-                                                                               m_protocol == NET_PROTOCOL_NFS));
- }
- 
-@@ -336,6 +344,8 @@ CStdString CGUIDialogNetworkSetup::ConstructPath() const
-     url.SetProtocol("myth");
-   else if (m_protocol == NET_PROTOCOL_NFS)
-     url.SetProtocol("nfs");
-+  else if (m_protocol == NET_PROTOCOL_SFTP)
-+    url.SetProtocol("sftp");
-     
-   if (!m_username.IsEmpty())
-   {
-@@ -356,6 +366,7 @@ CStdString CGUIDialogNetworkSetup::ConstructPath() const
-        (m_protocol == NET_PROTOCOL_VTP) ||
-        (m_protocol == NET_PROTOCOL_MYTH) ||
-        (m_protocol == NET_PROTOCOL_TUXBOX) ||
-+       (m_protocol == NET_PROTOCOL_SFTP) ||
-        (m_protocol == NET_PROTOCOL_NFS))
-       && !m_port.IsEmpty() && atoi(m_port.c_str()) > 0)
-   {
-@@ -398,6 +409,8 @@ void CGUIDialogNetworkSetup::SetPath(const CStdString &path)
-     m_protocol = NET_PROTOCOL_RSS;
-   else if (protocol == "nfs")
-     m_protocol = NET_PROTOCOL_NFS;
-+  else if (protocol == "sftp" || protocol == "ssh")
-+    m_protocol = NET_PROTOCOL_SFTP;
-   else
-     m_protocol = NET_PROTOCOL_SMB;  // default to smb
-   m_username = url.GetUserName();
-diff --git a/xbmc/network/GUIDialogNetworkSetup.h b/xbmc/network/GUIDialogNetworkSetup.h
-index 42dfa03..ec4c799 100644
---- a/xbmc/network/GUIDialogNetworkSetup.h
-+++ b/xbmc/network/GUIDialogNetworkSetup.h
-@@ -41,6 +41,7 @@ public:
-                       NET_PROTOCOL_VTP,
-                       NET_PROTOCOL_MYTH,
-                       NET_PROTOCOL_TUXBOX,
-+                      NET_PROTOCOL_SFTP,
-                       NET_PROTOCOL_NFS};
-   CGUIDialogNetworkSetup(void);
-   virtual ~CGUIDialogNetworkSetup(void);