summaryrefslogtreecommitdiffstats
path: root/rules/alsa-utils.make
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2016-04-18 16:07:26 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2016-04-18 16:07:55 +0200
commit7068ade1d4285246886b1fd07a6c8aadcc735ebb (patch)
tree8b1c8662d3e6352db81a5c921aba4eafd9d363f7 /rules/alsa-utils.make
parent113e894225b1b2238d25a6367b8adaa2b019c9b5 (diff)
downloadptxdist-7068ade1d4285246886b1fd07a6c8aadcc735ebb.tar.gz
ptxdist-7068ade1d4285246886b1fd07a6c8aadcc735ebb.tar.xz
alsa-utils: version bump to 1.1.1
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'rules/alsa-utils.make')
-rw-r--r--rules/alsa-utils.make20
1 files changed, 4 insertions, 16 deletions
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index 7062d66ae..b86ecf241 100644
--- a/rules/alsa-utils.make
+++ b/rules/alsa-utils.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_ALSA_UTILS) += alsa-utils
#
# Paths and names
#
-ALSA_UTILS_VERSION := 1.0.29
-ALSA_UTILS_MD5 := 6b289bf874c4c9a63f4b3973093dd404
+ALSA_UTILS_VERSION := 1.1.1
+ALSA_UTILS_MD5 := f8d00ad5fba757b4c3735d066cc288e2
ALSA_UTILS := alsa-utils-$(ALSA_UTILS_VERSION)
ALSA_UTILS_SUFFIX := tar.bz2
ALSA_UTILS_URL := \
@@ -32,9 +32,6 @@ ALSA_UTILS_LICENSE := GPL-2.0+
# Prepare
# ----------------------------------------------------------------------------
-ALSA_UTILS_PATH := PATH=$(CROSS_PATH)
-ALSA_UTILS_ENV := $(CROSS_ENV)
-
#
# autoconf
#
@@ -46,6 +43,7 @@ ALSA_UTILS_AUTOCONF := \
--disable-rpath \
--disable-alsatest \
--disable-xmlto \
+ --$(call ptx/endis, PTXCONF_ALSA_UTILS_ALSALOOP)-alsaloop \
--with-asound-state-dir=/etc
ifdef PTXCONF_ALSA_UTILS_SYSTEMD_UNIT
@@ -64,12 +62,6 @@ ALSA_UTILS_AUTOCONF += \
--without-curses
endif
-ifdef PTXCONF_ALSA_UTILS_ALSALOOP
-ALSA_UTILS_AUTOCONF += --enable-alsaloop
-else
-ALSA_UTILS_AUTOCONF += --disable-alsaloop
-endif
-
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -115,14 +107,10 @@ endif
endif
endif
ifdef PTXCONF_ALSA_UTILS_SYSTEMD_UNIT
- @$(call install_copy, alsa-utils, 0, 0, 0644, -, \
+ @$(call install_alternative, alsa-utils, 0, 0, 0644, \
/lib/systemd/system/alsa-restore.service)
@$(call install_link, alsa-utils, ../alsa-restore.service, \
/lib/systemd/system/basic.target.wants/alsa-restore.service)
- @$(call install_copy, alsa-utils, 0, 0, 0644, -, \
- /lib/systemd/system/alsa-store.service)
- @$(call install_link, alsa-utils, ../alsa-store.service, \
- /lib/systemd/system/shutdown.target.wants/alsa-store.service)
endif
ifdef PTXCONF_ALSA_UTILS_ASOUND_STATE