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

11 files changed, 43 insertions, 87 deletions

diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 3453b4b7c..8f9f1b3d6 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-utils
-PKG_VERSION:=		1.0.26
+PKG_VERSION:=		1.0.27.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		4dcf1017fafc91603af96705c073eca9
+PKG_MD5SUM:=		b65e9a04181bd7c9db7667a4566f8dc3
 PKG_DESCR:=		ALSA mixer utility
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		alsa-lib libpthread
@@ -25,6 +25,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
 CONFIGURE_ARGS+=	--disable-xmlto
 ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)
 CONFIGURE_ARGS+=	--enable-alsamixer
diff --git a/package/alsa-utils/patches/patch-alsaloop_pcmjob_c b/package/alsa-utils/patches/patch-alsaloop_pcmjob_c
new file mode 100644
index 000000000..3c39d8a0c
--- /dev/null
+++ b/package/alsa-utils/patches/patch-alsaloop_pcmjob_c
@@ -0,0 +1,11 @@
+--- alsa-utils-1.0.27.2.orig/alsaloop/pcmjob.c	2013-07-09 17:28:37.000000000 +0200
++++ alsa-utils-1.0.27.2/alsaloop/pcmjob.c	2013-09-18 10:46:36.000000000 +0200
+@@ -63,7 +63,7 @@ static const char *src_types[] = {
+ #endif
+ 
+ static pthread_mutex_t pcm_open_mutex =
+-                                PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++                                {{{1,0,0,0,0,0,0,0,0,0}}};
+ 
+ static inline void pcm_open_lock(void)
+ {
diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index 8818e6310..eeff44616 100644
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -3,14 +3,14 @@
 
 include ${TOPDIR}/rules.mk
 
-PKG_NAME:=		libusb
-PKG_VERSION:=		1.0.8
+PKG_NAME:=		libusbx
+PKG_VERSION:=		1.0.16
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		37d34e6eaa69a4b645a19ff4ca63ceef
+PKG_MD5SUM:=		7f5715d624cd6c26b30a317eb6c2fe5e
 PKG_DESCR:=		a library for accessing Linux USB devices
 PKG_SECTION:=		libs
 PKG_URL:=		http://libusb.wiki.sourceforge.net/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libusb/}
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libusbx/}
 
 PKG_SUBPKGS:=		LIBUSB LIBUSB_DEV
 PKGSD_LIBUSB_DEV:=	header files for libusb library
@@ -27,6 +27,9 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBUSB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBUSB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_DEV},${PKGSC_LIBUSB_DEV},${PKG_OPTS}))
 
+TARGET_CPPFLAGS=	-DTIMESPEC_TO_TIMEVAL=
+CONFIGURE_ARGS+=	--disable-udev
+
 libusb-install:
 	${INSTALL_DIR} ${IDIR_LIBUSB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib
diff --git a/package/libusb/patches/patch-ltmain_sh b/package/libusb/patches/patch-ltmain_sh
deleted file mode 100644
index 7ac5092b0..000000000
--- a/package/libusb/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- libusb-1.0.8.orig/ltmain.sh	2010-05-05 00:02:07.000000000 +0200
-+++ libusb-1.0.8/ltmain.sh	2011-01-14 19:20:50.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 276a223ae..abd47f4e7 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
-PKG_VERSION:=		0.17.4
-PKG_RELEASE:=		8
-PKG_MD5SUM:=		ab408a61f49f215ce77ed0cf1deed6e1
+PKG_VERSION:=		0.17.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b68be330deeb23989c08a9fefd9fcdeb
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		glib libstdcxx
@@ -105,8 +105,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
 TARGET_CFLAGS+=		-std=gnu99
-XAKE_FLAGS+=		MPD_CFLAGS='-D_GNU_SOURCE'
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--disable-httpd-output \
 			--disable-jack \
diff --git a/package/mpd/patches/patch-src_output_alsa_plugin_c b/package/mpd/patches/patch-src_output_alsa_plugin_c
deleted file mode 100644
index 98479eb7d..000000000
--- a/package/mpd/patches/patch-src_output_alsa_plugin_c
+++ /dev/null
@@ -1,16 +0,0 @@
-* will be better solved in mpd 1.16.4
-
---- mpd-0.16.2.orig/src/output/alsa_plugin.c	2011-03-19 01:41:53.000000000 +0100
-+++ mpd-0.16.2/src/output/alsa_plugin.c	2011-05-14 13:44:14.000000000 +0200
-@@ -646,8 +646,9 @@ alsa_play(void *data, const void *chunk,
- 	while (true) {
- 		snd_pcm_sframes_t ret = ad->writei(ad->pcm, chunk, size);
- 		if (ret > 0) {
--			ad->period_position = (ad->period_position + ret)
--				% ad->period_frames;
-+			// SIGFPE!
-+			//ad->period_position = (ad->period_position + ret)
-+			//	% ad->period_frames;
- 			return ret * ad->frame_size;
- 		}
- 
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index e9aaddf9a..4a2eea8e7 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -24,6 +24,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKGSD_LIBNCURSES_DEV},${PKGSC_LIBNCURSES_DEV}))
 
