* [Buildroot] [PATCH v2 2/4] package/alsa-plugins: bump version to 1.2.7.1
2022-10-30 19:33 [Buildroot] [PATCH v2 1/4] package/alsa-lib: topology modules need dynamic library support Bernd Kuhls
@ 2022-10-30 19:33 ` Bernd Kuhls
2022-10-30 19:33 ` [Buildroot] [PATCH v2 3/4] package/alsa-lib: bump version to 1.2.8 Bernd Kuhls
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Bernd Kuhls @ 2022-10-30 19:33 UTC (permalink / raw)
To: buildroot; +Cc: Charles Hardin
Changelog:
https://www.alsa-project.org/wiki/Changes_v1.2.7_v1.2.7.1#alsa-plugins
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: no changes
package/alsa-plugins/alsa-plugins.hash | 2 +-
package/alsa-plugins/alsa-plugins.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/alsa-plugins/alsa-plugins.hash b/package/alsa-plugins/alsa-plugins.hash
index 2582a0d639..5d190e4d7b 100644
--- a/package/alsa-plugins/alsa-plugins.hash
+++ b/package/alsa-plugins/alsa-plugins.hash
@@ -1,4 +1,4 @@
# Locally calculated
-sha256 068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0 alsa-plugins-1.2.6.tar.bz2
+sha256 8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511 alsa-plugins-1.2.7.1.tar.bz2
sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPL
diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk
index b8819151ef..5728ebfe37 100644
--- a/package/alsa-plugins/alsa-plugins.mk
+++ b/package/alsa-plugins/alsa-plugins.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ALSA_PLUGINS_VERSION = 1.2.6
+ALSA_PLUGINS_VERSION = 1.2.7.1
ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2
ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins
ALSA_PLUGINS_LICENSE = LGPL-2.1+
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v2 3/4] package/alsa-lib: bump version to 1.2.8
2022-10-30 19:33 [Buildroot] [PATCH v2 1/4] package/alsa-lib: topology modules need dynamic library support Bernd Kuhls
2022-10-30 19:33 ` [Buildroot] [PATCH v2 2/4] package/alsa-plugins: bump version to 1.2.7.1 Bernd Kuhls
@ 2022-10-30 19:33 ` Bernd Kuhls
2022-10-30 19:33 ` [Buildroot] [PATCH v2 4/4] package/alsa-utils: " Bernd Kuhls
2022-10-30 19:43 ` [Buildroot] [PATCH v2 1/4] package/alsa-lib: topology modules need dynamic library support Yann E. MORIN
3 siblings, 0 replies; 5+ messages in thread
From: Bernd Kuhls @ 2022-10-30 19:33 UTC (permalink / raw)
To: buildroot; +Cc: Charles Hardin
Changelog:
https://www.alsa-project.org/wiki/Changes_v1.2.7.2_v1.2.8#alsa-lib
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: no changes
package/alsa-lib/alsa-lib.hash | 2 +-
package/alsa-lib/alsa-lib.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash
index 651591a5ee..898cbcd60d 100644
--- a/package/alsa-lib/alsa-lib.hash
+++ b/package/alsa-lib/alsa-lib.hash
@@ -1,4 +1,4 @@
# Locally calculated
-sha256 8a35b7218e50f2a2c79342d0de98ded81439ce19e12809385ec9be9596de7c2f alsa-lib-1.2.7.2.tar.bz2
+sha256 1ab01b74e33425ca99c2e36c0844fd6888273193bd898240fe8f93accbcbf347 alsa-lib-1.2.8.tar.bz2
sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING
sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 659ec26ba3..a0a9617514 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ALSA_LIB_VERSION = 1.2.7.2
+ALSA_LIB_VERSION = 1.2.8
ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib
ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver)
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 4/4] package/alsa-utils: bump version to 1.2.8
2022-10-30 19:33 [Buildroot] [PATCH v2 1/4] package/alsa-lib: topology modules need dynamic library support Bernd Kuhls
2022-10-30 19:33 ` [Buildroot] [PATCH v2 2/4] package/alsa-plugins: bump version to 1.2.7.1 Bernd Kuhls
2022-10-30 19:33 ` [Buildroot] [PATCH v2 3/4] package/alsa-lib: bump version to 1.2.8 Bernd Kuhls
@ 2022-10-30 19:33 ` Bernd Kuhls
2022-10-30 19:43 ` [Buildroot] [PATCH v2 1/4] package/alsa-lib: topology modules need dynamic library support Yann E. MORIN
3 siblings, 0 replies; 5+ messages in thread
From: Bernd Kuhls @ 2022-10-30 19:33 UTC (permalink / raw)
To: buildroot; +Cc: Charles Hardin
Changelog:
https://www.alsa-project.org/wiki/Changes_v1.2.7.2_v1.2.8#alsa-utils
Removed patch 0002 due to upstream removal of UCM code:
https://github.com/alsa-project/alsa-utils/commit/62cd05a929283d919144e092892c74ac85b00a7d
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: no changes
...ay-aplay.c-make-UCM-support-optional.patch | 89 -------------------
package/alsa-utils/alsa-utils.hash | 2 +-
package/alsa-utils/alsa-utils.mk | 2 +-
3 files changed, 2 insertions(+), 91 deletions(-)
delete mode 100644 package/alsa-utils/0002-aplay-aplay.c-make-UCM-support-optional.patch
diff --git a/package/alsa-utils/0002-aplay-aplay.c-make-UCM-support-optional.patch b/package/alsa-utils/0002-aplay-aplay.c-make-UCM-support-optional.patch
deleted file mode 100644
index 0d58ae81a4..0000000000
--- a/package/alsa-utils/0002-aplay-aplay.c-make-UCM-support-optional.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 1921efacfe1a230021849b83b2877c8f239b44ab Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Sun, 17 Jul 2022 19:09:04 +0200
-Subject: [PATCH] aplay/aplay.c: make UCM support optional
-
-Commit 90f59671784a7e47b40485095cd66892d4840ed7 ("topology:
-pre-processor: Move the call to expand variables") modified aplay by
-unconditionally invoking features of the use case manager (UCM) from
-alsa-lib. However, alsa-lib can be compiled without UCM support.
-
-In order to properly support this situation, this commit changes aplay
-to only conditionally compile the UCM related code.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Upstream: https://mailman.alsa-project.org/pipermail/alsa-devel/2022-July/203847.html
----
- aplay/aplay.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/aplay/aplay.c b/aplay/aplay.c
-index b3b3635..59f937d 100644
---- a/aplay/aplay.c
-+++ b/aplay/aplay.c
-@@ -41,7 +41,9 @@
- #include <time.h>
- #include <locale.h>
- #include <alsa/asoundlib.h>
-+#ifdef HAVE_ALSA_USE_CASE_H
- #include <alsa/use-case.h>
-+#endif
- #include <assert.h>
- #include <termios.h>
- #include <signal.h>
-@@ -453,6 +455,7 @@ static ssize_t xwrite(int fd, const void *buf, size_t count)
- return offset;
- }
-
-+#ifdef HAVE_ALSA_USE_CASE_H
- static int open_ucm(snd_use_case_mgr_t **uc_mgr, char **pcm_name, const char *name)
- {
- char *s, *p;
-@@ -476,6 +479,7 @@ static int open_ucm(snd_use_case_mgr_t **uc_mgr, char **pcm_name, const char *na
- }
- return err;
- }
-+#endif
-
- static long parse_long(const char *str, int *err)
- {
-@@ -553,7 +557,9 @@ int main(int argc, char *argv[])
- int do_device_list = 0, do_pcm_list = 0, force_sample_format = 0;
- snd_pcm_info_t *info;
- FILE *direction;
-+#ifdef HAVE_ALSA_USE_CASE_H
- snd_use_case_mgr_t *uc_mgr = NULL;
-+#endif
-
- #ifdef ENABLE_NLS
- setlocale(LC_ALL, "");
-@@ -852,6 +858,7 @@ int main(int argc, char *argv[])
- goto __end;
- }
-
-+#ifdef HAVE_ALSA_USE_CASE_H
- if (strncmp(pcm_name, "ucm.", 4) == 0) {
- err = open_ucm(&uc_mgr, &pcm_name, pcm_name + 4);
- if (err < 0) {
-@@ -861,6 +868,7 @@ int main(int argc, char *argv[])
- if (verbose)
- fprintf(stderr, _("Found UCM PCM device: %s\n"), pcm_name);
- }
-+#endif
-
- err = snd_pcm_open(&handle, pcm_name, stream, open_mode);
- if (err < 0) {
-@@ -951,8 +959,10 @@ int main(int argc, char *argv[])
- if (verbose==2)
- putchar('\n');
- snd_pcm_close(handle);
-+#ifdef HAVE_ALSA_USE_CASE_H
- if (uc_mgr)
- snd_use_case_mgr_close(uc_mgr);
-+#endif
- handle = NULL;
- free(audiobuf);
- __end:
---
-2.36.1
-
diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash
index c53fe07963..66c04d261f 100644
--- a/package/alsa-utils/alsa-utils.hash
+++ b/package/alsa-utils/alsa-utils.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 e906bf2404ff04c448eaa3d226d283a62b9a283f12e4fd8457fb24bac274e678 alsa-utils-1.2.7.tar.bz2
+sha256 e140fa604c351f36bd72167c8860c69d81b964ae6ab53992d6434dde38e9333c alsa-utils-1.2.8.tar.bz2
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk
index 65a7853c79..8c43f58b76 100644
--- a/package/alsa-utils/alsa-utils.mk
+++ b/package/alsa-utils/alsa-utils.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ALSA_UTILS_VERSION = 1.2.7
+ALSA_UTILS_VERSION = 1.2.8
ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils
ALSA_UTILS_LICENSE = GPL-2.0
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Buildroot] [PATCH v2 1/4] package/alsa-lib: topology modules need dynamic library support
2022-10-30 19:33 [Buildroot] [PATCH v2 1/4] package/alsa-lib: topology modules need dynamic library support Bernd Kuhls
` (2 preceding siblings ...)
2022-10-30 19:33 ` [Buildroot] [PATCH v2 4/4] package/alsa-utils: " Bernd Kuhls
@ 2022-10-30 19:43 ` Yann E. MORIN
3 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2022-10-30 19:43 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Charles Hardin, buildroot
Bernd, All,
On 2022-10-30 20:33 +0100, Bernd Kuhls spake thusly:
> With this new option we can remove a patch from alsa-utils which fixed
> its static build. A static build of topology modules is not supported
> by upstream however:
>
> "Note that it does not make sense to build static topology modules.
> They are not usable."
> https://github.com/alsa-project/alsa-utils/issues/152#issuecomment-1144485929
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
[--SNIP--]
> diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in
> index af3de984d9..c6fb501d07 100644
> --- a/package/alsa-lib/Config.in
> +++ b/package/alsa-lib/Config.in
> @@ -80,4 +80,9 @@ config BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS
> bool "old-symbols"
> default y
>
> +config BR2_PACKAGE_ALSA_LIB_TOPOLOGY
> + bool "topology"
> + depends on !BR2_STATIC_LIBS
> + default y
$ make check-package
package/alsa-lib/Config.in:86: attributes order: type, default,
depends on, select, help (http://nightly.buildroot.org/#_config_files)
Applied to master with the above fixed, thanks.
Rest of the series also applied to master, thanks
Regards,
Yann E. MORIN.
> endif
> diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
> index f3ed195a5c..659ec26ba3 100644
> --- a/package/alsa-lib/alsa-lib.mk
> +++ b/package/alsa-lib/alsa-lib.mk
> @@ -58,6 +58,9 @@ endif
> ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y)
> ALSA_LIB_CONF_OPTS += --disable-old-symbols
> endif
> +ifneq ($(BR2_PACKAGE_ALSA_LIB_TOPOLOGY),y)
> +ALSA_LIB_CONF_OPTS += --disable-topology
> +endif
>
> ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
> ALSA_LIB_CONF_OPTS += \
> diff --git a/package/alsa-utils/0003-configure.ac-fix-build-without-dlfcn.h.patch b/package/alsa-utils/0003-configure.ac-fix-build-without-dlfcn.h.patch
> deleted file mode 100644
> index 69dae5102c..0000000000
> --- a/package/alsa-utils/0003-configure.ac-fix-build-without-dlfcn.h.patch
> +++ /dev/null
> @@ -1,48 +0,0 @@
> -From 0e74339bf0751932abf6aa49bf07aa1c035f9ec6 Mon Sep 17 00:00:00 2001
> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -Date: Sun, 14 Aug 2022 20:31:30 +0200
> -Subject: [PATCH] configure.ac: fix build without dlfcn.h
> -
> -Fix the following static build failure (i.e. without dlfcn.h) raised
> -since version 1.2.7 and
> -https://github.com/alsa-project/alsa-utils/commit/44d3e8aa44fc12f95bfeef0e3a1051e8f77047b5:
> -
> -pre-processor.c:28:10: fatal error: dlfcn.h: No such file or directory
> - 28 | #include <dlfcn.h>
> - | ^~~~~~~~~
> -
> -Fixes:
> - - http://autobuild.buildroot.org/results/1173a1ee28a58ce565a3274f35e868c35bb2e04e
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Upstream status: https://github.com/alsa-project/alsa-utils/pull/165]
> ----
> - configure.ac | 5 ++++-
> - 1 file changed, 4 insertions(+), 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 20cbb68..6833800 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -27,6 +27,9 @@ AC_CHECK_FUNC([snd_ctl_elem_add_enumerated],
> - , [AC_ERROR([No user enum control support in alsa-lib])])
> - fi
> -
> -+
> -+AC_CHECK_HEADERS([dlfcn.h])
> -+
> - dnl Check components
> - AC_CHECK_HEADERS([alsa/pcm.h], [have_pcm="yes"], [have_pcm="no"],
> - [#include <alsa/asoundlib.h>])
> -@@ -74,7 +77,7 @@ AM_CONDITIONAL(HAVE_MIXER, test "$have_mixer" = "yes")
> - AM_CONDITIONAL(HAVE_RAWMIDI, test "$have_rawmidi" = "yes")
> - AM_CONDITIONAL(HAVE_SEQ, test "$have_seq" = "yes")
> - AM_CONDITIONAL(HAVE_UCM, test "$have_ucm" = "yes")
> --AM_CONDITIONAL(HAVE_TOPOLOGY, test "$have_topology" = "yes")
> -+AM_CONDITIONAL(HAVE_TOPOLOGY, test "$have_topology" = "yes" -a "$ac_cv_header_dlfcn_h" = "yes")
> - AM_CONDITIONAL(HAVE_SAMPLERATE, test "$have_samplerate" = "yes")
> - AM_CONDITIONAL(HAVE_FFADO, test "$have_ffado" = "yes")
> -
> ---
> -2.35.1
> -
> diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk
> index 1b16a2457a..65a7853c79 100644
> --- a/package/alsa-utils/alsa-utils.mk
> +++ b/package/alsa-utils/alsa-utils.mk
> @@ -15,9 +15,6 @@ ALSA_UTILS_DEPENDENCIES = host-pkgconf alsa-lib \
> $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
> $(TARGET_NLS_DEPENDENCIES)
>
> -# We're patching configure.ac
> -ALSA_UTILS_AUTORECONF = YES
> -
> ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSACTL),y)
> ALSA_UTILS_SELINUX_MODULES += alsa
> endif
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread