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

5 files changed, 239 insertions, 21 deletions

diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index fe4aa15c2..05026e12b 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -5,31 +5,34 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xbmc
 PKG_VERSION:=		12.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		7ae385ebf8e5cfcb917393235e6efbdb
 PKG_DESCR:=		software media player
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx bcm2835-vc
-PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad
+PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx
+PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad libdbus
 PKG_DEPENDS+=		libjpeg-turbo libogg libvorbis libmodplug libcurl
 PKG_DEPENDS+=		libflac libopenssl libbz2 libtiff liblzo
 PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libpng
 PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate
 PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd
-PKG_DEPENDS+=		omxplayer libbluray libgpg-error libudev
+PKG_DEPENDS+=		libbluray libgpg-error libudev python2-mod-sqlite
 PKG_DEPENDS+=		libssh libcec libnfs librtmp samba-lib libncurses
 PKG_BUILDDEP:=		autotool boost ffmpeg python2 MesaLib libglew libass
 PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug
 PKG_BUILDDEP+=		curl flac openssl bzip2 libtiff liblzo yajl
 PKG_BUILDDEP+=		tinyxml sqlite pcre libpng libcdio freetype 
 PKG_BUILDDEP+=		libsamplerate taglib libjasper lame libmicrohttpd
-PKG_BUILDDEP+=		bcm2835-vc libgpg-error libbluray
-PKG_BUILDDEP+=		libssh libcec libnfs samba rtmpdump systemd
+PKG_BUILDDEP+=		libssh libcec libnfs samba rtmpdump eudev
+PKG_BUILDDEP+=		libgpg-error libbluray dbus
 PKG_BUILDDEP+=		swig-host sdl-host sdl-image-host liblzo-host
 PKG_URL:=		http://xbmc.org/
 PKG_SITES:=		http://mirrors.xbmc.org/releases/source/
 
-PKG_SYSTEM_DEPENDS:=	raspberry-pi
+PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc omxplayer
+PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc omxplayer
+PKG_BUILDDEP_IBM_X40:=	nasm-host
+PKG_SYSTEM_DEPENDS:=	raspberry-pi ibm-x40
 PKG_LIBC_DEPENDS:=	eglibc glibc musl
 
 WRKDIST=		$(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-Frodo
@@ -40,13 +43,16 @@ $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 
 XAKE_FLAGS+=		V=1 TIXML_USE_STL=1
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
-TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/boost-1_54 \
-			-DTIXML_USE_STL=1 \
-			-I$(STAGING_DIR)/opt/vc/include \
+TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/boost-1_55 \
+			-DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1
+
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/opt/vc/include \
 			-I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \
 			-I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/opt/vc/lib -lkhrn_static \
-			-L$(STAGING_DIR)/usr/lib/samba
+TARGET_LDFLAGS+=	-L$(STAGING_DIR)/opt/vc/lib -lkhrn_static
+endif
+
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		DESTDIR='${WRKINST}' \
 			TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
@@ -58,20 +64,25 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--enable-udev \
 			--enable-libbluray \
 			--enable-external-libraries \
-			--enable-player=omxplayer \
-			--enable-gles \
 			--enable-rtmp \
 			--disable-libusb \
 			--disable-libcap \
 			--disable-sdl \
 			--disable-joystick \
 			--disable-dvdcss \
-			--disable-x11 \
-			--disable-debug \
-			--with-platform=raspberry-pi
+			--disable-debug
+
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+CONFIGURE_ARGS+=	--with-platform=raspberry-pi \
+			--enable-player=omxplayer \
+			--enable-gles \
+			--disable-x11
+else
+CONFIGURE_ARGS+=	--enable-x11
+endif
 
 pre-configure:
-	(cd $(WRKBUILD)/lib/cpluff && ./autogen.sh)
+	(cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh)
 
 xbmc-install:
 	$(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc
diff --git a/package/xbmc/files/xbmc.init b/package/xbmc/files/xbmc.init
index ed8a49bd6..afb1fd9ac 100644
--- a/package/xbmc/files/xbmc.init
+++ b/package/xbmc/files/xbmc.init
@@ -15,7 +15,7 @@ start)
 	xbmc &
 	;;
 stop)
-	kill $(pgrep -f /usr/bin/xbmc)
+	kill $(pgrep -f /usr/lib/xbmc/xbmc.bin)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/xbmc/patches/001-simplepm.patch b/package/xbmc/patches/001-simplepm.patch
new file mode 100644
index 000000000..41ded94fa
--- /dev/null
+++ b/package/xbmc/patches/001-simplepm.patch
@@ -0,0 +1,144 @@
+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
new file mode 100644
index 000000000..466dc83bb
--- /dev/null
+++ b/package/xbmc/patches/002-defaultsutf8.patch
@@ -0,0 +1,42 @@
+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/English (US)/langinfo.xml" "xbmc-12.3-Frodo/language/English (US)/langinfo.xml"
+--- "xbmc-12.3-Frodo.orig/language/English (US)/langinfo.xml"	2013-12-12 22:47:49.000000000 +0100
++++ "xbmc-12.3-Frodo/language/English (US)/langinfo.xml"	2014-01-14 19:35:02.117560629 +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-tools_Linux_xbmc_sh_in b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
index a08eb0a94..9b670449b 100644
--- a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
+++ b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
@@ -1,5 +1,26 @@
---- xbmc-12.2.orig/tools/Linux/xbmc.sh.in	2013-05-03 07:57:41.000000000 +0200
-+++ xbmc-12.2/tools/Linux/xbmc.sh.in	2013-08-05 16:24:14.000000000 +0200
+--- xbmc-12.3-Frodo.orig/tools/Linux/xbmc.sh.in	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/tools/Linux/xbmc.sh.in	2014-01-14 09:55:27.409527526 +0100
+@@ -52,7 +52,7 @@ single_stacktrace()
+ 
+ print_crash_report()
+ {
+-  FILE="$HOME/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
++  FILE="/tmp/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
+   echo "############## XBMC CRASH LOG ###############" >> $FILE
+   echo >> $FILE
+   echo "################ SYSTEM INFO ################" >> $FILE
+@@ -91,9 +91,9 @@ print_crash_report()
+   echo >> $FILE
+   echo "################# LOG FILE ##################" >> $FILE
+   echo >> $FILE
+-  if [ -f ~/.xbmc/temp/xbmc.log ]
++  if [ -f /tmp/xbmc/xbmc.log ]
+   then
+-    cat ~/.xbmc/temp/xbmc.log >> $FILE
++    cat /tmp/xbmc/xbmc.log >> $FILE
+     echo >> $FILE
+   else
+     echo "Logfile not found in the usual place." >> $FILE
 @@ -107,12 +107,6 @@ print_crash_report()
    echo "Crash report available at $FILE"
  }