From: Alexander Kanavin Date: Mon, 2 Nov 2020 16:48:54 +0000 (+0100) Subject: alsa: upgrade 1.2.3 -> 1.2.4 X-Git-Tag: uninative-2.10~801 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5cafc3721cbe0193fb444adba4cc82a820f3f33f;p=openembedded-core.git alsa: upgrade 1.2.3 -> 1.2.4 Backport a patch to fix musl builds. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-multimedia/alsa/alsa-lib/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch b/meta/recipes-multimedia/alsa/alsa-lib/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch new file mode 100644 index 0000000000..98e2988dda --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch @@ -0,0 +1,31 @@ +From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 22 Oct 2020 20:57:32 +0200 +Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be + declared even for \!DL_ORIGIN_AVAILABLE + +Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable") +BugLink: https://github.com/alsa-project/alsa-lib/issues/91 +Signed-off-by: Jaroslav Kysela +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + src/dlmisc.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/dlmisc.c b/src/dlmisc.c +index c9517c55..f20eb593 100644 +--- a/src/dlmisc.c ++++ b/src/dlmisc.c +@@ -42,11 +42,9 @@ + #ifndef PIC + struct snd_dlsym_link *snd_dlsym_start = NULL; + #endif +-#ifdef DL_ORIGIN_AVAILABLE + static int snd_plugin_dir_set = 0; + static char *snd_plugin_dir = NULL; + #endif +-#endif + + #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD) + static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.3.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb similarity index 88% rename from meta/recipes-multimedia/alsa/alsa-lib_1.2.3.2.bb rename to meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb index 1ed1a7b9a3..f38e8b94ff 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.3.2.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb @@ -7,8 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \ " -SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" -SRC_URI[sha256sum] = "e81fc5b7afcaee8c9fd7f64a1e3043e88d62e9ad2c4cff55f578df6b0a9abe15" +SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \ + file://ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch" +SRC_URI[sha256sum] = "f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7" inherit autotools pkgconfig diff --git a/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.3.bb b/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb similarity index 84% rename from meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.3.bb rename to meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb index 3575c460e4..aac4b48948 100644 --- a/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.3.bb +++ b/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4" SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" -SRC_URI[sha256sum] = "833f99b2cbda34e0cfef867ef1d2e6a74fe276bb7fc525a573be32077f629dff" +SRC_URI[sha256sum] = "55e0e6e42eca4cc7656c257af2440cdc65b83689dca49fc60ca0194db079ed07" inherit allarch diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.3.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb similarity index 85% rename from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.3.bb rename to meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb index 7be0df8856..da41c3db75 100644 --- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.3.bb +++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4" SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" -SRC_URI[sha256sum] = "1bc24da04bb27a75e323c9f0fb03e44705b6bb8a8baf255b94b41d457d590d00" +SRC_URI[sha256sum] = "2c3b535c77dcb9aaf62a61f4f8324f1ab184162f105f7ec9ed1e37c742fcd340" inherit allarch diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.3.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.4.bb similarity index 100% rename from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.3.bb rename to meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.4.bb diff --git a/meta/recipes-multimedia/alsa/alsa-utils.inc b/meta/recipes-multimedia/alsa/alsa-utils.inc index b523a5a832..87eb55afbe 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils.inc +++ b/meta/recipes-multimedia/alsa/alsa-utils.inc @@ -21,7 +21,7 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" -SRC_URI[sha256sum] = "ff19ae48c22938de7a491bdb39db74a2eee2546013f39bf1a86185e426f921aa" +SRC_URI[sha256sum] = "98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.3.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.4.bb similarity index 100% rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.3.bb rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.4.bb