diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-11-25 14:22:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-25 14:22:55 -0800 |
| commit | 3cce7bdd724c46a206ed15ecc54dda698dd19034 (patch) | |
| tree | 2de122204a69996942f77e60961f5ea9b5e801ba | |
| parent | f14d1960cfa28dad1c7c418936743923b6f7ccaf (diff) | |
| parent | 1bc15ef8bb8af43dac77ff7ef7e6b6a1bc6dccb5 (diff) | |
Merge pull request #14014 from neheb/alsaa
alsa updates
| -rw-r--r-- | libs/alsa-lib/Makefile | 4 | ||||
| -rw-r--r-- | libs/alsa-lib/patches/300-snd_plugin.patch | 27 | ||||
| -rw-r--r-- | libs/alsa-ucm-conf/Makefile | 4 | ||||
| -rw-r--r-- | sound/alsa-utils/Makefile | 6 |
4 files changed, 34 insertions, 7 deletions
diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index 074d0904b..df4980288 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 <thess@kitschensync.net>, \ Peter Wagner <tripolar@gmx.at> 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 000000000..2c6f26778 --- /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 <perex@perex.cz> +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 <perex@perex.cz> +--- + 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; diff --git a/libs/alsa-ucm-conf/Makefile b/libs/alsa-ucm-conf/Makefile index 5f3462e23..d30b3cd97 100644 --- a/libs/alsa-ucm-conf/Makefile +++ b/libs/alsa-ucm-conf/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-ucm-conf -PKG_VERSION:=1.2.3 +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:=1bc24da04bb27a75e323c9f0fb03e44705b6bb8a8baf255b94b41d457d590d00 +PKG_HASH:=2c3b535c77dcb9aaf62a61f4f8324f1ab184162f105f7ec9ed1e37c742fcd340 PKG_MAINTAINER:= PKG_LICENSE:=BSD-3-Clause diff --git a/sound/alsa-utils/Makefile b/sound/alsa-utils/Makefile index 89bd7aae1..ff0c9b6ec 100644 --- a/sound/alsa-utils/Makefile +++ b/sound/alsa-utils/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-utils -PKG_VERSION:=1.2.3 -PKG_RELEASE:=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/utils/ \ http://distfiles.gentoo.org/distfiles/ -PKG_HASH:=ff19ae48c22938de7a491bdb39db74a2eee2546013f39bf1a86185e426f921aa +PKG_HASH:=98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_LICENSE:=GPL-2.0-or-later |