package/alsa-lib: bump version to 1.2.3
PATCH 1/2 package/alsa-lib: bump version to 1.2.3
Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.2_v1.2.3
Added patch to fix uClibc build.
Signed-off-by Bernd Kuhls <[email protected]>
--- .../0002-dlmisc.c-fix-uclibc-build.patch | 35 +++++++++++++++++++ package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 package/alsa-lib/0002-dlmisc.c-fix-uclibc-build.patch
package/alsa-lib/0002-dlmisc.c-fix-uclibc-build.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 3b2dbc715ea61d7cedc69cd6e0c3530483d3f7e4 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <[email protected]> +Date: Sat, 13 Jun 2020 17:44:45 +0200 +Subject: [PATCH] dlmisc.c: fix uclibc build + +RTLD_DL_LINKMAP & RTLD_DI_ORIGIN, are unsupported on uClibc: +https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/dlfcn.h#n106 + +This patch adds detection for uClibc because uClibc also defines +__GLIBC__: +https://lists.gnu.org/archive/html/bug-gnulib/2010-11/msg00280.html + +Patch sent upstream: https://github.com/alsa-project/alsa-lib/pull/58 + +Signed-off-by: Bernd Kuhls <[email protected]> +--- + src/dlmisc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dlmisc.c b/src/dlmisc.c +index 5d672146..ca94b123 100644 +--- a/src/dlmisc.c ++++ b/src/dlmisc.c +@@ -69,7 +69,7 @@ static inline void snd_dlpath_unlock(void) {} + int snd_dlpath(char *path, size_t path_len, const char *name) + { + #ifdef HAVE_LIBDL +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + static int plugin_dir_set = 0; + snd_dlpath_lock(); + if (!plugin_dir_set) { +-- +2.26.2 +
package/alsa-lib/alsa-lib.hash +1 -1
@@ -1,4 +1,4 @@ # Locally calculated -sha256 d8e853d8805574777bbe40937812ad1419c9ea7210e176f0def3e6ed255ab3ec alsa-lib-1.2.2.tar.bz2 +sha256 02f00922fc511eaf37b037197afa930d5ff0912c1a86f333393f91f3426f678e alsa-lib-1.2.3.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING
package/alsa-lib/alsa-lib.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.2 +ALSA_LIB_VERSION = 1.2.3 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)
Signature · 1 line
2.26.2
PATCH 2/2 package/alsa-utils: bump version to 1.2.3
Removed _AUTORECONF added with
https://git.buildroot.net/buildroot/commit/?id=e10cf295c900790d96d777cc7ff0aea287afd056
because we do not patch alsa.m4 anymore.
Signed-off-by Bernd Kuhls <[email protected]>
--- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-)
package/alsa-utils/alsa-utils.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 44807bd578c5f6df6e91a11b8d37e546424a5a1ea8d8e659ee359fe01730e4f3 alsa-utils-1.2.2.tar.bz2 +sha256 ff19ae48c22938de7a491bdb39db74a2eee2546013f39bf1a86185e426f921aa alsa-utils-1.2.3.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
package/alsa-utils/alsa-utils.mk +1 -5
@@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.2 +ALSA_UTILS_VERSION = 1.2.3 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
@@ -14,10 +14,6 @@ ALSA_UTILS_DEPENDENCIES = host-pkgconf alsa-lib \ $(if $(BR2_PACKAGE_NCURSES),ncurses) \ $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \ $(TARGET_NLS_DEPENDENCIES) -# Regenerate aclocal.m4 to pick the patched -# version of alsa.m4 from alsa-lib -ALSA_UTILS_AUTORECONF = YES -ALSA_UTILS_GETTEXTIZE = YES ALSA_UTILS_CONF_ENV = \ ac_cv_prog_ncurses5_config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) \
Signature · 1 line
2.26.2
PATCH 1/2 package/alsa-lib: bump version to 1.2.3
In reply to Bernd KuhlsBernd, All,
On 2020-06-13 17:58 +0200, Bernd Kuhls spake thusly:
Quoted 5 lines
Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.2_v1.2.3
Added patch to fix uClibc build.
Signed-off-by Bernd Kuhls <[email protected]>
Both patches applied to master, thanks.
For this alsa-lib, I did replace the patch by an actual backport, now it has been applied upstream. Thanks!
Regards,
Yann E. MORIN.
Quoted 78 lines
--- .../0002-dlmisc.c-fix-uclibc-build.patch | 35 +++++++++++++++++++ package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 package/alsa-lib/0002-dlmisc.c-fix-uclibc-build.patchpackage/alsa-lib/0002-dlmisc.c-fix-uclibc-build.patch new file +35
-0@@ -0,0 +1,35 @@ +From 3b2dbc715ea61d7cedc69cd6e0c3530483d3f7e4 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <[email protected]> +Date: Sat, 13 Jun 2020 17:44:45 +0200 +Subject: [PATCH] dlmisc.c: fix uclibc build + +RTLD_DL_LINKMAP & RTLD_DI_ORIGIN, are unsupported on uClibc: +https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/dlfcn.h#n106 + +This patch adds detection for uClibc because uClibc also defines +__GLIBC__: +https://lists.gnu.org/archive/html/bug-gnulib/2010-11/msg00280.html + +Patch sent upstream: https://github.com/alsa-project/alsa-lib/pull/58 + +Signed-off-by: Bernd Kuhls <[email protected]> +--- + src/dlmisc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dlmisc.c b/src/dlmisc.c +index 5d672146..ca94b123 100644 +--- a/src/dlmisc.c ++++ b/src/dlmisc.c +@@ -69,7 +69,7 @@ static inline void snd_dlpath_unlock(void) {} + int snd_dlpath(char *path, size_t path_len, const char *name) + { + #ifdef HAVE_LIBDL +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + static int plugin_dir_set = 0; + snd_dlpath_lock(); + if (!plugin_dir_set) { +-- +2.26.2 +package/alsa-lib/alsa-lib.hash +1
-1@@ -1,4 +1,4 @@ # Locally calculated -sha256 d8e853d8805574777bbe40937812ad1419c9ea7210e176f0def3e6ed255ab3ec alsa-lib-1.2.2.tar.bz2 +sha256 02f00922fc511eaf37b037197afa930d5ff0912c1a86f333393f91f3426f678e alsa-lib-1.2.3.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYINGpackage/alsa-lib/alsa-lib.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.2 +ALSA_LIB_VERSION = 1.2.3 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)Signature · 6 lines
2.26.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'