diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-10-13 11:43:35 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-10-13 11:44:17 +0200 |
| commit | a7ab7e34c3232a504a52a5562141ffe3b0c724d3 (patch) | |
| tree | f25165ffa4168f76dfbeccfbdb9ca22348dbd835 /rules/alsa-utils.make | |
| parent | 73c957f1c7772005ac71552f9e9c017305b6c437 (diff) | |
| download | ptxdist-a7ab7e34c3232a504a52a5562141ffe3b0c724d3.tar.gz ptxdist-a7ab7e34c3232a504a52a5562141ffe3b0c724d3.tar.xz | |
alsa-utils: version bump 1.0.22 -> 1.0.24.2
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/alsa-utils.make')
| -rw-r--r-- | rules/alsa-utils.make | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make index 19c2061db..b666a8d78 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.22 -ALSA_UTILS_MD5 := f7180316188552ee1e6759a03f1fe98d +ALSA_UTILS_VERSION := 1.0.24.2 +ALSA_UTILS_MD5 := 8238cd57cb301d1c36bcf0ecb59ce6b2 ALSA_UTILS := alsa-utils-$(ALSA_UTILS_VERSION) ALSA_UTILS_SUFFIX := tar.bz2 ALSA_UTILS_URL := \ @@ -53,7 +53,14 @@ ALSA_UTILS_AUTOCONF := \ --disable-nls \ --disable-rpath \ --disable-alsatest \ - --disable-xmlto + --disable-xmlto \ + --with-asound-state-dir=/etc + +ifdef PTXCONF_ALSA_UTILS_SYSTEMD_UNIT +ALSA_UTILS_AUTOCONF += --with-systemdsystemunitdir=/lib/systemd/system +else +ALSA_UTILS_AUTOCONF += --without-systemdsystemunitdir +endif ifdef PTXCONF_ALSA_UTILS_ALSAMIXER ALSA_UTILS_AUTOCONF += \ @@ -65,6 +72,12 @@ 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 # ---------------------------------------------------------------------------- @@ -95,6 +108,9 @@ $(STATEDIR)/alsa-utils.targetinstall: ifdef PTXCONF_ALSA_UTILS_ALSAMIXER @$(call install_copy, alsa-utils, 0, 0, 0755, -, /usr/bin/alsamixer) endif +ifdef PTXCONF_ALSA_UTILS_ALSALOOP + @$(call install_copy, alsa-utils, 0, 0, 0755, -, /usr/bin/alsaloop) +endif ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_ALSA_UTILS_STARTSCRIPT @@ -106,6 +122,16 @@ ifneq ($(call remove_quotes,$(PTXCONF_ALSA_UTILS_BBINIT_LINK)),) endif endif endif +ifdef PTXCONF_ALSA_UTILS_SYSTEMD_UNIT + @$(call install_copy, 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 @$(call install_alternative, alsa-utils, 0, 0, 0644, \ |