xbmc: update to xbmc-13.alpha-0efa87e

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

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -21,7 +21,7 @@
 PKG_NAME="xbmc-theme-Confluence"
 PKG_VERSION="12.2-5ba69b6"
 if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="13.alpha-df91888"
+  PKG_VERSION="13.alpha-0efa87e"
 elif [ "$XBMC" = "xbmc-aml" ]; then
   PKG_VERSION="aml-frodo-d9119f2"
 fi

packages/mediacenter/xbmc/package.mk

@@ -21,7 +21,7 @@
 PKG_NAME="xbmc"
 PKG_VERSION="12.2-5ba69b6"
 if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="13.alpha-df91888"
+  PKG_VERSION="13.alpha-0efa87e"
 elif [ "$XBMC" = "xbmc-aml" ]; then
   PKG_VERSION="aml-frodo-d9119f2"
 fi

packages/mediacenter/xbmc/patches/13.alpha-df91888/xbmc-999.02-rpipower.patch

@@ -1,113 +0,0 @@
-From 3c27e947a2c52c7b124b1bcf32f554b82b60f690 Mon Sep 17 00:00:00 2001
-From: Stephan Raue <stephan@openelec.tv>
-Date: Fri, 2 Aug 2013 01:32:03 +0200
-Subject: [PATCH] Disable Hibernate and Suspend related power options for
- Raspberry & Co. without (working) Upower/HAL/CK/Systemd support. Usually this
- devices dont support Suspend & Hibernate.
-
----
- xbmc/powermanagement/PowerManager.cpp             | 21 ++++++++----
- xbmc/powermanagement/linux/FallbackPowerSyscall.h | 39 +++++++++++++++++++++++
- 2 files changed, 53 insertions(+), 7 deletions(-)
- create mode 100644 xbmc/powermanagement/linux/FallbackPowerSyscall.h
-
-diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp
-index d658a97..993477e 100644
---- a/xbmc/powermanagement/PowerManager.cpp
-+++ b/xbmc/powermanagement/PowerManager.cpp
-@@ -40,14 +40,17 @@
- #include "osx/CocoaPowerSyscall.h"
- #elif defined(TARGET_ANDROID)
- #include "android/AndroidPowerSyscall.h"
--#elif defined(TARGET_POSIX) && defined(HAS_DBUS)
-+#elif defined(TARGET_POSIX)
-+#include "linux/FallbackPowerSyscall.h"
-+#if defined(HAS_DBUS)
- #include "linux/ConsoleUPowerSyscall.h"
- #include "linux/ConsoleDeviceKitPowerSyscall.h"
- #include "linux/LogindUPowerSyscall.h"
- #include "linux/UPowerSyscall.h"
--#ifdef HAS_HAL
-+#if defined(HAS_HAL)
- #include "linux/HALPowerSyscall.h"
--#endif
-+#endif // HAS_HAL
-+#endif // HAS_DBUS
- #elif defined(TARGET_WINDOWS)
- #include "powermanagement/windows/Win32PowerSyscall.h"
- extern HWND g_hWnd;
-@@ -73,7 +76,8 @@ void CPowerManager::Initialize()
-   m_instance = new CCocoaPowerSyscall();
- #elif defined(TARGET_ANDROID)
-   m_instance = new CAndroidPowerSyscall();
--#elif defined(TARGET_POSIX) && defined(HAS_DBUS)
-+#elif defined(TARGET_POSIX)
-+#if defined(HAS_DBUS)
-   if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
-     m_instance = new CConsoleUPowerSyscall();
-   else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
-@@ -82,10 +86,13 @@ void CPowerManager::Initialize()
-     m_instance = new CLogindUPowerSyscall();
-   else if (CUPowerSyscall::HasUPower())
-     m_instance = new CUPowerSyscall();
--#ifdef HAS_HAL
--  else
-+#if defined(HAS_HAL)
-+  else if(1)
-     m_instance = new CHALPowerSyscall();
--#endif
-+#endif // HAS_HAL
-+  else
-+#endif // HAS_DBUS
-+    m_instance = new CFallbackPowerSyscall();
- #elif defined(TARGET_WINDOWS)
-   m_instance = new CWin32PowerSyscall();
- #endif
-diff --git a/xbmc/powermanagement/linux/FallbackPowerSyscall.h b/xbmc/powermanagement/linux/FallbackPowerSyscall.h
-new file mode 100644
-index 0000000..a6ed27b
---- /dev/null
-+++ b/xbmc/powermanagement/linux/FallbackPowerSyscall.h
-@@ -0,0 +1,39 @@
-+/*
-+ *      Copyright (C) 2005-2013 Team XBMC
-+ *      http://xbmc.org
-+ *
-+ *  This Program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2, or (at your option)
-+ *  any later version.
-+ *
-+ *  This Program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with XBMC; see the file COPYING.  If not, see
-+ *  <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+#pragma once
-+#include "powermanagement/IPowerSyscall.h"
-+#include "system.h"
-+#if defined(TARGET_POSIX)
-+
-+class CFallbackPowerSyscall : public CPowerSyscallWithoutEvents
-+{
-+public:
-+  virtual bool Powerdown() {return true; }
-+  virtual bool Suspend() {return false; }
-+  virtual bool Hibernate() {return false; }
-+  virtual bool Reboot() {return true; }
-+
-+  virtual bool CanPowerdown() {return true; }
-+  virtual bool CanSuspend() {return false; }
-+  virtual bool CanHibernate() {return false; }
-+  virtual bool CanReboot() {return true; }
-+  virtual int  BatteryLevel() {return 0; }
-+};
-+#endif
--- 
-1.8.1.6
-

tools/mkpkg/mkpkg_xbmc-gotham

@@ -57,7 +57,6 @@ echo "cleaning sources..."
   rm -rf $PKG_NAME-$PKG_VERSION/visualisations
   rm -rf $PKG_NAME-$PKG_VERSION/lib/libSDL-*
   rm -rf $PKG_NAME-$PKG_VERSION/lib/libcurl-*
-  rm -rf $PKG_NAME-$PKG_VERSION/project
 
   for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
            "PackageMaker" "Translator" "XBMCLive" "XprPack" \