* [ptxdist] [PATCH] alsa-lib: version bump 1.1.4.1 -> 1.1.6
@ 2018-10-12 1:12 Ladislav Michl
2018-10-16 8:32 ` Michael Olbrich
0 siblings, 1 reply; 3+ messages in thread
From: Ladislav Michl @ 2018-10-12 1:12 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
.../0001-add-largefile-support.patch | 0
.../autogen.sh | 0
.../series | 0
rules/alsa-lib.make | 19 +++++++------------
4 files changed, 7 insertions(+), 12 deletions(-)
rename patches/{alsa-lib-1.1.4.1 => alsa-lib-1.1.6}/0001-add-largefile-support.patch (100%)
rename patches/{alsa-lib-1.1.4.1 => alsa-lib-1.1.6}/autogen.sh (100%)
rename patches/{alsa-lib-1.1.4.1 => alsa-lib-1.1.6}/series (100%)
diff --git a/patches/alsa-lib-1.1.4.1/0001-add-largefile-support.patch b/patches/alsa-lib-1.1.6/0001-add-largefile-support.patch
similarity index 100%
rename from patches/alsa-lib-1.1.4.1/0001-add-largefile-support.patch
rename to patches/alsa-lib-1.1.6/0001-add-largefile-support.patch
diff --git a/patches/alsa-lib-1.1.4.1/autogen.sh b/patches/alsa-lib-1.1.6/autogen.sh
similarity index 100%
rename from patches/alsa-lib-1.1.4.1/autogen.sh
rename to patches/alsa-lib-1.1.6/autogen.sh
diff --git a/patches/alsa-lib-1.1.4.1/series b/patches/alsa-lib-1.1.6/series
similarity index 100%
rename from patches/alsa-lib-1.1.4.1/series
rename to patches/alsa-lib-1.1.6/series
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 4e150d42a..1ed564d34 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -20,8 +20,8 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
ALSA_LIB_SUFFIX := tar.bz2
ifdef PTXCONF_ALSA_LIB_FULL
-ALSA_LIB_VERSION := 1.1.4.1
-ALSA_LIB_MD5 := 29fa3e69122d3cf3e8f0e01a0cb1d183
+ALSA_LIB_VERSION := 1.1.6
+ALSA_LIB_MD5 := 2f981a8f7897c59ec2ddc44916d33788
ALSA_LIB := alsa-lib-$(ALSA_LIB_VERSION)
ALSA_LIB_URL := \
http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) \
@@ -43,13 +43,11 @@ ALSA_LIB_LICENSE := LGPL-2.1-or-later
# Prepare
# ----------------------------------------------------------------------------
-ALSA_LIB_PATH := PATH=$(CROSS_PATH)
-ALSA_LIB_ENV := $(CROSS_ENV)
-
#
# autoconf
#
-ALSA_LIB_AUTOCONF := \
+ALSA_LIB_CONF_TOOL := autoconf
+ALSA_LIB_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
$(GLOBAL_LARGE_FILE_OPTION) \
--enable-shared \
@@ -77,14 +75,11 @@ ALSA_LIB_AUTOCONF := \
--with-pthread \
--with-librt \
--with-alsa-devdir=/dev/snd \
- --with-aload-devdir=/dev
-
-ifdef PTXCONF_ALSA_LIB_PCM
-ALSA_LIB_AUTOCONF += --with-pcm-plugins=all
-endif
+ --with-aload-devdir=/dev \
+ --$(call ptx/wwo, PTXCONF_ALSA_LIB_PCM)-pcm-plugins
ifdef PTXCONF_ALSA_LIB_LIGHT
-ALSA_LIB_AUTOCONF += \
+ALSA_LIB_CONF_OPT += \
--enable-everyhing \
--enable-tlv \
--enable-timer \
--
2.19.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] alsa-lib: version bump 1.1.4.1 -> 1.1.6
2018-10-12 1:12 [ptxdist] [PATCH] alsa-lib: version bump 1.1.4.1 -> 1.1.6 Ladislav Michl
@ 2018-10-16 8:32 ` Michael Olbrich
2018-10-16 8:53 ` Ladislav Michl
0 siblings, 1 reply; 3+ messages in thread
From: Michael Olbrich @ 2018-10-16 8:32 UTC (permalink / raw)
To: ptxdist
On Fri, Oct 12, 2018 at 03:12:15AM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> .../0001-add-largefile-support.patch | 0
> .../autogen.sh | 0
> .../series | 0
> rules/alsa-lib.make | 19 +++++++------------
> 4 files changed, 7 insertions(+), 12 deletions(-)
> rename patches/{alsa-lib-1.1.4.1 => alsa-lib-1.1.6}/0001-add-largefile-support.patch (100%)
> rename patches/{alsa-lib-1.1.4.1 => alsa-lib-1.1.6}/autogen.sh (100%)
> rename patches/{alsa-lib-1.1.4.1 => alsa-lib-1.1.6}/series (100%)
>
> diff --git a/patches/alsa-lib-1.1.4.1/0001-add-largefile-support.patch b/patches/alsa-lib-1.1.6/0001-add-largefile-support.patch
> similarity index 100%
> rename from patches/alsa-lib-1.1.4.1/0001-add-largefile-support.patch
> rename to patches/alsa-lib-1.1.6/0001-add-largefile-support.patch
> diff --git a/patches/alsa-lib-1.1.4.1/autogen.sh b/patches/alsa-lib-1.1.6/autogen.sh
> similarity index 100%
> rename from patches/alsa-lib-1.1.4.1/autogen.sh
> rename to patches/alsa-lib-1.1.6/autogen.sh
> diff --git a/patches/alsa-lib-1.1.4.1/series b/patches/alsa-lib-1.1.6/series
> similarity index 100%
> rename from patches/alsa-lib-1.1.4.1/series
> rename to patches/alsa-lib-1.1.6/series
> diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
> index 4e150d42a..1ed564d34 100644
> --- a/rules/alsa-lib.make
> +++ b/rules/alsa-lib.make
> @@ -20,8 +20,8 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
> ALSA_LIB_SUFFIX := tar.bz2
>
> ifdef PTXCONF_ALSA_LIB_FULL
> -ALSA_LIB_VERSION := 1.1.4.1
> -ALSA_LIB_MD5 := 29fa3e69122d3cf3e8f0e01a0cb1d183
> +ALSA_LIB_VERSION := 1.1.6
> +ALSA_LIB_MD5 := 2f981a8f7897c59ec2ddc44916d33788
> ALSA_LIB := alsa-lib-$(ALSA_LIB_VERSION)
> ALSA_LIB_URL := \
> http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) \
> @@ -43,13 +43,11 @@ ALSA_LIB_LICENSE := LGPL-2.1-or-later
> # Prepare
> # ----------------------------------------------------------------------------
>
> -ALSA_LIB_PATH := PATH=$(CROSS_PATH)
> -ALSA_LIB_ENV := $(CROSS_ENV)
> -
> #
> # autoconf
> #
> -ALSA_LIB_AUTOCONF := \
> +ALSA_LIB_CONF_TOOL := autoconf
> +ALSA_LIB_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> $(GLOBAL_LARGE_FILE_OPTION) \
> --enable-shared \
> @@ -77,14 +75,11 @@ ALSA_LIB_AUTOCONF := \
> --with-pthread \
> --with-librt \
> --with-alsa-devdir=/dev/snd \
> - --with-aload-devdir=/dev
> -
> -ifdef PTXCONF_ALSA_LIB_PCM
> -ALSA_LIB_AUTOCONF += --with-pcm-plugins=all
> -endif
> + --with-aload-devdir=/dev \
> + --$(call ptx/wwo, PTXCONF_ALSA_LIB_PCM)-pcm-plugins
Hmm, I didn't check the new version but with the old version this is
incorrect. The list would be "yes" and not match anything.
--with-pcm-plugins=$(call ptx/ifdef, PTXCONF_ALSA_LIB_PCM,all,no)
I think.
Michael
>
> ifdef PTXCONF_ALSA_LIB_LIGHT
> -ALSA_LIB_AUTOCONF += \
> +ALSA_LIB_CONF_OPT += \
> --enable-everyhing \
> --enable-tlv \
> --enable-timer \
> --
> 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] 3+ messages in thread
* Re: [ptxdist] [PATCH] alsa-lib: version bump 1.1.4.1 -> 1.1.6
2018-10-16 8:32 ` Michael Olbrich
@ 2018-10-16 8:53 ` Ladislav Michl
0 siblings, 0 replies; 3+ messages in thread
From: Ladislav Michl @ 2018-10-16 8:53 UTC (permalink / raw)
To: ptxdist
On Tue, Oct 16, 2018 at 10:32:00AM +0200, Michael Olbrich wrote:
> On Fri, Oct 12, 2018 at 03:12:15AM +0200, Ladislav Michl wrote:
> > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> > ---
> > .../0001-add-largefile-support.patch | 0
> > .../autogen.sh | 0
> > .../series | 0
> > rules/alsa-lib.make | 19 +++++++------------
> > 4 files changed, 7 insertions(+), 12 deletions(-)
> > rename patches/{alsa-lib-1.1.4.1 => alsa-lib-1.1.6}/0001-add-largefile-support.patch (100%)
> > rename patches/{alsa-lib-1.1.4.1 => alsa-lib-1.1.6}/autogen.sh (100%)
> > rename patches/{alsa-lib-1.1.4.1 => alsa-lib-1.1.6}/series (100%)
> >
> > diff --git a/patches/alsa-lib-1.1.4.1/0001-add-largefile-support.patch b/patches/alsa-lib-1.1.6/0001-add-largefile-support.patch
> > similarity index 100%
> > rename from patches/alsa-lib-1.1.4.1/0001-add-largefile-support.patch
> > rename to patches/alsa-lib-1.1.6/0001-add-largefile-support.patch
> > diff --git a/patches/alsa-lib-1.1.4.1/autogen.sh b/patches/alsa-lib-1.1.6/autogen.sh
> > similarity index 100%
> > rename from patches/alsa-lib-1.1.4.1/autogen.sh
> > rename to patches/alsa-lib-1.1.6/autogen.sh
> > diff --git a/patches/alsa-lib-1.1.4.1/series b/patches/alsa-lib-1.1.6/series
> > similarity index 100%
> > rename from patches/alsa-lib-1.1.4.1/series
> > rename to patches/alsa-lib-1.1.6/series
> > diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
> > index 4e150d42a..1ed564d34 100644
> > --- a/rules/alsa-lib.make
> > +++ b/rules/alsa-lib.make
> > @@ -20,8 +20,8 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
> > ALSA_LIB_SUFFIX := tar.bz2
> >
> > ifdef PTXCONF_ALSA_LIB_FULL
> > -ALSA_LIB_VERSION := 1.1.4.1
> > -ALSA_LIB_MD5 := 29fa3e69122d3cf3e8f0e01a0cb1d183
> > +ALSA_LIB_VERSION := 1.1.6
> > +ALSA_LIB_MD5 := 2f981a8f7897c59ec2ddc44916d33788
> > ALSA_LIB := alsa-lib-$(ALSA_LIB_VERSION)
> > ALSA_LIB_URL := \
> > http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) \
> > @@ -43,13 +43,11 @@ ALSA_LIB_LICENSE := LGPL-2.1-or-later
> > # Prepare
> > # ----------------------------------------------------------------------------
> >
> > -ALSA_LIB_PATH := PATH=$(CROSS_PATH)
> > -ALSA_LIB_ENV := $(CROSS_ENV)
> > -
> > #
> > # autoconf
> > #
> > -ALSA_LIB_AUTOCONF := \
> > +ALSA_LIB_CONF_TOOL := autoconf
> > +ALSA_LIB_CONF_OPT := \
> > $(CROSS_AUTOCONF_USR) \
> > $(GLOBAL_LARGE_FILE_OPTION) \
> > --enable-shared \
> > @@ -77,14 +75,11 @@ ALSA_LIB_AUTOCONF := \
> > --with-pthread \
> > --with-librt \
> > --with-alsa-devdir=/dev/snd \
> > - --with-aload-devdir=/dev
> > -
> > -ifdef PTXCONF_ALSA_LIB_PCM
> > -ALSA_LIB_AUTOCONF += --with-pcm-plugins=all
> > -endif
> > + --with-aload-devdir=/dev \
> > + --$(call ptx/wwo, PTXCONF_ALSA_LIB_PCM)-pcm-plugins
>
> Hmm, I didn't check the new version but with the old version this is
> incorrect. The list would be "yes" and not match anything.
>
> --with-pcm-plugins=$(call ptx/ifdef, PTXCONF_ALSA_LIB_PCM,all,no)
>
> I think.
Just checked configure.ac:
if test "$build_pcm" = "yes"; then
AC_ARG_WITH(pcm-plugins,
AS_HELP_STRING([--with-pcm-plugins=<list>],
[build PCM plugins (default = all)]),
[pcm_plugins="$withval"], [pcm_plugins="all"])
else
pcm_plugins=""
fi
So it is considered only if --enable-pcm is given and thus can be simplified
to: --with-pcm-plugins=all
> Michael
>
> >
> > ifdef PTXCONF_ALSA_LIB_LIGHT
> > -ALSA_LIB_AUTOCONF += \
> > +ALSA_LIB_CONF_OPT += \
> > --enable-everyhing \
> > --enable-tlv \
> > --enable-timer \
> > --
> > 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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-16 8:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-12 1:12 [ptxdist] [PATCH] alsa-lib: version bump 1.1.4.1 -> 1.1.6 Ladislav Michl
2018-10-16 8:32 ` Michael Olbrich
2018-10-16 8:53 ` Ladislav Michl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox