From b3de8da6b695ef8028c5926f9737b702c4619fe1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Jun 2020 20:17:26 +0200 Subject: [PATCH] package/alsa-lib: bump version to 1.2.3.1 Removed patch which was committed upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0002-dlmisc.c-fix-uclibc-build.patch | 37 ------------------- package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 package/alsa-lib/0002-dlmisc.c-fix-uclibc-build.patch diff --git a/package/alsa-lib/0002-dlmisc.c-fix-uclibc-build.patch b/package/alsa-lib/0002-dlmisc.c-fix-uclibc-build.patch deleted file mode 100644 index af629e0f6f..0000000000 --- a/package/alsa-lib/0002-dlmisc.c-fix-uclibc-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -From eec95e69e5d0dcc16fd8872c1ad680265a96cce3 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -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 - -BugLink: https://github.com/alsa-project/alsa-lib/pull/58 -From: Bernd Kuhls -Signed-off-by: Jaroslav Kysela ---- -Backported from upstream eec95e69e5d0dcc16fd8872c1ad680265a96cce3 ---- - 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.20.1 - diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index 9ce8a3408e..ca36d95cfc 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 02f00922fc511eaf37b037197afa930d5ff0912c1a86f333393f91f3426f678e alsa-lib-1.2.3.tar.bz2 +sha256 1244585515fbebce7d0e53656c1fb614f99accb8413115ce3efb9a9309c4c892 alsa-lib-1.2.3.1.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 a3b2081fdb..383f06855d 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.3 +ALSA_LIB_VERSION = 1.2.3.1 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.30.2