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

19 files changed, 160 insertions, 118 deletions

diff --git a/package/boost/Makefile b/package/boost/Makefile
index f204ccebe..4dbb67ae9 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		boost
 PKG_VERSION:=		1.55.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		93780777cfbf999a600f62883bd54b17
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
@@ -97,6 +97,12 @@ ifeq (${ADK_PACKAGE_BOOST_WAVE},)
 	CONFIGURE_ARGS+=--without-wave
 endif
 
+ifeq ($(ARCH),x86_64)
+BOOST_ARCH:=	x86
+else
+BOOST_ARCH:=	$(ARCH)
+endif
+
 # some variables for build
 GPP_PATH:=	${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++
 GPP_VERSION:=	"`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`"
@@ -128,7 +134,7 @@ endif
 			-sBUILD=release \
 			-d 2 \
 			target-os=linux \
-			architecture=$(CPU_ARCH) \
+			architecture=$(BOOST_ARCH) \
 			binary-format=elf \
 			toolset=gcc-${GPP_VERSION} \
 			--build-type=minimal \
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index a2cb7a709..ae75f3b04 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -55,9 +55,9 @@ libbz2-install:
 	$(CP) ${WRKBUILD}/libbz2.so* \
 		${IDIR_LIBBZ2}/usr/lib
 	$(CP) ${WRKBUILD}/libbz2.so* \
-		${STAGING_DIR}/usr/lib
-	(cd ${STAGING_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
-	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_DIR)/usr/include
+		${STAGING_TARGET_DIR}/usr/lib
+	(cd ${STAGING_TARGET_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
+	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_TARGET_DIR)/usr/include
 	${INSTALL_DIR} $(IDIR_LIBBZ2_DEV)/usr/include
 	$(CP) $(WRKBUILD)/bzlib.h $(IDIR_LIBBZ2_DEV)/usr/include
 
diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so
index 605be4e5c..9948469c8 100644
--- a/package/bzip2/patches/patch-Makefile-libbz2_so
+++ b/package/bzip2/patches/patch-Makefile-libbz2_so
@@ -1,9 +1,17 @@
 --- bzip2-1.0.6.orig/Makefile-libbz2_so	2010-09-11 01:07:52.000000000 +0200
-+++ bzip2-1.0.6/Makefile-libbz2_so	2014-01-10 21:37:37.000000000 +0100
-@@ -25,6 +25,12 @@ SHELL=/bin/sh
- CC=gcc
++++ bzip2-1.0.6/Makefile-libbz2_so	2014-01-13 14:31:10.000000000 +0100
+@@ -21,10 +21,17 @@
+ # ------------------------------------------------------------------
+ 
+ 
+-SHELL=/bin/sh
+-CC=gcc
++SHELL?=/bin/sh
++CC?=gcc
  BIGFILES=-D_FILE_OFFSET_BITS=64
- CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS?=
++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES)
 +OS=$(shell uname)
 +ifeq ($(OS),Darwin)
 +LDOPT=-install_name
@@ -13,7 +21,7 @@
  
  OBJS= blocksort.o  \
        huffman.o    \
-@@ -35,7 +41,7 @@ OBJS= blocksort.o  \
+@@ -35,7 +42,7 @@ OBJS= blocksort.o  \
        bzlib.o
  
  all: $(OBJS)
diff --git a/package/eudev/Makefile b/package/eudev/Makefile
new file mode 100644
index 000000000..13f8c1b20
--- /dev/null
+++ b/package/eudev/Makefile
@@ -0,0 +1,48 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		eudev
+PKG_VERSION:=		1.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		164df78f6f0093578a20bdd00335845f
+PKG_DESCR:=		udev device manager
+PKG_SECTION:=		utils
+PKG_URL:=		http://www.gentoo.org/proj/en/eudev/
+PKG_SITES:=		http://dev.gentoo.org/~blueness/eudev/
+PKG_LIBNAME:=		libudev
+PKG_OPTS:=		dev
+
+PKG_SUBPKGS:=		UDEV LIBUDEV LIBGUDEV
+PKGSC_LIBGUDEV:=	libs
+PKGSD_LIBGUDEV:=	GUDEV library
+PKGSC_LIBUDEV:=		libs
+PKGSD_LIBUDEV:=		UDEV library
+PKGSD_UDEV:=		Dynamic device management subsystem
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBGUDEV,libgudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_ARGS+=	--disable-manpages \
+			--disable-gtk-doc
+
+udev-install:
+	${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
+	${INSTALL_DIR} ${IDIR_UDEV}/usr/lib/udev
+	${CP} ${WRKINST}/etc/udev/* ${IDIR_UDEV}/etc/udev
+	${CP} ${WRKINST}/usr/lib/udev/* ${IDIR_UDEV}/usr/lib/udev
+	${CP} ${WRKINST}/usr/bin/udevadm ${IDIR_UDEV}/usr/bin
+
+libudev-install:
+	${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
+
+libgudev-install:
+	${INSTALL_DIR} ${IDIR_LIBGUDEV}/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libgudev*.so* $(IDIR_LIBGUDEV)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libcec/Makefile b/package/libcec/Makefile
index e085df139..dcf6e2580 100644
--- a/package/libcec/Makefile
+++ b/package/libcec/Makefile
@@ -14,7 +14,9 @@ PKG_URL:=		http://libcec.pulse-eight.com/
 PKG_SITES:=		http://www.openadk.org/distfiles
 PKG_OPTS:=		dev
 
-PKG_SYSTEM_DEPENDS:=    raspberry-pi
+PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc
+PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc
+PKG_SYSTEM_DEPENDS:=    raspberry-pi ibm-x40
 PKG_LIBC_DEPENDS:=      eglibc glibc musl
 
 include $(TOPDIR)/mk/package.mk
@@ -22,9 +24,11 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBCEC,libcec,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 AUTOTOOL_STYLE:=	autoreconf
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 CONFIGURE_ARGS+=	--enable-rpi \
 			--with-rpi-include-path=$(STAGING_TARGET_DIR)/opt/vc/include \
 			--with-rpi-lib-path=$(STAGING_TARGET_DIR)/opt/vc/lib
+endif
 
 libcec-install:
 	$(INSTALL_DIR) $(IDIR_LIBCEC)/usr/lib
diff --git a/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp b/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp
new file mode 100644
index 000000000..e677a0d22
--- /dev/null
+++ b/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp
@@ -0,0 +1,11 @@
+--- libcec-2.1.4.orig/src/lib/platform/posix/serialport.cpp	2013-12-15 12:48:14.000000000 +0100
++++ libcec-2.1.4/src/lib/platform/posix/serialport.cpp	2014-01-12 22:04:41.000000000 +0100
+@@ -37,7 +37,7 @@
+ #include "lib/platform/util/baudrate.h"
+ #include "lib/platform/posix/os-socket.h"
+ 
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || !defined(__GLIBC__)
+ #ifndef XCASE
+ #define XCASE	0
+ #endif
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index bbcada2f6..8ed439e70 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtorrent
-PKG_VERSION:=		0.13.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		d499178f72010d5067a77f41fa1a1505
+PKG_VERSION:=		0.13.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		96c0b81501357df402ab592f59ecaeab
 PKG_DESCR:=		A bittorrent library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl libsigc++
@@ -21,7 +21,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_ARGS+=	--enable-aligned
+CONFIGURE_ARGS+=	--enable-aligned \
+			--without-kqueue
 
 libtorrent-install:
 	${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index a6c593f19..9b76da0b9 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		3d9f85d586c9aa3d819b626622f3fc97
 PKG_DESCR:=		virtualization API
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		libxml2 gnutls python2 libpcap parted systemd
+PKG_BUILDDEP:=		libxml2 gnutls python2 libpcap parted eudev
 PKG_DEPENDS:=		libxml2 libgnutls python2 libpcap libreadline
 PKG_DEPENDS+=		dmidecode kmod-netfilter-xt-target-checksum
 PKG_DEPENDS+=		dnsmasq qemu libnl libudev
diff --git a/package/nasm/Makefile b/package/nasm/Makefile
index 93e50f36b..39e451a70 100644
--- a/package/nasm/Makefile
+++ b/package/nasm/Makefile
@@ -4,23 +4,28 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nasm
-PKG_VERSION:=		2.07
+PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		84d8e009b3d2565a810ab3ddad1f4f63
+PKG_MD5SUM:=		a884450ee65201473af4d270bdc132f8
 PKG_DESCR:=		the netwide assembler
 PKG_SECTION:=		lang
+PKG_BUILDDEP:=		nasm-host
 PKG_URL:=		http://sourceforge.net/projects/nasm/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nasm/nasm%20sources/2.07/}
+PKG_SITES:=		http://www.nasm.us/pub/nasm/releasebuilds/${PKG_VERSION}/
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,NASM,nasm,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,NASM,nasm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 FAKE_FLAGS+=		INSTALLROOT=${WRKINST}
+HOST_STYLE:=		auto
 
 nasm-install:
 	$(INSTALL_DIR) $(IDIR_NASM)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/nasm \
 		$(IDIR_NASM)/usr/bin
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/polkit/Makefile b/package/polkit/Makefile
index 8bced57df..5ed8333e3 100644
--- a/package/polkit/Makefile
+++ b/package/polkit/Makefile
@@ -15,8 +15,6 @@ PKG_URL:=		http://www.freedesktop.org/wiki/Software/polkit/
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	eglibc glibc
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,POLKIT,polkit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index a0659476b..7daaa6443 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		rtorrent
-PKG_VERSION:=		0.9.0
+PKG_VERSION:=		0.9.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9bc258d7a63dd13e3348f310ae26a434
+PKG_MD5SUM:=		72c3e9ab859bda7cc8aa96c0b508b09f
 PKG_DESCR:=		console torrent application
 PKG_SECTION:=		p2p
 PKG_DEPENDS:=		libncurses libtorrent libcurl libstdcxx
-PKG_BUILDDEP:=		ncurses libtorrent curl
+PKG_BUILDDEP:=		autotool ncurses libtorrent curl
 PKG_URL:=		http://libtorrent.rakshasa.no/
 PKG_SITES:=		http://libtorrent.rakshasa.no/downloads/
 
@@ -18,7 +18,8 @@ PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk
 
-TARGET_LDFLAGS+=	-lpthread
+AUTOTOOL_STYLE:=	autoreconf
+TARGET_LDFLAGS+=	-lpthread -ltinfo
 
 $(eval $(call PKG_template,RTORRENT,rtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
diff --git a/package/rtorrent/patches/patch-configure b/package/rtorrent/patches/patch-configure
deleted file mode 100644
index 833360f24..000000000
--- a/package/rtorrent/patches/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- rtorrent-0.9.0.orig/configure	2011-12-10 13:32:44.000000000 +0100
-+++ rtorrent-0.9.0/configure	2012-03-22 21:14:03.805634594 +0100
-@@ -15442,38 +15442,6 @@ fi
- 
- 
- 
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for execinfo.h" >&5
--$as_echo_n "checking for execinfo.h... " >&6; }
--
--  if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <execinfo.h>
--      int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
--
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--$as_echo "#define USE_EXECINFO 1" >>confdefs.h
--
--
--else
--
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
- 
- 
diff --git a/package/rtorrent/patches/patch-configure_ac b/package/rtorrent/patches/patch-configure_ac
new file mode 100644
index 000000000..975e059cf
--- /dev/null
+++ b/package/rtorrent/patches/patch-configure_ac
@@ -0,0 +1,18 @@
+--- rtorrent-0.9.2.orig/configure.ac	2012-04-20 08:55:30.000000000 +0200
++++ rtorrent-0.9.2/configure.ac	2014-01-13 12:54:40.000000000 +0100
+@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 6, api version)
+ 
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+ 
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+@@ -20,7 +19,6 @@ TORRENT_DISABLE_IPV6
+ 
+ AC_SYS_LARGEFILE
+ 
+-TORRENT_CHECK_EXECINFO()
+ TORRENT_OTFD()
+ 
+ TORRENT_ENABLE_ARCH
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
index 11ae586ae..5fe43a086 100644
--- a/package/systemd/Makefile
+++ b/package/systemd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		systemd
 PKG_VERSION:=		208
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		df64550d92afbffb4f67a434193ee165
 PKG_DESCR:=		System and Service Manager
 PKG_SECTION:=		utils
@@ -14,28 +14,13 @@ PKG_BUILDDEP:=		autotool usbutils glib kmod util-linux libcap
 PKG_BUILDDEP+=		libgcrypt gperf-host
 PKG_URL:=		http://freedesktop.org/wiki/Software/systemd/
 PKG_SITES:=		http://www.freedesktop.org/software/systemd/
-PKG_LIBNAME:=		libudev
-PKG_OPTS:=		dev
 
 PKG_LIBC_DEPENDS:=	eglibc glibc
-PKG_SUBPKGS:=		UDEV LIBUDEV LIBGUDEV
-PKGSC_LIBGUDEV:=	libs
-PKGSD_LIBGUDEV:=	GUDEV library
-PKGSC_LIBUDEV:=		libs
-PKGSD_LIBUDEV:=		UDEV library
-PKGSD_UDEV:=		Dynamic device management subsystem
-
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+=		libmix
-endif
-
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBGUDEV,libgudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,SYSTEMD,systemd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 AUTOTOOL_STYLE:=	autoreconf
 TARGET_LDFLAGS+=	-lrt
@@ -45,19 +30,7 @@ CONFIGURE_ARGS+=	--disable-static \
 			--disable-manpages \
 			--disable-polkit
 
-udev-install:
-	${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
-	${INSTALL_DIR} ${IDIR_UDEV}/usr/lib/udev
-	${CP} ${WRKINST}/etc/udev/* ${IDIR_UDEV}/etc/udev
-	${CP} ${WRKINST}/usr/lib/udev/* ${IDIR_UDEV}/usr/lib/udev
-	${CP} ${WRKINST}/usr/bin/udevadm ${IDIR_UDEV}/usr/bin
-
-libudev-install:
-	${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
-
-libgudev-install:
-	${INSTALL_DIR} ${IDIR_LIBGUDEV}/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libgudev*.so* $(IDIR_LIBGUDEV)/usr/lib
+# TODO
+systemd-install:
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/upower/Makefile b/package/upower/Makefile
index 693359a53..99c721879 100644
--- a/package/upower/Makefile
+++ b/package/upower/Makefile
@@ -9,13 +9,11 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		14f43bc13353e23e7280863f33ac50d2
 PKG_DESCR:=		powermanagement
 PKG_SECTION:=		misc
-PKG_BUILDDEP:=		glib dbus-glib polkit systemd
+PKG_BUILDDEP:=		glib dbus-glib polkit eudev
 PKG_DEPENDS:=		glib dbus-glib polkit libgudev
 PKG_URL:=		http://upower.freedesktop.org/
 PKG_SITES:=		http://upower.freedesktop.org/releases/
 
-PKG_LIBC_DEPENDS:=	eglibc glibc
-
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index e5b67dd00..4f20654c9 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		weechat
 PKG_VERSION:=		0.4.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		fd584c258aace2aa898f40e1fcf06084
 PKG_DESCR:=		lightweight IRC client
 PKG_SECTION:=		chat
@@ -20,6 +20,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,WEECHAT,weechat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 AUTOTOOL_STYLE:=	autoreconf
+TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ARGS+=	--with-debug=0 \
 			--disable-perl \
 			--disable-python \
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 71ead8b7e..b663fde8e 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -9,27 +9,30 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		7ae385ebf8e5cfcb917393235e6efbdb
 PKG_DESCR:=		software media player
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx bcm2835-vc
+PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx
 PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad dbus
 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
 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 dbus
-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
@@ -41,12 +44,15 @@ $(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_55 \
-			-DTIXML_USE_STL=1 \
-			-I$(STAGING_DIR)/opt/vc/include \
+			-DTIXML_USE_STL=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/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 5e5e35d53..dac1fbd87 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		2d3f7111b8284cec81884023c4bb4a11
 PKG_DESCR:=		X11 driver for Event driver
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server kmod-input-evdev libudev
-PKG_BUILDDEP:=		xorg-server systemd
+PKG_BUILDDEP:=		xorg-server eudev
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_LIBC_DEPENDS:=	eglibc glibc
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
index 32c5178f5..fcc6e4256 100644
--- a/package/xf86-video-ati/Makefile
+++ b/package/xf86-video-ati/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6bb71cff9ad9c5c7b258b2b6c56fdc95
 PKG_DESCR:=		X11 driver for ATI VGA chip
 PKG_SECTION:=		x11/drivers
-PKG_BUILDDEP:=		xorg-server libdrm xf86driproto MesaLib systemd
+PKG_BUILDDEP:=		xorg-server libdrm xf86driproto MesaLib eudev
 PKG_DEPENDS:=		xorg-server libdrm mesalib libudev
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1