summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xaudio-drivers/alsa-lib/DETAILS4
-rw-r--r--audio-drivers/alsa-lib/HISTORY5
-rw-r--r--audio-drivers/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch32
-rw-r--r--audio-drivers/alsa-lib/patches/0002-stdint_compat.patch14
4 files changed, 7 insertions, 48 deletions
diff --git a/audio-drivers/alsa-lib/DETAILS b/audio-drivers/alsa-lib/DETAILS
index 6af82b8d20..373b8e72b0 100755
--- a/audio-drivers/alsa-lib/DETAILS
+++ b/audio-drivers/alsa-lib/DETAILS
@@ -8,8 +8,8 @@ if [[ $ALSA_LIB_BRANCH == scm ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
- VERSION=1.2.4
- SOURCE_HASH=sha512:12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
+ VERSION=1.2.5
+ SOURCE_HASH=sha512:d9b53484737a3684aac7e08b4b18400aac10fec1a78a8bf9101944bea2c50710bc7355e9bb0012541b067e2d5ee7b1b818bf1bdbffbb2b2d7ad0eb15efe49725
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/lib/$SOURCE
diff --git a/audio-drivers/alsa-lib/HISTORY b/audio-drivers/alsa-lib/HISTORY
index 4dffe75cd3..a37c1d0850 100644
--- a/audio-drivers/alsa-lib/HISTORY
+++ b/audio-drivers/alsa-lib/HISTORY
@@ -1,3 +1,8 @@
+2021-05-31 Florian Franzmann <bwlf@bandrate.org>
+ * DETAILS: version 1.2.5
+ * 0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch,0002-stdint_compat.patch:
+ removed
+
2021-01-06 Ismael Luceno <ismael@iodev.co.uk>
* PRE_BUILD,
patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch,
diff --git a/audio-drivers/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch b/audio-drivers/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch
deleted file mode 100644
index a89f8587bb..0000000000
--- a/audio-drivers/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch
+++ /dev/null
@@ -1,32 +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>
----
- 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;
---
-2.29.0
-
diff --git a/audio-drivers/alsa-lib/patches/0002-stdint_compat.patch b/audio-drivers/alsa-lib/patches/0002-stdint_compat.patch
deleted file mode 100644
index 0ff7b41247..0000000000
--- a/audio-drivers/alsa-lib/patches/0002-stdint_compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Use stdlib.h defined types uint8_t, uint16_t, uint32_t and uint64_t
-for compatibility with musl libc
-
---- a/include/pcm.h 2015-02-26 13:34:52.000000000 +0100
-+++ a/include/pcm.h 2015-07-28 13:44:32.423885625 +0200
-@@ -29,6 +29,8 @@
- #ifndef __ALSA_PCM_H
- #define __ALSA_PCM_H
-
-+#include <stdint.h> /* uint_ types */
-+
- #ifdef __cplusplus
- extern "C" {
- #endif