From f3b3297923673ac5a38e27b8669e4a09cbb610c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 4 Jun 2021 12:16:35 -0300 Subject: [PATCH] alsa-lib: update to 1.2.5. --- ...lugin_dir_set-snd_plugin_dir-must-be.patch | 32 ------------------- srcpkgs/alsa-lib/patches/stdint_compat.patch | 14 -------- srcpkgs/alsa-lib/template | 6 ++-- 3 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch delete mode 100644 srcpkgs/alsa-lib/patches/stdint_compat.patch diff --git a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch b/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch deleted file mode 100644 index a89f8587bb1d..000000000000 --- a/srcpkgs/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 -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(-) - -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/srcpkgs/alsa-lib/patches/stdint_compat.patch b/srcpkgs/alsa-lib/patches/stdint_compat.patch deleted file mode 100644 index 0ff7b4124765..000000000000 --- a/srcpkgs/alsa-lib/patches/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 /* uint_ types */ -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template index 7a6a58a8c5ea..dc87955b86a4 100644 --- a/srcpkgs/alsa-lib/template +++ b/srcpkgs/alsa-lib/template @@ -1,7 +1,7 @@ # Template file for 'alsa-lib' pkgname=alsa-lib -version=1.2.4 -revision=2 +version=1.2.5 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config libtool" short_desc="Advanced Linux Sound Architecture (ALSA) library" @@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos " license="LGPL-2.1-or-later" homepage="http://www.alsa-project.org" distfiles="https://www.alsa-project.org/files/pub/lib/${pkgname}-${version}.tar.bz2" -checksum=f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7 +checksum=9092894a8c083b33acf8d6deb901b58f5d20d6da583789f814e8e46f2850ef18 patch_args="-Np1" alsa-lib-devel_package() {