user/alsa-lib: pull in, bump, take, fix

3 files changed, 142 insertions, 0 deletions

diff --git a/user/alsa-lib/APKBUILD b/user/alsa-lib/APKBUILD
new file mode 100644
index 000000000..a6cc3701e
--- /dev/null
+++ b/user/alsa-lib/APKBUILD
@@ -0,0 +1,52 @@
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=alsa-lib
+pkgver=1.1.6
+pkgrel=0
+pkgdesc="Linux sound support system"
+url="http://www.alsa-project.org"
+arch="all"
+license="LGPL-2.0+"
+subpackages="$pkgname-dev $pkgname-dbg"
+makedepends="linux-headers"
+source="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2
+	ucm_add_limits_h.patch
+	remove-test.patch
+	"
+
+prepare() {
+	cd "$builddir"
+	update_config_sub
+	rm src/compat/hsearch_r.c && touch src/compat/hsearch_r.c
+	default_prepare
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-python \
+		--disable-static \
+		--disable-resmgr \
+		--enable-rawmidi \
+		--enable-seq \
+		--enable-aload \
+		--disable-dependency-tracking \
+		--without-versioned
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make -j1 DESTDIR="$pkgdir" install
+}
+
+sha512sums="00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0  alsa-lib-1.1.6.tar.bz2
+3b37652d50809443b5f8e80f8d447108195b0cd66fd917805bb393fc091584b6f3dad4414f568742b61745617e7a695862058a0a0f93dcc31e4c97177a520352  ucm_add_limits_h.patch
+8ef518517647b702da7f3573f4f3f10be8bbac3f092834b38c59521f7236acae258a9afe65eebfa415828135ac8a1836e3dce83ee3f0eaf4403158a48802144d  remove-test.patch"
diff --git a/user/alsa-lib/remove-test.patch b/user/alsa-lib/remove-test.patch
new file mode 100644
index 000000000..e52cad42a
--- /dev/null
+++ b/user/alsa-lib/remove-test.patch
@@ -0,0 +1,80 @@
+--- alsa-lib-1.1.4.1/test/Makefile.am.old	2017-06-01 01:27:36.000000000 -0500
++++ alsa-lib-1.1.4.1/test/Makefile.am	2017-09-27 00:55:12.925058726 -0500
+@@ -2,7 +2,7 @@
+ 
+ check_PROGRAMS=control pcm pcm_min latency seq \
+ 	       playmidi1 timer rawmidi midiloop \
+-	       oldapi queue_timer namehint client_event_filter \
++	       queue_timer namehint client_event_filter \
+ 	       chmap audio_time user-ctl-element-set pcm-multi-thread
+ 
+ control_LDADD=../src/libasound.la
+@@ -16,7 +16,6 @@
+ timer_LDADD=../src/libasound.la
+ rawmidi_LDADD=../src/libasound.la
+ midiloop_LDADD=../src/libasound.la
+-oldapi_LDADD=../src/libasound.la
+ queue_timer_LDADD=../src/libasound.la
+ namehint_LDADD=../src/libasound.la
+ client_event_filter_LDADD=../src/libasound.la
+--- alsa-lib-1.1.4.1/test/Makefile.in.old	2017-06-01 01:28:25.000000000 -0500
++++ alsa-lib-1.1.4.1/test/Makefile.in	2017-09-27 00:58:29.668332253 -0500
+@@ -52,7 +52,7 @@
+ check_PROGRAMS = control$(EXEEXT) pcm$(EXEEXT) pcm_min$(EXEEXT) \
+ 	latency$(EXEEXT) seq$(EXEEXT) playmidi1$(EXEEXT) \
+ 	timer$(EXEEXT) rawmidi$(EXEEXT) midiloop$(EXEEXT) \
+-	oldapi$(EXEEXT) queue_timer$(EXEEXT) namehint$(EXEEXT) \
++	queue_timer$(EXEEXT) namehint$(EXEEXT) \
+ 	client_event_filter$(EXEEXT) chmap$(EXEEXT) \
+ 	audio_time$(EXEEXT) user-ctl-element-set$(EXEEXT) \
+ 	pcm-multi-thread$(EXEEXT)
+@@ -96,9 +96,6 @@
+ namehint_SOURCES = namehint.c
+ namehint_OBJECTS = namehint.$(OBJEXT)
+ namehint_DEPENDENCIES = ../src/libasound.la
+-oldapi_SOURCES = oldapi.c
+-oldapi_OBJECTS = oldapi.$(OBJEXT)
+-oldapi_DEPENDENCIES = ../src/libasound.la
+ pcm_SOURCES = pcm.c
+ pcm_OBJECTS = pcm.$(OBJEXT)
+ pcm_DEPENDENCIES = ../src/libasound.la
+@@ -173,11 +170,11 @@
+ am__v_CCLD_0 = @echo "  CCLD    " $@;
+ am__v_CCLD_1 = 
+ SOURCES = audio_time.c chmap.c client_event_filter.c control.c \
+-	latency.c midiloop.c namehint.c oldapi.c pcm.c \
++	latency.c midiloop.c namehint.c pcm.c \
+ 	pcm-multi-thread.c pcm_min.c playmidi1.c queue_timer.c \
+ 	rawmidi.c seq.c timer.c user-ctl-element-set.c
+ DIST_SOURCES = audio_time.c chmap.c client_event_filter.c control.c \
+-	latency.c midiloop.c namehint.c oldapi.c pcm.c \
++	latency.c midiloop.c namehint.c pcm.c \
+ 	pcm-multi-thread.c pcm_min.c playmidi1.c queue_timer.c \
+ 	rawmidi.c seq.c timer.c user-ctl-element-set.c
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -366,7 +363,6 @@
+ timer_LDADD = ../src/libasound.la
+ rawmidi_LDADD = ../src/libasound.la
+ midiloop_LDADD = ../src/libasound.la
+-oldapi_LDADD = ../src/libasound.la
+ queue_timer_LDADD = ../src/libasound.la
+ namehint_LDADD = ../src/libasound.la
+ client_event_filter_LDADD = ../src/libasound.la
+@@ -444,9 +440,6 @@
+ namehint$(EXEEXT): $(namehint_OBJECTS) $(namehint_DEPENDENCIES) $(EXTRA_namehint_DEPENDENCIES) 
+ 	@rm -f namehint$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(namehint_OBJECTS) $(namehint_LDADD) $(LIBS)
+-oldapi$(EXEEXT): $(oldapi_OBJECTS) $(oldapi_DEPENDENCIES) $(EXTRA_oldapi_DEPENDENCIES) 
+-	@rm -f oldapi$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(oldapi_OBJECTS) $(oldapi_LDADD) $(LIBS)
+ pcm$(EXEEXT): $(pcm_OBJECTS) $(pcm_DEPENDENCIES) $(EXTRA_pcm_DEPENDENCIES) 
+ 	@rm -f pcm$(EXEEXT)
+ 	$(AM_V_CCLD)$(pcm_LINK) $(pcm_OBJECTS) $(pcm_LDADD) $(LIBS)
+@@ -488,7 +481,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/latency.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midiloop.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/namehint.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldapi.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm-multi-thread.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm_min.Po@am__quote@
diff --git a/user/alsa-lib/ucm_add_limits_h.patch b/user/alsa-lib/ucm_add_limits_h.patch
new file mode 100644
index 000000000..2686dddd1
--- /dev/null
+++ b/user/alsa-lib/ucm_add_limits_h.patch
@@ -0,0 +1,10 @@
+--- a/src/ucm/parser.c
++++ b/src/ucm/parser.c
+@@ -31,6 +31,7 @@
+  */
+ 
+ #include "ucm_local.h"
++#include <limits.h>
+ #include <dirent.h>
+ 
+ /** The name of the environment variable containing the UCM directory */