From 4752566509da367229f8f62fb55d1793ddb69110 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 18 Jan 2016 22:13:59 +0100 Subject: [PATCH] package/alsa-utils: Add option for alsaloop util Add libsamplerate as optional dependency, see alsa-utils-1.1.0/alsaloop/Makefile.am [Peter: move libsamplerate dependency outside alsaloop conditional] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/alsa-utils/Config.in | 3 +++ package/alsa-utils/alsa-utils.mk | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in index 82f3ad68d7..9b8e8c0eaf 100644 --- a/package/alsa-utils/Config.in +++ b/package/alsa-utils/Config.in @@ -29,6 +29,9 @@ config BR2_PACKAGE_ALSA_UTILS_ALSACTL bool "alsactl" default y +config BR2_PACKAGE_ALSA_UTILS_ALSALOOP + bool "alsaloop" + config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER bool "alsamixer" select BR2_PACKAGE_NCURSES diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 32822bbff0..b5dc698e6b 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -11,7 +11,8 @@ ALSA_UTILS_LICENSE = GPLv2 ALSA_UTILS_LICENSE_FILES = COPYING ALSA_UTILS_INSTALL_STAGING = YES ALSA_UTILS_DEPENDENCIES = host-gettext host-pkgconf alsa-lib \ - $(if $(BR2_PACKAGE_NCURSES),ncurses) + $(if $(BR2_PACKAGE_NCURSES),ncurses) \ + $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) # Regenerate aclocal.m4 to pick the patched # version of alsa.m4 from alsa-lib ALSA_UTILS_AUTORECONF = YES @@ -29,6 +30,12 @@ ALSA_UTILS_DEPENDENCIES += gettext ALSA_UTILS_CONF_ENV += LIBS=-lintl endif +ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSALOOP),y) +ALSA_UTILS_CONF_OPTS += --enable-alsaloop +else +ALSA_UTILS_CONF_OPTS += --disable-alsaloop +endif + ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y) ALSA_UTILS_CONF_OPTS += --disable-alsamixer --disable-alsatest endif @@ -42,6 +49,7 @@ endif ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACONF) += usr/sbin/alsaconf ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACTL) += usr/sbin/alsactl +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSALOOP) += usr/bin/alsaloop ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER) += usr/bin/alsamixer ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSATPLG) += usr/bin/alsatplg ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIDI) += usr/bin/amidi -- 2.30.2