* [ptxdist] [PATCH] alsa-utils: version bump 1.1.1 -> 1.1.6
@ 2018-10-12 1:13 Ladislav Michl
2018-10-16 8:36 ` Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Ladislav Michl @ 2018-10-12 1:13 UTC (permalink / raw)
To: ptxdist
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [PATCH] alsa-utils: version bump 1.1.1 -> 1.1.6
2018-10-12 1:13 [ptxdist] [PATCH] alsa-utils: version bump 1.1.1 -> 1.1.6 Ladislav Michl
@ 2018-10-16 8:36 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2018-10-16 8:36 UTC (permalink / raw)
To: ptxdist
On Fri, Oct 12, 2018 at 03:13:02AM +0200, Ladislav Michl wrote:
> 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)) \
--without-... is the same as --with-...=no, so:
--with-curses=$(call ptx/ifdef,PTXCONF_ALSA_UTILS_ALSAMIXER,...,no)
> + --$(call ptx/wwo, PTXCONF_ALSA_UTILS_SYSTEMD_UNIT)-systemdsystemunitdir$(call ptx/ifdef,PTXCONF_ALSA_UTILS_SYSTEMD_UNIT,=/usr/lib/systemd/system) \
--with-systemdsystemunitdir=$(call ptx/ifdef,PTXCONF_ALSA_UTILS_SYSTEMD_UNIT,/usr/lib/systemd/system,no)
Michael
> --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
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-16 8:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-12 1:13 [ptxdist] [PATCH] alsa-utils: version bump 1.1.1 -> 1.1.6 Ladislav Michl
2018-10-16 8:36 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox