mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Ladislav Michl <ladis@linux-mips.org>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] alsa-utils: version bump 1.1.1 -> 1.1.6
Date: Fri, 12 Oct 2018 03:13:02 +0200	[thread overview]
Message-ID: <20181012011302.GB11308@lenoch> (raw)

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/alsa-utils.in   |  5 +++--
 rules/alsa-utils.make | 32 +++++++++++---------------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in
index c24bbf65e..e78a51cbf 100644
--- a/rules/alsa-utils.in
+++ b/rules/alsa-utils.in
@@ -3,7 +3,6 @@
 menuconfig ALSA_UTILS
 	tristate
 	prompt "alsa utils                    "
-	select NCURSES if ALSA_UTILS_ALSAMIXER
 	select ALSA_LIB
 # alsa-utils fails with the salsa-lib
 	select ALSA_LIB_FULL
@@ -14,6 +13,8 @@ menuconfig ALSA_UTILS
 	select ALSA_LIB_SEQ
 	select ALSA_LIB_UCM
 	select LIBC_PTHREAD
+	select NCURSES		if ALSA_UTILS_ALSAMIXER
+	select SYSTEMD		if ALSA_UTILS_SYSTEMD_UNIT
 	help
 	  Some utils to handle the Advanced Linux Sound Architecture.
 	  With these utils you can control your sound device, for
@@ -29,7 +30,7 @@ config ALSA_UTILS_STARTSCRIPT
 config ALSA_UTILS_SYSTEMD_UNIT
 	bool
 	default y
-	depends on SYSTEMD
+	depends on INITMETHOD_SYSTEMD
 	prompt "install systemd unit files"
 
 config ALSA_UTILS_ASOUND_STATE
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index 60e417db8..6fc91c270 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.1.1
-ALSA_UTILS_MD5		:= f8d00ad5fba757b4c3735d066cc288e2
+ALSA_UTILS_VERSION	:= 1.1.6
+ALSA_UTILS_MD5		:= 50ae75567459646b843bed78d916b002
 ALSA_UTILS		:= alsa-utils-$(ALSA_UTILS_VERSION)
 ALSA_UTILS_SUFFIX	:= tar.bz2
 ALSA_UTILS_URL		:= \
@@ -35,32 +35,22 @@ ALSA_UTILS_LICENSE	:= GPL-2.0-or-later
 #
 # autoconf
 #
-ALSA_UTILS_AUTOCONF := \
+ALSA_UTILS_CONF_TOOL	:= autoconf
+ALSA_UTILS_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-nls \
 	--disable-rpath \
 	--disable-alsatest \
-	--disable-xmlto \
+	--disable-bat \
+	--$(call ptx/endis, PTXCONF_ALSA_UTILS_ALSAMIXER)-alsamixer \
 	--$(call ptx/endis, PTXCONF_ALSA_UTILS_ALSALOOP)-alsaloop \
+	--disable-xmlto \
+	--disable-rst2man \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--$(call ptx/wwo, PTXCONF_ALSA_UTILS_ALSAMIXER)-curses$(call ptx/ifdef,PTXCONF_ALSA_UTILS_ALSAMIXER,=$(call ptx/ifdef,PTXCONF_NCURSES_WIDE_CHAR,ncursesw,ncurses)) \
+	--$(call ptx/wwo, PTXCONF_ALSA_UTILS_SYSTEMD_UNIT)-systemdsystemunitdir$(call ptx/ifdef,PTXCONF_ALSA_UTILS_SYSTEMD_UNIT,=/usr/lib/systemd/system) \
 	--with-asound-state-dir=/etc
 
-ifdef PTXCONF_ALSA_UTILS_SYSTEMD_UNIT
-ALSA_UTILS_AUTOCONF += --with-systemdsystemunitdir=/usr/lib/systemd/system
-else
-ALSA_UTILS_AUTOCONF += --without-systemdsystemunitdir
-endif
-
-ifdef PTXCONF_ALSA_UTILS_ALSAMIXER
-ALSA_UTILS_AUTOCONF += \
-	--enable-alsamixer \
-	--with-curses=$(call ptx/ifdef,PTXCONF_NCURSES_WIDE_CHAR,ncursesw,ncurses)
-else
-ALSA_UTILS_AUTOCONF += \
-	--disable-alsamixer \
-	--without-curses
-endif
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
-- 
2.19.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

             reply	other threads:[~2018-10-12  1:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-12  1:13 Ladislav Michl [this message]
2018-10-16  8:36 ` Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181012011302.GB11308@lenoch \
    --to=ladis@linux-mips.org \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox