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

15 files changed, 235 insertions, 22 deletions

diff --git a/package/afpfs-ng/Makefile b/package/afpfs-ng/Makefile
index e9d105be7..268aff1de 100644
--- a/package/afpfs-ng/Makefile
+++ b/package/afpfs-ng/Makefile
@@ -10,7 +10,7 @@ PKG_HASH:=		688560de1cde57ab8d9e0ef7dc6436dbf0267fe8884f9014e50ff92b297b01a8
 PKG_DESCR:=		client for apple filing protocol
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		libgcrypt
-PKG_BUILDDEP:=		fuse libgcrypt
+PKG_BUILDDEP:=		fuse libgcrypt readline
 PKG_URL:=		https://sites.google.com/site/alexthepuffin/home
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=afpfs-ng/}
 PKG_LIBNAME:=		libafpclient
diff --git a/package/jq/Makefile b/package/jq/Makefile
new file mode 100644
index 000000000..d59eb8a47
--- /dev/null
+++ b/package/jq/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		jq
+PKG_VERSION:=		1.4
+PKG_RELEASE:=		1
+PKG_HASH:=		998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d
+PKG_DESCR:=		command-line json processor
+PKG_SECTION:=		sys/misc
+PKG_URL:=		http://stedolan.github.io/jq/
+PKG_SITES:=		http://stedolan.github.io/jq/download/source/
+
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JQ,jq,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+jq-install:
+	$(INSTALL_DIR) $(IDIR_JQ)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/jq \
+		$(IDIR_JQ)/usr/bin
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libmpc/Makefile b/package/libmpc/Makefile
index f0b3b6ed5..936d7b463 100644
--- a/package/libmpc/Makefile
+++ b/package/libmpc/Makefile
@@ -16,6 +16,8 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBMPC,libmpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+TARGET_LDFLAGS+=	-lm
+
 libmpc-install:
 	${INSTALL_DIR} ${IDIR_LIBMPC}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libmpc.so* ${IDIR_LIBMPC}/usr/lib
