diff options
| author | William Wagner <will_wagner@carallon.com> | 2010-01-28 18:07:27 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-01-28 23:13:05 +0100 |
| commit | aea2ef9b9e639f75e6fd8b574f40e60221fa03a2 (patch) | |
| tree | 6ec7357e89786f1beb3367b9c500446e5416d654 /package/multimedia/alsa-utils | |
| parent | 96879ab1def240c7d3868690047c37915cc26679 (diff) | |
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>
Diffstat (limited to 'package/multimedia/alsa-utils')
| -rw-r--r-- | package/multimedia/alsa-utils/Config.in | 2 | ||||
| -rw-r--r-- | package/multimedia/alsa-utils/alsa-utils.mk | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/package/multimedia/alsa-utils/Config.in b/package/multimedia/alsa-utils/Config.in index f2fc3c1ba..54ab3f9cb 100644 --- a/package/multimedia/alsa-utils/Config.in +++ b/package/multimedia/alsa-utils/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_ALSA_UTILS bool "alsa-utils" depends on BR2_LARGEFILE depends on BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_NCURSES help This package contains the command line utilities for the ALSA project. @@ -24,6 +23,7 @@ config BR2_PACKAGE_ALSA_UTILS_ALSACTL config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER bool "alsamixer" + select BR2_PACKAGE_NCURSES default y config BR2_PACKAGE_ALSA_UTILS_AMIDI diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk index 2aa038ab2..f98b9cd02 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.18 +ALSA_UTILS_VERSION:=1.0.22 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) @@ -11,6 +11,11 @@ ALSA_UTILS_CAT:=$(BZCAT) ALSA_UTILS_BINARY:=alsactl/alsactl ALSA_UTILS_TARGET_BINARY:=usr/sbin/alsactl +ALSA_UTILS_CONFIGURE_OPTS = +ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y) +ALSA_UTILS_CONFIGURE_OPTS += --disable-alsamixer --disable-alsatest +endif + $(DL_DIR)/$(ALSA_UTILS_SOURCE): $(call DOWNLOAD,$(ALSA_UTILS_SITE),$(ALSA_UTILS_SOURCE)) @@ -32,6 +37,8 @@ $(ALSA_UTILS_DIR)/.configured: $(ALSA_UTILS_DIR)/.unpacked --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=/usr \ + $(ALSA_UTILS_CONFIGURE_OPTS) \ + --disable-xmlto \ ) touch $@ @@ -72,7 +79,7 @@ $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY fi touch -c $@ -alsa-utils: alsa-lib ncurses $(if $(BR2_PACKAGE_LIBINTL),libintl) $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY) +alsa-utils: alsa-lib $(if $(BR2_PACKAGE_NCURSES),ncurses) $(if $(BR2_PACKAGE_LIBINTL),libintl) $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY) alsa-utils-unpacked: $(ALSA_UTILS_DIR)/.unpacked |