From aea2ef9b9e639f75e6fd8b574f40e60221fa03a2 Mon Sep 17 00:00:00 2001
From: William Wagner <will_wagner@carallon.com>
Date: Thu, 28 Jan 2010 18:07:27 +0000
Subject: PATCH: Add more config options to alsa, bump version

Signed-off-by: William Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/alsa-lib/alsa-lib.mk | 40 ++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

(limited to 'package/multimedia/alsa-lib/alsa-lib.mk')

diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index 517021d1b..1f120c6f7 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -3,7 +3,7 @@
 # alsa-lib
 #
 #############################################################
-ALSA_LIB_VERSION = 1.0.18
+ALSA_LIB_VERSION = 1.0.22
 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
 ALSA_LIB_INSTALL_STAGING = YES
@@ -13,8 +13,36 @@ ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
 
 ALSA_LIB_CONF_OPT = --enable-shared \
 		    --enable-static \
+		    --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
+		    --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \
+		    --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \
 		    --without-versioned
 
+ifneq ($(BR2_PACKAGE_ALSA_LIB_ALOAD),y)
+ALSA_LIB_CONF_OPT += --disable-aload
+endif
+ifneq ($(BR2_PACKAGE_ALSA_LIB_MIXER),y)
+ALSA_LIB_CONF_OPT += --disable-mixer
+endif
+ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM),y)
+ALSA_LIB_CONF_OPT += --disable-pcm
+endif
+ifneq ($(BR2_PACKAGE_ALSA_LIB_RAWMIDI),y)
+ALSA_LIB_CONF_OPT += --disable-rawmidi
+endif
+ifneq ($(BR2_PACKAGE_ALSA_LIB_HWDEP),y)
+ALSA_LIB_CONF_OPT += --disable-hwdep
+endif
+ifneq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y)
+ALSA_LIB_CONF_OPT += --disable-seq
+endif
+ifneq ($(BR2_PACKAGE_ALSA_LIB_ALISP),y)
+ALSA_LIB_CONF_OPT += --disable-alisp
+endif
+ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y)
+ALSA_LIB_CONF_OPT += --disable-old-symbols
+endif
+
 ifeq ($(BR2_ENABLE_DEBUG),y)
 # install-exec doesn't install the config files
 ALSA_LIB_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
@@ -44,3 +72,13 @@ ALSA_LIB_USE_CONFIG_CACHE = NO
 
 $(eval $(call AUTOTARGETS,package/multimedia,alsa-lib))
 
+$(ALSA_LIB_TARGET_UNINSTALL):
+	-rm -f $(TARGET_DIR)/usr/lib/libasound.so*
+	-rm -rf $(TARGET_DIR)/usr/lib/alsa-lib
+	-rm -rf $(TARGET_DIR)/usr/share/alsa
+
+$(ALSA_LIB_TARGET_CLEAN):
+	-rm -f $(STAGING_DIR)/usr/lib/libasound.*
+	-rm -rf $(STAGING_DIR)/usr/lib/alsa-lib
+	-rm -rf $(STAGING_DIR)/usr/share/alsa
+
-- 
cgit v1.2.3