package/alsa-lib: bump to 1.2.5.1
This version bump is needed prior to the introduction of alsa-plugins 1.2.5. As part of this bump, we drop 0002-dlmisc-the-snd_plugin_dir_set.patch which was an upstream backport, and we introduce 0002-fix-build-with-disable-ucm.patch to fix the build of alsa-lib when UCM support is disabled. This patch is also backported from upstream. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
35953d1e61
commit
af19131543
@ -1,34 +0,0 @@
|
||||
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>
|
||||
|
||||
Downloaded from upstream commit
|
||||
https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
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;
|
43
package/alsa-lib/0002-fix-build-with-disable-ucm.patch
Normal file
43
package/alsa-lib/0002-fix-build-with-disable-ucm.patch
Normal file
@ -0,0 +1,43 @@
|
||||
From 3fbaea3ff390d4c09adbf5d6ae62fb7b5f3f24f5 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Mon, 28 Jun 2021 12:08:53 +0200
|
||||
Subject: [PATCH] fix build with --disable-ucm
|
||||
|
||||
Link: https://mailman.alsa-project.org/pipermail/alsa-devel/2021-June/186729.html
|
||||
Reported-by: Michael Forney <mforney@mforney.org>
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
Upstream: f4f29d42be8b8ad60ea4c5697374adad4bfe6868
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
include/local.h | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/include/local.h b/include/local.h
|
||||
index 4e7d88a0..7cfcec53 100644
|
||||
--- a/include/local.h
|
||||
+++ b/include/local.h
|
||||
@@ -374,6 +374,8 @@ int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in,
|
||||
void *INTERNAL(snd_dlopen)(const char *name, int mode, char *errbuf, size_t errbuflen);
|
||||
#endif
|
||||
|
||||
+#ifdef BUILD_UCM
|
||||
+
|
||||
const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name);
|
||||
|
||||
static inline int _snd_is_ucm_device(const char *name)
|
||||
@@ -381,4 +383,12 @@ static inline int _snd_is_ucm_device(const char *name)
|
||||
return name && name[0] == '_' && name[1] == 'u' && name[2] == 'c' && name[3] == 'm';
|
||||
}
|
||||
|
||||
+#else
|
||||
+
|
||||
+static inline const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name) { return NULL; }
|
||||
+static inline int _snd_is_ucm_device(const char *name) { return 0; }
|
||||
+
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
#endif
|
||||
--
|
||||
2.31.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7 alsa-lib-1.2.4.tar.bz2
|
||||
sha256 628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e alsa-lib-1.2.5.1.tar.bz2
|
||||
sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING
|
||||
sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALSA_LIB_VERSION = 1.2.4
|
||||
ALSA_LIB_VERSION = 1.2.5.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)
|
||||
|
Loading…
Reference in New Issue
Block a user