diff --git a/package/perf/Makefile b/package/perf/Makefile
index 75bd8efe4..a36d9bae8 100644
--- a/package/perf/Makefile
+++ b/package/perf/Makefile
@@ -28,11 +28,11 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-build:
-	$(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) \
+	$(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) -C "${LINUX_DIR}" \
 		$(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" all
 
 do-install:
-	$(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) \
+	$(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) -C "${LINUX_DIR}" \
 		$(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" \
 		prefix="$(WRKINST)" install
 
diff --git a/package/rt-tests/Makefile b/package/rt-tests/Makefile
new file mode 100644
index 000000000..228fcfa8a
--- /dev/null
+++ b/package/rt-tests/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		rt-tests
+PKG_VERSION:=		3fed00ff8d2c0cdbc5ba078cbd60ce3cfcee615f
+PKG_RELEASE:=		1
+PKG_DESCR:=		realtime test apps
+PKG_DEPENDS:=		libpthread librt
+PKG_SECTION:=		app/debug
+PKG_SITES:=		git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,RT_TESTS,rt-tests,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+XAKE_FLAGS+=		prefix=/usr
+CONFIG_STYLE:=		manual
+
+rt-tests-install:
+	$(INSTALL_DIR) $(IDIR_RT_TESTS)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/cyclictest \
+		$(IDIR_RT_TESTS)/usr/bin
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 6763944c3..508b7a9d6 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		samba
 PKG_VERSION:=		4.2.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		37eaa239c116dc2c22c29c5a2931eb178ed22e48b594687247446703119b4ac3
 PKG_DESCR:=		file and print server
 PKG_SECTION:=		net/fs
@@ -30,6 +30,10 @@ CONFIGURE_ARGS+=	--enable-fhs \
 			--cross-compile \
 			--cross-answers=$(WRKSRC)/cache.txt \
 			--hostcc=gcc \
+			--without-pie \
+			--without-relro \
+			--without-systemd \
+			--without-automount \
 			--without-pam \
 			--without-fam \
 			--without-dmapi \
diff --git a/package/samba/patches/patch-lib_replace_wscript b/package/samba/patches/patch-lib_replace_wscript
new file mode 100644
index 000000000..a24dc099e
--- /dev/null
+++ b/package/samba/patches/patch-lib_replace_wscript
@@ -0,0 +1,11 @@
+--- samba-4.2.1.orig/lib/replace/wscript	2015-04-15 20:00:13.000000000 +0200
++++ samba-4.2.1/lib/replace/wscript	2015-04-26 10:41:27.000000000 +0200
+@@ -66,8 +66,6 @@ def configure(conf):
+     conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
+     conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
+ 
+-    conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
+-
+     conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+     conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
+     conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
diff --git a/package/samba/patches/patch-source3_lib_util_c b/package/samba/patches/patch-source3_lib_util_c
new file mode 100644
index 000000000..41b3afb06
--- /dev/null
+++ b/package/samba/patches/patch-source3_lib_util_c
@@ -0,0 +1,18 @@
+--- samba-4.2.1.orig/source3/lib/util.c	2015-01-16 09:18:39.000000000 +0100
++++ samba-4.2.1/source3/lib/util.c	2015-04-26 13:26:28.000000000 +0200
+@@ -562,6 +562,7 @@ char *get_mydnsdomname(TALLOC_CTX *ctx)
+ 	}
+ }
+ 
++#if 0
+ #if (defined(HAVE_NETGROUP) && defined(WITH_AUTOMOUNT))
+ /******************************************************************
+  Remove any mount options such as -rsize=2048,wsize=2048 etc.
+@@ -684,6 +685,7 @@ char *automount_lookup(TALLOC_CTX *ctx,
+ }
+ #endif /* WITH_NISPLUS_HOME */
+ #endif
++#endif
+ 
+ bool process_exists(const struct server_id pid)
+ {
diff --git a/package/u-boot-git/Makefile b/package/u-boot-git/Makefile
new file mode 100644
index 000000000..d5f22ba97
--- /dev/null
+++ b/package/u-boot-git/Makefile
@@ -0,0 +1,78 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		u-boot-git
+PKG_VERSION:=		d8c1d5d5fb6eafbc532982125f006e49f2c40e71
+PKG_RELEASE:=		1
+PKG_DESCR:=		portable bootloader
+PKG_SECTION:=		base/boot
+HOST_BUILDDEP:=		openssl-host
+PKG_BUILDDEP:=		u-boot-host
+PKG_URL:=		http://www.denx.de/wiki/U-Boot	
+PKG_SITES:=		git://git.denx.de/u-boot.git
+
+PKG_CFLINE_U_BOOT_GIT:=	select ADK_KERNEL_ATAGS if ADK_TARGET_ARCH_ARM
+PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 atmel-ngw100 banana-pro
+
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,U_BOOT_GIT,u-boot-git,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,U_BOOT_GIT,u-boot-git,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+UBOOT:=			u-boot.bin
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+CONFIG:=		rpi_defconfig
+endif
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
+CONFIG:=		rpi_defconfig
+endif
+ifeq ($(ADK_TARGET_SYSTEM_ATMEL_NGW100),y)
+CONFIG:=		atngw100_defconfig
+endif
+ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
+CONFIG:=		Bananapro_defconfig
+UBOOT:=			u-boot-sunxi-with-spl.bin
+endif
+
+HOST_MAKE_FLAGS+=	HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \
+			HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl"
+HOST_STYLE:=		manual
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+host-build:
+	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
+		$(HOST_MAKE_FLAGS) sandbox_defconfig )
+	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
+		$(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
+
+u-boot-git-hostinstall:
+	$(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \
+		$(STAGING_HOST_DIR)/usr/bin
+
+do-configure:
+	(cd $(WRKBUILD) && $(MAKE) $(CONFIG))
+
+do-build:
+	(cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \
+		GCC_HONOUR_COPTS=s $(MAKE))
+	#(cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \
+	#	GCC_HONOUR_COPTS=s $(MAKE) env)
+
+u-boot-git-install:
+	$(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR)
+	$(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/etc
+	$(CP) ./files/fw_env.config $(IDIR_U_BOOT_GIT)/etc
+	$(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/usr/bin
+	#$(INSTALL_BIN) $(WRKBUILD)/tools/env/fw_printenv \
+	#	$(IDIR_U_BOOT_GIT)/usr/bin
+	#(cd $(IDIR_U_BOOT_GIT)/usr/bin && ln -sf fw_printenv fw_setenv)
+	#$(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT_GIT)/usr/bin
+	#$(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT_GIT)/usr/bin
+
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/u-boot-git/files/fw_env.config b/package/u-boot-git/files/fw_env.config
new file mode 100644
index 000000000..5571d60e0
--- /dev/null
+++ b/package/u-boot-git/files/fw_env.config
@@ -0,0 +1 @@
+/mnt/uboot.env      0x0000          0x4000
diff --git a/package/u-boot-git/files/uboot_print_env b/package/u-boot-git/files/uboot_print_env
new file mode 100755
index 000000000..7231e1a47
--- /dev/null
+++ b/package/u-boot-git/files/uboot_print_env
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mount -r /dev/mmcblk0p1 /mnt
+fw_printenv "$@"
+umount /mnt
diff --git a/package/u-boot-git/files/uboot_set_env b/package/u-boot-git/files/uboot_set_env
new file mode 100755
index 000000000..7b5a33ccc
--- /dev/null
+++ b/package/u-boot-git/files/uboot_set_env
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mount /dev/mmcblk0p1 /mnt
+fw_setenv "$@"
+umount /mnt
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 3d4681678..3bc67d76c 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -4,17 +4,29 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		vlc
-PKG_VERSION:=		2.2.0
+PKG_VERSION:=		2.2.1
 PKG_RELEASE:=		1
-PKG_HASH:=		5e0a27e248c47da723a696420aca3a4dd15cc3ed8cc81618d3f1dc8661b25517
+PKG_HASH:=		543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb
 PKG_DESCR:=		popular media player
 PKG_SECTION:=		mm/video
 PKG_BUILDDEP:=		ffmpeg xcb-util libtheora libgcrypt libmad alsa-lib
-PKG_DEPENDS:=		libffmpeg xcb-util libtheora libgcrypt alsa-lib
+PKG_DEPENDS:=		libpthread librt libffmpeg xcb-util libtheora libgcrypt alsa-lib
 PKG_URL:=		http://www.videolan.org/vlc/
 PKG_SITES:=		http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/
 
-PKG_LIBC_DEPENDS:=	glibc musl
+PKG_FLAVOURS_VLC:=	WITH_BLURAY WITH_OPUS WITH_SPEEX WITH_THEORA
+PKGFD_WITH_BLURAY:=	enable bluray support
+PKGFB_WITH_BLURAY:=	libbluray
+PKGFS_WITH_BLURAY:=	libbluray
+PKGFD_WITH_OPUS:=	enable opus support
+PKGFB_WITH_OPUS:=	opus
+PKGFS_WITH_OPUS:=	libopus
+PKGFD_WITH_SPEEX:=	enable speex support
+PKGFB_WITH_SPEEX:=	speex
+PKGFS_WITH_SPEEX:=	libspeex
+PKGFD_WITH_THEORA:=	enable theora support
+PKGFB_WITH_THEORA:=	libtheora
+PKGFS_WITH_THEORA:=	libtheora
 
 include $(ADK_TOPDIR)/mk/package.mk
 
@@ -27,21 +39,42 @@ CONFIGURE_ARGS+=	--disable-lua \
 			--disable-dbus \
 			--disable-a52 \
 			--disable-fribidi \
-			--disable-qt4 \
 			--disable-skins2 \
 			--disable-dvdnav \
-			--disable-glx \
 			--disable-libxml2 \
-			--disable-smb \
 			--disable-xcb \
 			--without-kde-solid \
 			--enable-libgcrypt \
 			--enable-mad \
-			--enable-theora \
 			--disable-optimizations \
 			--disable-static \
 			--disable-avcodec
 
+ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),)
+CONFIGURE_ARGS+=	--disable-neon
+endif
+
+ifneq ($(ADK_PACKAGE_VLC_WITH_BLURAY),)
+CONFIGURE_ARGS+=	--enable-libbluray
+else
+CONFIGURE_ARGS+=	--disable-libbluray
+endif
+ifneq ($(ADK_PACKAGE_VLC_WITH_OPUS),)
+CONFIGURE_ARGS+=	--enable-opus
+else
+CONFIGURE_ARGS+=	--disable-opus
+endif
+ifneq ($(ADK_PACKAGE_VLC_WITH_SPEEX),)
+CONFIGURE_ARGS+=	--enable-speex
+else
+CONFIGURE_ARGS+=	--disable-speex
+endif
+ifneq ($(ADK_PACKAGE_VLC_WITH_THEORA),)
+CONFIGURE_ARGS+=	--enable-theora
+else
+CONFIGURE_ARGS+=	--disable-theora
+endif
+
 vlc-install:
 	$(INSTALL_DIR) $(IDIR_VLC)/usr/bin
 	$(INSTALL_DIR) $(IDIR_VLC)/usr/lib/vlc/plugins
diff --git a/package/vlc/patches/patch-modules_misc_inhibit_xdg_c b/package/vlc/patches/patch-modules_misc_inhibit_xdg_c
deleted file mode 100644
index 59643a5b3..000000000
--- a/package/vlc/patches/patch-modules_misc_inhibit_xdg_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- vlc-2.1.1.orig/modules/misc/inhibit/xdg.c	2013-06-24 20:00:38.000000000 +0200
-+++ vlc-2.1.1/modules/misc/inhibit/xdg.c	2013-12-06 19:42:43.000000000 +0100
-@@ -28,7 +28,6 @@
- #include <assert.h>
- #include <errno.h>
- #include <signal.h>
--#include <spawn.h>
- #include <sys/wait.h>
- 
- static int Open (vlc_object_t *);
diff --git a/package/vlc/patches/patch-src_posix_error_c b/package/vlc/patches/patch-src_posix_error_c
new file mode 100644
index 000000000..3e720ec00
--- /dev/null
+++ b/package/vlc/patches/patch-src_posix_error_c
@@ -0,0 +1,14 @@
+--- vlc-2.2.1.orig/src/posix/error.c	2014-08-14 02:20:04.000000000 -0500
++++ vlc-2.2.1/src/posix/error.c	2015-04-25 21:13:22.287684003 -0500
+@@ -48,7 +48,11 @@ static const char *vlc_strerror_l(int er
+         errno = saved_errno;
+     }
+ 
++#if defined(__UCLIBC__)
++    const char *buf = strerror_r(errnum, loc, 100);
++#else
+     const char *buf = strerror_l(errnum, loc);
++#endif
+ 
+     freelocale(loc);
+     return buf;