Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 81 insertions, 174 deletions

diff --git a/package/xbmc/patches/001-simplepm.patch b/package/xbmc/patches/001-simplepm.patch
deleted file mode 100644
index 41ded94fa..000000000
--- a/package/xbmc/patches/001-simplepm.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
---- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp	2014-01-10 16:23:32.238217592 +0100
-@@ -0,0 +1,55 @@
-+/*
-+ *      Copyright (C) 2014 Team XBMC
-+ *      http://www.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/>.
-+ *
-+ */
-+ 
-+#if defined (_LINUX)
-+
-+#include <stdlib.h>
-+#include "LinuxPowerSyscall.h"
-+#include "utils/log.h"
-+
-+CLinuxPowerSyscall::CLinuxPowerSyscall()
-+{ 
-+	CLog::Log(LOGINFO, "Selected LinuxPower as PowerSyscall");
-+}
-+
-+CLinuxPowerSyscall::~CLinuxPowerSyscall()
-+{ }
-+
-+bool CLinuxPowerSyscall::Powerdown()
-+{
-+  system("/sbin/poweroff -F");
-+  return 0;
-+}
-+
-+bool CLinuxPowerSyscall::Reboot()
-+{
-+  system("/sbin/reboot -F");
-+  return 0;
-+}
-+
-+int CLinuxPowerSyscall::BatteryLevel(void)
-+{ }
-+
-+bool CLinuxPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback)
-+{    
-+  return true;
-+}
-+
-+#endif
-diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.h xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.h
---- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.h	1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.h	2014-01-10 14:57:23.365205874 +0100
-@@ -0,0 +1,44 @@
-+#pragma once
-+/*
-+ *      Copyright (C) 2014 Team XBMC
-+ *      http://www.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/>.
-+ *
-+ */
-+
-+#if defined (_LINUX)
-+#include "powermanagement/IPowerSyscall.h"
-+
-+class CLinuxPowerSyscall : public CPowerSyscallWithoutEvents
-+{
-+public:
-+  CLinuxPowerSyscall();
-+  ~CLinuxPowerSyscall();
-+
-+  virtual bool Powerdown();
-+  virtual bool Suspend(void) { return false; }
-+  virtual bool Hibernate(void) { return false; }
-+  virtual bool Reboot();
-+
-+  virtual bool CanPowerdown(void) { return true; }
-+  virtual bool CanSuspend(void) { return false; }
-+  virtual bool CanHibernate(void) { return false; }
-+  virtual bool CanReboot(void) { return true; }
-+  virtual int  BatteryLevel(void);
-+
-+  virtual bool PumpPowerEvents(IPowerEventsCallback *callback);
-+};
-+#endif
-diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile
---- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile	2013-12-12 22:47:49.000000000 +0100
-+++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile	2014-01-10 14:27:13.411383558 +0100
-@@ -2,7 +2,8 @@
-      ConsoleUPowerSyscall.cpp \
-      HALPowerSyscall.cpp \
-      UPowerSyscall.cpp \
--     SystemdUPowerSyscall.cpp
-+     SystemdUPowerSyscall.cpp \
-+     LinuxPowerSyscall.cpp
- 
- LIB=powermanagement_linux.a
- 
-diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp
---- xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp	2013-12-12 22:47:49.000000000 +0100
-+++ xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp	2014-01-14 11:19:11.558337441 +0100
-@@ -46,6 +46,9 @@
- #include "linux/ConsoleDeviceKitPowerSyscall.h"
- #include "linux/SystemdUPowerSyscall.h"
- #include "linux/UPowerSyscall.h"
-+#ifdef HAS_SIMPLEPM
-+#include "linux/LinuxPowerSyscall.h"
-+#endif
- #ifdef HAS_HAL
- #include "linux/HALPowerSyscall.h"
- #endif
-@@ -83,6 +86,10 @@
-     m_instance = new CSystemdUPowerSyscall();
-   else if (CUPowerSyscall::HasUPower())
-     m_instance = new CUPowerSyscall();
-+#ifdef HAS_SIMPLEPM
-+  else
-+    m_instance = new CLinuxPowerSyscall();
-+#endif
- #ifdef HAS_HAL
-   else
-     m_instance = new CHALPowerSyscall();
diff --git a/package/xbmc/patches/002-defaultsutf8.patch b/package/xbmc/patches/002-defaultsutf8.patch
deleted file mode 100644
index fad88800d..000000000
--- a/package/xbmc/patches/002-defaultsutf8.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur xbmc-12.3-Frodo.orig/language/English/langinfo.xml xbmc-12.3-Frodo/language/English/langinfo.xml
---- xbmc-12.3-Frodo.orig/language/English/langinfo.xml	2013-12-12 22:47:49.000000000 +0100
-+++ xbmc-12.3-Frodo/language/English/langinfo.xml	2014-01-14 19:34:44.869490320 +0100
-@@ -48,8 +48,8 @@
- 
- <language locale="en">
-   <charsets>
--    <gui>CP1252</gui>
--    <subtitle>CP1252</subtitle>
-+    <gui>UTF-8</gui>
-+    <subtitle>UTF-8</subtitle>
-   </charsets>
- 
-   <dvd>
-diff -Nur xbmc-12.3-Frodo.orig/language/German/langinfo.xml xbmc-12.3-Frodo/language/German/langinfo.xml
---- xbmc-12.3-Frodo.orig/language/German/langinfo.xml	2013-12-12 22:47:49.000000000 +0100
-+++ xbmc-12.3-Frodo/language/German/langinfo.xml	2014-01-14 19:34:20.997392956 +0100
-@@ -2,8 +2,8 @@
- <language locale="de">
- 
-   <charsets>
--    <gui unicodefont="false">CP1252</gui>
--    <subtitle>CP1252</subtitle>
-+    <gui unicodefont="false">UTF-8</gui>
-+    <subtitle>UTF-8</subtitle>
-   </charsets>
- 
-   <dvd>
diff --git a/package/xbmc/patches/patch-language_English_langinfo_xml b/package/xbmc/patches/patch-language_English_langinfo_xml
new file mode 100644
index 000000000..9e88d77c4
--- /dev/null
+++ b/package/xbmc/patches/patch-language_English_langinfo_xml
@@ -0,0 +1,13 @@
+--- xbmc-12.3-Frodo.orig/language/English/langinfo.xml	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/language/English/langinfo.xml	2014-01-29 07:59:05.000000000 +0100
+@@ -48,8 +48,8 @@
+ 
+ <language locale="en">
+   <charsets>
+-    <gui>CP1252</gui>
+-    <subtitle>CP1252</subtitle>
++    <gui>UTF-8</gui>
++    <subtitle>UTF-8</subtitle>
+   </charsets>
+ 
+   <dvd>
diff --git a/package/xbmc/patches/patch-language_German_langinfo_xml b/package/xbmc/patches/patch-language_German_langinfo_xml
new file mode 100644
index 000000000..4c97f914b
--- /dev/null
+++ b/package/xbmc/patches/patch-language_German_langinfo_xml
@@ -0,0 +1,13 @@
+--- xbmc-12.3-Frodo.orig/language/German/langinfo.xml	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/language/German/langinfo.xml	2014-01-29 07:59:05.000000000 +0100
+@@ -2,8 +2,8 @@
+ <language locale="de">
+ 
+   <charsets>
+-    <gui unicodefont="false">CP1252</gui>
+-    <subtitle>CP1252</subtitle>
++    <gui unicodefont="false">UTF-8</gui>
++    <subtitle>UTF-8</subtitle>
+   </charsets>
+ 
+   <dvd>
diff --git a/package/xbmc/patches/patch-m4_ax_python_devel_m4 b/package/xbmc/patches/patch-m4_ax_python_devel_m4
index c54320c0e..cdc234436 100644
--- a/package/xbmc/patches/patch-m4_ax_python_devel_m4
+++ b/package/xbmc/patches/patch-m4_ax_python_devel_m4
@@ -1,5 +1,5 @@
---- xbmc-12.2.orig/m4/ax_python_devel.m4	2013-05-03 07:57:40.000000000 +0200
-+++ xbmc-12.2/m4/ax_python_devel.m4	2013-12-03 09:41:55.000000000 +0100
+--- xbmc-12.3-Frodo.orig/m4/ax_python_devel.m4	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/m4/ax_python_devel.m4	2014-01-27 18:51:28.000000000 +0100
 @@ -151,10 +151,9 @@ $ac_distutils_result])
  	#
  	AC_MSG_CHECKING([for Python include path])
