diff options
| -rw-r--r-- | user/alsa-lib/APKBUILD | 12 | ||||
| -rw-r--r-- | user/alsa-lib/dlmisc_c.patch | 29 | ||||
| -rw-r--r-- | user/alsa-lib/ucm_add_limits_h.patch | 10 |
3 files changed, 4 insertions, 47 deletions
diff --git a/user/alsa-lib/APKBUILD b/user/alsa-lib/APKBUILD index 7cdf1108e..2071b794a 100644 --- a/user/alsa-lib/APKBUILD +++ b/user/alsa-lib/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=alsa-lib -pkgver=1.2.4 +pkgver=1.2.6.1 pkgrel=0 pkgdesc="Linux sound support system" url="https://www.alsa-project.org/wiki/Main_Page" @@ -9,11 +9,9 @@ license="LGPL-2.0+" depends="" makedepends="linux-headers" subpackages="$pkgname-dev $pkgname-dbg" -source="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2 - ucm_add_limits_h.patch +source="https://www.alsa-project.org/files/pub/lib/$pkgname-$pkgver.tar.bz2 remove-test.patch type_compat.patch - dlmisc_c.patch " build() { @@ -44,8 +42,6 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844 alsa-lib-1.2.4.tar.bz2 -3b37652d50809443b5f8e80f8d447108195b0cd66fd917805bb393fc091584b6f3dad4414f568742b61745617e7a695862058a0a0f93dcc31e4c97177a520352 ucm_add_limits_h.patch +sha512sums="70e539cf092b5d43e00e4134d8a3e184f0dc34312823e4b58a574320cbf06cb7369bc3251ecb1858033756a7a8c35d36faa8da48d49f6efe0cec905784adbd45 alsa-lib-1.2.6.1.tar.bz2 0ce3c2b8a0a70e2dffb6d633b95c4aae74504cd694fe1507cbc409d931b5f733935b22de45e4adcf5a507587c9f80c60a6f0e798aac2ca2fbf0cbcdef0080079 remove-test.patch -bdcfa3d5fcc055fb6732922679e21689fc2ac19462fe7b72d16862c98ef8c995c3dd5becc4987ba417068e6b0e561bec7e6284d5f0a414e2966c8e00ac304fa8 type_compat.patch -cfb008272df3f08fc9a3fcd086b199b3d7e88663cb60806aa67b01aea62cbd98bd63e468a34b66f0f18520e4a5bab0ac6db33aef58316f7ba329abfab0ebedee dlmisc_c.patch" +bdcfa3d5fcc055fb6732922679e21689fc2ac19462fe7b72d16862c98ef8c995c3dd5becc4987ba417068e6b0e561bec7e6284d5f0a414e2966c8e00ac304fa8 type_compat.patch" diff --git a/user/alsa-lib/dlmisc_c.patch b/user/alsa-lib/dlmisc_c.patch deleted file mode 100644 index b88dd3c29..000000000 --- a/user/alsa-lib/dlmisc_c.patch +++ /dev/null @@ -1,29 +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; diff --git a/user/alsa-lib/ucm_add_limits_h.patch b/user/alsa-lib/ucm_add_limits_h.patch deleted file mode 100644 index 2686dddd1..000000000 --- a/user/alsa-lib/ucm_add_limits_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/ucm/parser.c -+++ b/src/ucm/parser.c -@@ -31,6 +31,7 @@ - */ - - #include "ucm_local.h" -+#include <limits.h> - #include <dirent.h> - - /** The name of the environment variable containing the UCM directory */ |