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

mk/host-bottom.mk

@@ -103,5 +103,7 @@ endif
 ${_HOST_COOKIE}:
 	exec ${MAKE} hostpackage
 
+ifeq ($(HOST_LINUX_ONLY),)
 hostpackage: ${ALL_HOSTDIRS}
 	touch ${_HOST_COOKIE}
+endif

package/MesaLib/Makefile

@@ -35,6 +35,9 @@ endif
 ifeq ($(ADK_HOST_OPENBSD),y)
 PYTHON:=/usr/local/bin/python2.7
 endif
+ifeq ($(ADK_HOST_CYGWIN),y)
+PYTHON:=/usr/bin/python2.7
+endif
 
 ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
 DRI_DRIVERS:=i915

package/alsa-lib/Makefile

@@ -23,6 +23,7 @@ $(eval $(call HOST_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 HOST_STYLE:=		auto
+HOST_LINUX_ONLY:=	1
 TARGET_CPPFLAGS+=	-D_POSIX_C_SOURCE=1
 CONFIGURE_ARGS+=	--disable-python
 

package/cups/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cups
 PKG_VERSION:=		1.7.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		55277c40fd4b7183dc3671d39c5c42b7
 PKG_DESCR:=		Common Unix Printing System
 PKG_SECTION:=		net/misc

package/cups/files/cups.conffiles

@@ -1,4 +0,0 @@
-/etc/cups/classes.conf
-/etc/cups/client.conf
-/etc/cups/cupsd.conf
-/etc/cups/printers.conf

package/glib/Makefile

@@ -43,7 +43,8 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			ac_cv_func_posix_getpwuid_r=yes \
 			ac_cv_func_posix_getgrgid_r=yes
 
-HOST_CONFIGURE_ARGS+=	--disable-fam
+HOST_CONFIGURE_ARGS+=	--disable-fam \
+			--disable-compile-warnings
 
 glib-install:
 	${INSTALL_DIR} ${IDIR_GLIB}/usr/lib

package/gmediaserver/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gmediaserver
 PKG_VERSION:=		0.13.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		c422de386331e2a1a859d45f6fa270a3
 PKG_DESCR:=		An UPnP music media server
 PKG_SECTION:=		multimedia
@@ -21,6 +21,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE
 CONFIGURE_ENV+=		LIBS=" -lixml -lthreadutil -lupnp -lz"
 CONFIGURE_ARGS+=	--with-id3lib="${STAGING_TARGET_DIR}/usr" \
 			--with-libupnp="${STAGING_TARGET_DIR}/usr"

package/gmediaserver/patches/patch-src_contentdir_c

@@ -0,0 +1,10 @@
+--- gmediaserver-0.13.0.orig/src/contentdir.c	2007-10-20 09:59:38.000000000 +0200
++++ gmediaserver-0.13.0/src/contentdir.c	2014-01-27 13:08:37.685276614 +0100
+@@ -18,6 +18,7 @@
+  *
+  */
+ 
++#include <assert.h>
+ #include <config.h>
+ #include <stdint.h>		/* Gnulib/C99 */
+ #include <inttypes.h>		/* ? */

package/gmediaserver/patches/patch-src_upnp_c

@@ -0,0 +1,20 @@
+--- gmediaserver-0.13.0.orig/src/upnp.c	2007-10-28 09:20:43.000000000 +0100
++++ gmediaserver-0.13.0/src/upnp.c	2014-01-27 13:07:07.541007109 +0100
+@@ -265,7 +265,7 @@ handle_get_var_request(struct Upnp_State
+     say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN));
+     say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID));
+     say(3, _("Event variable name: %s\n"), quotearg(request->StateVarName));
+-    say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr));
++    say(3, _("Event source: %s\n"), inet_ntoa(*(struct in_addr *)&request->CtrlPtIPAddr));
+ 
+     if (strcmp(request->DevUDN, device_udn) != 0) {
+         say(1, _("Discarding event - event device UDN (%s) not recognized\n"), quotearg(request->DevUDN));
+@@ -306,7 +306,7 @@ handle_action_request(struct Upnp_Action
+     say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN));
+     say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID));
+     say(3, _("Event action name: %s\n"), quotearg(request->ActionName));
+-    say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr));
++    say(3, _("Event source: %s\n"), inet_ntoa(*(struct in_addr *)&request->CtrlPtIPAddr));
+     say_document(4, _("Event action request:\n"), request->ActionRequest);
+ 
+     if (strcmp(request->DevUDN, device_udn) != 0) {

package/libXt/Makefile

@@ -26,6 +26,7 @@ $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN
 HOST_STYLE:=		auto
 AUTOTOOL_STYLE:=	autoreconf
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+CONFIGURE_ENV+=		CFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)"
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 libxt-install:

package/ncurses/Makefile

@@ -83,7 +83,8 @@ libncurses-install:
 	    ${IDIR_LIBNCURSES}/usr/lib
 	for ti in rxvt rxvt-unicode; do \
 		TERMINFO=${WRKINST}/usr/share/terminfo \
-		tic -x ./files/$$ti.ti; \
+		PATH=$(HOST_PATH) \
+		tic$(EXEEXT) -x ./files/$$ti.ti; \
 	done
 ifeq (${ADK_PACKAGE_LIBNCURSES_FULL_TERMINFO},y)
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share

package/sdl-image/Makefile

@@ -26,6 +26,10 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+ifeq ($(ADK_HOST_DARWIN),y)
+LDFLAGS_FOR_BUILD+=	-framework Cocoa
+endif
+
 HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--enable-png \
 			--enable-jpg \

package/sdl/Makefile

@@ -31,7 +31,15 @@ $(eval $(call HOST_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 HOST_STYLE:=		auto
-HOST_CONFIGURE_ARGS+=	--without-x
+HOST_CONFIGURE_ARGS+=	--without-x \
+			--disable-cdrom \
+			--disable-joystick \
+			--disable-audio \
+			--disable-video \
+			--disable-assembly \
+			--disable-shared \
+			--disable-video-cocoa \
+			--disable-video-opengl
 
 ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y)
 CONFIGURE_ARGS+=	--enable-input-tslib

package/xbmc/patches/001-simplepm.patch

@@ -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();

package/xbmc/patches/002-defaultsutf8.patch

@@ -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>

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>

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>

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

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();

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
+ 

target/packages/pkg-available/mpdbox

@@ -19,9 +19,9 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_MPD_WITH_CURL
 	select ADK_PACKAGE_MPD_WITH_SAMPLERATE
 	select ADK_PACKAGE_MPD_WITH_HTTPD
-	select ADK_PACKAGE_NFS_UTILS
-	select ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS
-	select ADK_PACKAGE_NFS_UTILS_CLIENT
+	select ADK_PACKAGE_NFS_UTILS if !ADK_TARGET_LIB_MUSL
+	select ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS if !ADK_TARGET_LIB_MUSL
+	select ADK_PACKAGE_NFS_UTILS_CLIENT if !ADK_TARGET_LIB_MUSL
 	select ADK_PACKAGE_CPUFREQUTILS
 	select ADK_PACKAGE_FILE
 	select ADK_PACKAGE_HTOP

toolchain/gmp/Makefile

@@ -12,9 +12,6 @@ endif
 
 $(WRKBUILD)/.headers:
 $(WRKBUILD)/.configured:
-ifneq ($(OStype),Darwin)
-	(cd $(WRKBUILD); cp configfsf.guess config.guess)
-endif
 	(cd $(WRKBUILD); \
 		./configure \
 		--prefix=$(STAGING_HOST_DIR) \