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

6 files changed, 135 insertions, 6 deletions

diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index bf6f4d06d..4b2ea9b6d 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -32,12 +32,12 @@ $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 
 HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--without-x \
+			--enable-shared \
 			--disable-cdrom \
 			--disable-joystick \
 			--disable-audio \
 			--disable-video \
 			--disable-assembly \
-			--disable-shared \
 			--disable-video-cocoa \
 			--disable-video-opengl
 
diff --git a/package/taglib/Makefile b/package/taglib/Makefile
index 402b89c7f..9f323fc54 100644
--- a/package/taglib/Makefile
+++ b/package/taglib/Makefile
@@ -4,15 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		taglib
-PKG_VERSION:=		1.8
+PKG_VERSION:=		1.9.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		dcb8bd1b756f2843e18b1fdf3aaeee15
+PKG_MD5SUM:=		0d35df96822bbd564c5504cb3c2e4d86
 PKG_DESCR:=		Audio Meta-Data library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
 PKG_BUILDDEP:=		cmake-host zlib
 PKG_URL:=		http://taglib.github.com/
-PKG_SITES:=		http://openadk.org/distfiles/
+PKG_SITES:=		http://taglib.github.io/releases/
 PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 05026e12b..c368c4657 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xbmc
 PKG_VERSION:=		12.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		7ae385ebf8e5cfcb917393235e6efbdb
 PKG_DESCR:=		software media player
 PKG_SECTION:=		multimedia
@@ -58,6 +58,9 @@ CONFIGURE_ENV+=		DESTDIR='${WRKINST}' \
 			TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
 CONFIGURE_ARGS+=	--disable-optical-drive \
 			--disable-mysql \
+			--enable-mid \
+			--enable-libmp3lame \
+			--enable-libvorbisenc \
 			--enable-samba \
 			--enable-ssh \
 			--enable-nfs \
diff --git a/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
new file mode 100644
index 000000000..4b8b25efb
--- /dev/null
+++ b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
@@ -0,0 +1,56 @@
+/*
+ *      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 --git a/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h
new file mode 100644
index 000000000..959a8119b
--- /dev/null
+++ b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h
@@ -0,0 +1,45 @@
+#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 --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index ac66ab230..37ad2172b 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -21,6 +21,14 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KERNEL_HID_LOGITECH
+	boolean
+	default n
+
+config ADK_KERNEL_HID_LOGITECH_DJ
+	boolean
+	default n
+
 config ADK_KERNEL_KEYBOARD_ATARI
 	boolean
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
@@ -54,6 +62,7 @@ config ADK_KERNEL_TOUCHSCREEN_ADS7846
 config ADK_KERNEL_INPUT_EVDEV
 	boolean
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_INPUT_KEYBOARD
@@ -125,6 +134,7 @@ config ADK_KERNEL_INPUT_MOUSEDEV
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_HID_SUPPORT
@@ -136,11 +146,18 @@ config ADK_KERNEL_HID
 	select ADK_KERNEL_HID_SUPPORT
 	default n
 
+config ADK_KERNEL_HID_GENERIC
+	boolean
+	select ADK_KERNEL_HID_SUPPORT
+	default n
+	
+
 config ADK_KPACKAGE_KMOD_USB_HID
 	prompt "kmod-usb-hid..................... USB keyboard/mouse support"
 	tristate
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
+	select ADK_KERNEL_HID_GENERIC
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_INPUT_MOUSEDEV
 	select ADK_KERNEL_INPUT_MOUSE
@@ -150,6 +167,15 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4
 	default n
 
+config ADK_KERNEL_LOGITECH_DINOVO
+	prompt "................................. Support for Logitech DiNovo keyboard/mouse"
+	boolean
+	select ADK_KERNEL_HID_LOGITECH
+	select ADK_KERNEL_HID_LOGITECH_DJ
+	default n
+	help
+	  Support for Logitech DiNovo keyboard/mouse combination.
+
 config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
 	prompt "kmod-input-keyboard.............. Keyboard support (AT)"
 	tristate
@@ -171,7 +197,6 @@ config ADK_KPACKAGE_KMOD_INPUT_EVDEV
 	tristate
 	select ADK_KERNEL_INPUT
 	depends on !ADK_KERNEL_INPUT_EVDEV
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 endmenu