From 90fb6e7afa86026a964555993d949867ddf4f979 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 24 Nov 2020 21:13:49 -0800 Subject: [PATCH] alsa-lib: update to 1.2.4 Backport upstream patch fixing compilation. Signed-off-by: Rosen Penev --- libs/alsa-lib/Makefile | 4 ++-- libs/alsa-lib/patches/300-snd_plugin.patch | 27 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 libs/alsa-lib/patches/300-snd_plugin.patch diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index 074d0904ba..df49802886 100644 --- a/libs/alsa-lib/Makefile +++ b/libs/alsa-lib/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-lib -PKG_VERSION:=1.2.3.2 +PKG_VERSION:=1.2.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \ http://distfiles.gentoo.org/distfiles/ -PKG_HASH:=e81fc5b7afcaee8c9fd7f64a1e3043e88d62e9ad2c4cff55f578df6b0a9abe15 +PKG_HASH:=f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7 PKG_MAINTAINER:=Ted Hess , \ Peter Wagner diff --git a/libs/alsa-lib/patches/300-snd_plugin.patch b/libs/alsa-lib/patches/300-snd_plugin.patch new file mode 100644 index 0000000000..2c6f26778d --- /dev/null +++ b/libs/alsa-lib/patches/300-snd_plugin.patch @@ -0,0 +1,27 @@ +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 +--- + src/dlmisc.c | 2 -- + 1 file changed, 2 deletions(-) + +--- 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; -- 2.30.2