+TARGET_CFLAGS+=		-lgcc
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
 CONFIGURE_ARGS+=	--without-cxx \
 			--without-cxx-binding \
diff --git a/package/php/Makefile b/package/php/Makefile
index f6c97d2db..64bf3c013 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		php
-PKG_VERSION:=		5.4.17
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		cc698032dcdcb9ad158edcc90fe798d6
+PKG_VERSION:=		5.4.19
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9e7ad2494ba3de519328f74267de8342
 PKG_DESCR:=		PHP language interpreter
 PKG_SECTION:=		lang
 PKG_DEPENDS:=		libpthread librt libgcc
diff --git a/package/screen/Makefile b/package/screen/Makefile
index 0e63651cb..22a1bd6f3 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -21,6 +21,14 @@ $(eval $(call PKG_template,SCREEN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK
 CONFIGURE_ENV+=		$(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_${flag}=yes)
 CONFIGURE_ARGS+=	--with-sys-screenrc=/etc/screenrc
 
+pre-build:
+	echo '#undef UTMPOK' >> ${WRKBUILD}/config.h
+	echo '#undef LOGINDEFAULT' >> ${WRKBUILD}/config.h
+	echo '#define LOGINDEFAULT 0' >> ${WRKBUILD}/config.h
+	echo '#undef GETUTENT' >> ${WRKBUILD}/config.h
+	echo '#undef UTHOST' >> ${WRKBUILD}/config.h
+	echo '#undef BUGGYGETLOGIN' >> ${WRKBUILD}/config.h
+
 post-install:
 	${INSTALL_DIR} ${IDIR_SCREEN}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/screen ${IDIR_SCREEN}/usr/bin/
diff --git a/package/vim/Makefile b/package/vim/Makefile
index da2cd3d3b..a96c799b1 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		vim
-PKG_VERSION:=		7.3
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		5b9510a17074e2b37d8bb38ae09edbf2
+PKG_VERSION:=		7.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		607e135c559be642f210094ad023dc65
 PKG_DESCR:=		The text editor
 PKG_SECTION:=		editor
 PKG_DEPENDS:=		libncurses libgcc
@@ -15,13 +15,14 @@ PKG_URL:=		http://www.vim.org/
 PKG_SITES:=		ftp://ftp.vim.org/pub/vim/unix/
 
 DISTFILES=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
-WRKDIST=		${WRKDIR}/vim73
+WRKDIST=		${WRKDIR}/vim74
 WRKSRC=			${WRKDIST}/src
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VIM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CFLAGS+=		-lgcc
 CONFIGURE_ENV+=		vim_cv_toupper_broken=no \
 			vim_cv_getcwd_broken=no \
 			vim_cv_stat_ignores_slash=yes \
@@ -60,7 +61,7 @@ post-install:
 	${INSTALL_DIR} ${IDIR_VIM}/usr/bin
 	${INSTALL_DIR} ${IDIR_VIM}/usr/share/vim
 	${CP} ${WRKINST}/usr/bin/{ex,vim,view} ${IDIR_VIM}/usr/bin
-	${CP} ${WRKINST}/usr/share/vim/vim73/vimrc_example.vim \
+	${CP} ${WRKINST}/usr/share/vim/vim74/vimrc_example.vim \
 		${IDIR_VIM}/usr/share/vim/vimrc
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/vim/patches/patch-src_auto_configure b/package/vim/patches/patch-src_auto_configure
deleted file mode 100644
index 37544f63b..000000000
--- a/package/vim/patches/patch-src_auto_configure
+++ /dev/null
@@ -1,42 +0,0 @@
---- vim73.orig/src/auto/configure	2010-08-13 16:17:15.000000000 +0200
-+++ vim73/src/auto/configure	2010-09-20 02:59:14.017806852 +0200
-@@ -11639,39 +11639,6 @@ _ACEOF
- 
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
--$as_echo_n "checking uint32_t is 32 bits... " >&6; }
--if test "$cross_compiling" = yes; then :
--  as_fn_error "could not compile program using uint32_t." "$LINENO" 5
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--#ifdef HAVE_STDINT_H
--# include <stdint.h>
--#endif
--#ifdef HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--main() {
--  uint32_t nr1 = (uint32_t)-1;
--  uint32_t nr2 = (uint32_t)0xffffffffUL;
--  if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1);
--  exit(0);
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
--$as_echo "ok" >&6; }
--else
--  as_fn_error "WRONG!  uint32_t not defined correctly." "$LINENO" 5
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--
--
- bcopy_test_prog='
- #include "confdefs.h"
- #ifdef HAVE_STRING_H