@@ -13,3 +13,21 @@
  		fi
  		PYTHON_CPPFLAGS=$python_path
  	fi
+@@ -267,17 +266,6 @@ EOD`
+ 	AC_MSG_RESULT([$PYTHON_SITE_PKG])
+ 	AC_SUBST([PYTHON_SITE_PKG])
+ 
+-	#
+-	# libraries which must be linked in when embedding
+-	#
+-	AC_MSG_CHECKING(python extra libraries)
+-	if test -z "$PYTHON_EXTRA_LIBS"; then
+-	   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+-                conf = distutils.sysconfig.get_config_var; \
+-                print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"`
+-	fi
+-	AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
+-	AC_SUBST(PYTHON_EXTRA_LIBS)
+ 
+ 	#
+ 	# linking flags needed when embedding
diff --git a/package/xbmc/patches/patch-xbmc_powermanagement_PowerManager_cpp b/package/xbmc/patches/patch-xbmc_powermanagement_PowerManager_cpp
new file mode 100644
index 000000000..0959e9c4e
--- /dev/null
+++ b/package/xbmc/patches/patch-xbmc_powermanagement_PowerManager_cpp
@@ -0,0 +1,23 @@
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp	2014-01-29 07:59:01.000000000 +0100
+@@ -46,6 +46,9 @@
+ #include "linux/ConsoleDeviceKitPowerSyscall.h"
+ #include "linux/SystemdUPowerSyscall.h"
+ #include "linux/UPowerSyscall.h"
++#ifdef HAS_SIMPLEPM
++#include "linux/LinuxPowerSyscall.h"
++#endif
+ #ifdef HAS_HAL
+ #include "linux/HALPowerSyscall.h"
+ #endif
+@@ -83,6 +86,10 @@ void CPowerManager::Initialize()
+     m_instance = new CSystemdUPowerSyscall();
+   else if (CUPowerSyscall::HasUPower())
+     m_instance = new CUPowerSyscall();
++#ifdef HAS_SIMPLEPM
++  else
++    m_instance = new CLinuxPowerSyscall();
++#endif
+ #ifdef HAS_HAL
+   else
+     m_instance = new CHALPowerSyscall();
diff --git a/package/xbmc/patches/patch-xbmc_powermanagement_linux_Makefile b/package/xbmc/patches/patch-xbmc_powermanagement_linux_Makefile
new file mode 100644
index 000000000..fefd93909
--- /dev/null
+++ b/package/xbmc/patches/patch-xbmc_powermanagement_linux_Makefile
@@ -0,0 +1,12 @@
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile	2014-01-29 07:59:01.000000000 +0100
+@@ -2,7 +2,8 @@ SRCS=ConsoleDeviceKitPowerSyscall.cpp \
+      ConsoleUPowerSyscall.cpp \
+      HALPowerSyscall.cpp \
+      UPowerSyscall.cpp \
+-     SystemdUPowerSyscall.cpp
++     SystemdUPowerSyscall.cpp \
++     LinuxPowerSyscall.cpp
+ 
+ LIB=powermanagement_linux.a
+