alsa-lib: update to 1.1.4

7 files changed, 3 insertions, 130 deletions

diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 46d54327c..bf7f496d1 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-lib
-PKG_VERSION:=		1.0.29
-PKG_RELEASE:=		5
-PKG_HASH:=		73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0
+PKG_VERSION:=		1.1.4
+PKG_RELEASE:=		1
+PKG_HASH:=		82f50a09487079755d93e4c9384912196995bade6280bce9bfdcabf094bfb515
 PKG_DESCR:=		sound library
 PKG_SECTION:=		libs/audio
 PKG_URL:=		http://www.alsa-project.org/
@@ -21,13 +21,10 @@ include ${ADK_TOPDIR}/mk/package.mk
 $(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}))
 
-AUTOTOOL_STYLE:=	autoreconf
-
 ifneq ($(ADK_HOST_LINUX),y)
 HOST_LINUX_ONLY:=	1
 endif
 
-TARGET_CPPFLAGS+=	-D_POSIX_C_SOURCE=1
 HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--disable-python
 CONFIGURE_ARGS+=	--disable-python \
diff --git a/package/alsa-lib/patches/patch-configure_ac b/package/alsa-lib/patches/patch-configure_ac
deleted file mode 100644
index c9e7cfbf6..000000000
--- a/package/alsa-lib/patches/patch-configure_ac
+++ /dev/null
@@ -1,26 +0,0 @@
---- alsa-lib-1.0.29.orig/configure.ac	2015-02-26 13:34:52.000000000 +0100
-+++ alsa-lib-1.0.29/configure.ac	2016-11-20 18:20:58.456540169 +0100
-@@ -67,21 +67,13 @@ dnl Checks for library functions.
- AC_PROG_GCC_TRADITIONAL
- AC_CHECK_FUNCS([uselocale])
- 
-+AC_CHECK_FUNC([fork])
-+
- SAVE_LIBRARY_VERSION
- AC_SUBST(LIBTOOL_VERSION_INFO)
- 
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- 
--dnl Do not build static and shared libraries together
--if test "$enable_static" = "$enable_shared" -a "$enable_static" = "yes"; then
--cat <<EOF
--  Please, do not try to compile static and shared libraries together.
--  See INSTALL file for more details (do not use --enable-shared=yes with
--  --enable-static=yes).
--EOF
--  exit 1
--fi
--
- dnl ALSA configuration directory
- AC_ARG_WITH(configdir,
-     AS_HELP_STRING([--with-configdir=dir],
diff --git a/package/alsa-lib/patches/patch-include_pcm_h b/package/alsa-lib/patches/patch-include_pcm_h
deleted file mode 100644
index a82c1a7b2..000000000
--- a/package/alsa-lib/patches/patch-include_pcm_h
+++ /dev/null
@@ -1,28 +0,0 @@
-* added idea/patch from https://github.com/rofl0r/sabotage
-
---- alsa-lib-1.0.29.orig/include/pcm.h	2015-02-26 13:34:52.000000000 +0100
-+++ alsa-lib-1.0.29/include/pcm.h	2016-11-20 18:14:09.708758715 +0100
-@@ -33,6 +33,8 @@
- extern "C" {
- #endif
- 
-+#include <stdint.h>
-+
- /**
-  *  \defgroup PCM PCM Interface
-  *  See the \ref pcm page for more details.
-@@ -1063,10 +1065,10 @@ int snd_pcm_format_width(snd_pcm_format_
- int snd_pcm_format_physical_width(snd_pcm_format_t format);		/* in bits */
- snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian);
- ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
--u_int8_t snd_pcm_format_silence(snd_pcm_format_t format);
--u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
--u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
--u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
-+uint8_t snd_pcm_format_silence(snd_pcm_format_t format);
-+uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
-+uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
-+uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
- int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples);
- 
- snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes);
diff --git a/package/alsa-lib/patches/patch-include_sound_asound_h b/package/alsa-lib/patches/patch-include_sound_asound_h
deleted file mode 100644
index ed7354094..000000000
--- a/package/alsa-lib/patches/patch-include_sound_asound_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- alsa-lib-1.0.27.2.orig/include/sound/asound.h	2013-07-08 14:31:36.000000000 +0200
-+++ alsa-lib-1.0.27.2/include/sound/asound.h	2013-09-17 09:40:33.000000000 +0200
-@@ -24,7 +24,7 @@
- #define _UAPI__SOUND_ASOUND_H
- 
- #include <linux/types.h>
--
-+#undef off_t
- 
- /*
-  *  protocol version
diff --git a/package/alsa-lib/patches/patch-src_pcm_pcm_direct_c b/package/alsa-lib/patches/patch-src_pcm_pcm_direct_c
deleted file mode 100644
index 0ca0e211f..000000000
--- a/package/alsa-lib/patches/patch-src_pcm_pcm_direct_c
+++ /dev/null
@@ -1,25 +0,0 @@
---- alsa-lib-1.0.29.orig/src/pcm/pcm_direct.c	2015-02-26 13:34:52.000000000 +0100
-+++ alsa-lib-1.0.29/src/pcm/pcm_direct.c	2016-11-20 18:20:58.456540169 +0100
-@@ -424,13 +424,21 @@ int snd_pcm_direct_server_create(snd_pcm
- 		close(dmix->server_fd);
- 		return ret;
- 	}
--	
-+
-+#ifdef HAVE_FORK
- 	ret = fork();
-+#else
-+	ret = vfork();
-+#endif
- 	if (ret < 0) {
- 		close(dmix->server_fd);
- 		return ret;
- 	} else if (ret == 0) {
-+#ifdef HAVE_FORK
- 		ret = fork();
-+#else
-+		ret = vfork();
-+#endif
- 		if (ret == 0)
- 			server_job(dmix);
- 		_exit(EXIT_SUCCESS);
diff --git a/package/alsa-lib/patches/patch-src_pcm_pcm_shm_c b/package/alsa-lib/patches/patch-src_pcm_pcm_shm_c
deleted file mode 100644
index decd44bc8..000000000
--- a/package/alsa-lib/patches/patch-src_pcm_pcm_shm_c
+++ /dev/null
@@ -1,23 +0,0 @@
---- alsa-lib-1.0.22.orig/src/pcm/pcm_shm.c	2009-12-16 16:18:51.000000000 +0100
-+++ alsa-lib-1.0.22/src/pcm/pcm_shm.c	2010-04-04 10:53:44.000000000 +0200
-@@ -482,15 +482,19 @@ static int snd_pcm_shm_drop(snd_pcm_t *p
- 
- static int snd_pcm_shm_drain(snd_pcm_t *pcm)
- {
-+	struct timespec ts;
- 	snd_pcm_shm_t *shm = pcm->private_data;
- 	volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl;
- 	int err;
-+	ts.tv_sec = 0;
-+	ts.tv_nsec = 10000000;
-+
- 	do {
- 		ctrl->cmd = SNDRV_PCM_IOCTL_DRAIN;
- 		err = snd_pcm_shm_action(pcm);
- 		if (err != -EAGAIN)
- 			break;
--		usleep(10000);
-+		nanosleep(&ts, NULL);
- 	} while (1);
- 	if (err < 0)
- 		return err;
diff --git a/package/alsa-lib/patches/patch-utils_alsa_pc_in b/package/alsa-lib/patches/patch-utils_alsa_pc_in
deleted file mode 100644
index 6ca74b395..000000000
--- a/package/alsa-lib/patches/patch-utils_alsa_pc_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- alsa-lib-1.0.28.orig/utils/alsa.pc.in	2014-06-17 14:34:19.000000000 +0200
-+++ alsa-lib-1.0.28/utils/alsa.pc.in	2014-06-29 09:21:14.651388400 +0200
-@@ -7,7 +7,7 @@ Name: alsa
- Description: Advanced Linux Sound Architecture (ALSA) - Library
- Version: @VERSION@
- Requires: 
--Libs: -L${libdir} -lasound
-+Libs: -lasound
- Libs.private: @ALSA_DEPLIBS@
- # -I${includedir}/alsa below is just for backward compatibility
- # (it was set so mistakely in the older version)