summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>2008-12-04 16:10:44 +0000
committerHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>2008-12-04 16:10:44 +0000
commitf974e39491273737c0599a9d98442885ffa13b5b (patch)
tree2ebb15a08140e7c85069c337ff6ea358d26e73ee
parentf241ba6f81c851de7112a50fd9d9e4461f320e09 (diff)
alsa-util: bump version to 1.0.18 and add patches for this version
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
-rw-r--r--package/multimedia/alsa-utils/alsa-utils-1.0.18-check-if-__use_bsd-is-defined.patch13
-rw-r--r--package/multimedia/alsa-utils/alsa-utils-1.0.18-fix-intl-support.patch11
-rw-r--r--package/multimedia/alsa-utils/alsa-utils.mk2
3 files changed, 25 insertions, 1 deletions
diff --git a/package/multimedia/alsa-utils/alsa-utils-1.0.18-check-if-__use_bsd-is-defined.patch b/package/multimedia/alsa-utils/alsa-utils-1.0.18-check-if-__use_bsd-is-defined.patch
new file mode 100644
index 000000000..f0d320938
--- /dev/null
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.18-check-if-__use_bsd-is-defined.patch
@@ -0,0 +1,13 @@
+Index: alsa-utils-1.0.18/alsactl/init_sysdeps.c
+===================================================================
+--- alsa-utils-1.0.18.orig/alsactl/init_sysdeps.c 2008-12-01 08:27:16.000000000 +0100
++++ alsa-utils-1.0.18/alsactl/init_sysdeps.c 2008-12-01 08:27:22.000000000 +0100
+@@ -17,7 +17,7 @@
+ *
+ */
+
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__USE_BSD)
+ static size_t strlcpy(char *dst, const char *src, size_t size)
+ {
+ size_t bytes = 0;
diff --git a/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix-intl-support.patch b/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix-intl-support.patch
new file mode 100644
index 000000000..317c4729e
--- /dev/null
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix-intl-support.patch
@@ -0,0 +1,11 @@
+--- a/seq/aseqnet/Makefile.in
++++ b/seq/aseqnet/Makefile.in
+@@ -252,7 +252,7 @@ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ aseqnet$(EXEEXT): $(aseqnet_OBJECTS) $(aseqnet_DEPENDENCIES)
+ @rm -f aseqnet$(EXEEXT)
+- $(LINK) $(aseqnet_LDFLAGS) $(aseqnet_OBJECTS) $(aseqnet_LDADD) $(LIBS)
++ $(LINK) $(aseqnet_LDFLAGS) $(aseqnet_OBJECTS) $(aseqnet_LDADD) $(LIBS) $(INTLLIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index b8249ef62..336118a30 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -3,7 +3,7 @@
# alsa-utils
#
#############################################################
-ALSA_UTILS_VERSION:=1.0.14
+ALSA_UTILS_VERSION:=1.0.18
ALSA_UTILS_SOURCE:=alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
ALSA_UTILS_SITE:=ftp://ftp.alsa-project.org/pub/utils
ALSA_UTILS_DIR:=$(BUILD_DIR)/alsa-utils-$(ALSA_UTILS_VERSION)