diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-10-25 22:35:03 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-10-25 22:35:03 +0000 |
| commit | 5dd8aee9a87d9444564e81e3e57c914e8ffcf40e (patch) | |
| tree | ba6a7f589fa25090fcbd5243800feec16cefd24c | |
| parent | d6ff5308eceebf680b5b952abf2a47a6ad620b94 (diff) | |
| parent | ed563b2d4204e2e0abc18f7656e402f899c68404 (diff) | |
| download | packages-5dd8aee9a87d9444564e81e3e57c914e8ffcf40e.tar.gz packages-5dd8aee9a87d9444564e81e3e57c914e8ffcf40e.tar.bz2 packages-5dd8aee9a87d9444564e81e3e57c914e8ffcf40e.tar.xz packages-5dd8aee9a87d9444564e81e3e57c914e8ffcf40e.zip | |
Merge branch 'alsa-utils' into 'master'
user/alsa-utils: Upgrade to 1.2.4
See merge request adelie/packages!514
| -rw-r--r-- | user/alsa-lib/APKBUILD | 8 | ||||
| -rw-r--r-- | user/alsa-lib/dlmisc_c.patch | 29 | ||||
| -rw-r--r-- | user/alsa-utils/APKBUILD | 4 |
3 files changed, 36 insertions, 5 deletions
diff --git a/user/alsa-lib/APKBUILD b/user/alsa-lib/APKBUILD index 49f14066e..7cdf1108e 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.2 +pkgver=1.2.4 pkgrel=0 pkgdesc="Linux sound support system" url="https://www.alsa-project.org/wiki/Main_Page" @@ -13,6 +13,7 @@ source="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2 ucm_add_limits_h.patch remove-test.patch type_compat.patch + dlmisc_c.patch " build() { @@ -43,7 +44,8 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033 alsa-lib-1.2.2.tar.bz2 +sha512sums="12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844 alsa-lib-1.2.4.tar.bz2 3b37652d50809443b5f8e80f8d447108195b0cd66fd917805bb393fc091584b6f3dad4414f568742b61745617e7a695862058a0a0f93dcc31e4c97177a520352 ucm_add_limits_h.patch 0ce3c2b8a0a70e2dffb6d633b95c4aae74504cd694fe1507cbc409d931b5f733935b22de45e4adcf5a507587c9f80c60a6f0e798aac2ca2fbf0cbcdef0080079 remove-test.patch -bdcfa3d5fcc055fb6732922679e21689fc2ac19462fe7b72d16862c98ef8c995c3dd5becc4987ba417068e6b0e561bec7e6284d5f0a414e2966c8e00ac304fa8 type_compat.patch" +bdcfa3d5fcc055fb6732922679e21689fc2ac19462fe7b72d16862c98ef8c995c3dd5becc4987ba417068e6b0e561bec7e6284d5f0a414e2966c8e00ac304fa8 type_compat.patch +cfb008272df3f08fc9a3fcd086b199b3d7e88663cb60806aa67b01aea62cbd98bd63e468a34b66f0f18520e4a5bab0ac6db33aef58316f7ba329abfab0ebedee dlmisc_c.patch" diff --git a/user/alsa-lib/dlmisc_c.patch b/user/alsa-lib/dlmisc_c.patch new file mode 100644 index 000000000..b88dd3c29 --- /dev/null +++ b/user/alsa-lib/dlmisc_c.patch @@ -0,0 +1,29 @@ +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-utils/APKBUILD b/user/alsa-utils/APKBUILD index 569e8d6a4..cab801ab0 100644 --- a/user/alsa-utils/APKBUILD +++ b/user/alsa-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=alsa-utils -pkgver=1.2.2 +pkgver=1.2.4 pkgrel=0 pkgdesc="Advanced Linux Sound Architecture (ALSA) utilities" url="https://www.alsa-project.org/wiki/Main_Page" @@ -36,7 +36,7 @@ package() { install -Dm644 ../alsa.confd "$pkgdir"/etc/conf.d/alsa } -sha512sums="30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9 alsa-utils-1.2.2.tar.bz2 +sha512sums="13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770 alsa-utils-1.2.4.tar.bz2 817215be6e9f103a8a187df5b1142c4d2e952f547a64579a9b8cfa58bd762d6a55bde75c0f66f018c0597744d07ccdb08216f7b368db464e36667cecedcc00f3 alsaconf.patch 7bf743024d7c5caed2fbf8af5cee73bcc569a7bab0bd6459541d3704cc6a7456d588b600b690e7406e122deaf0316dd1f67219a267bec4dff3f6c0f120edaae4 alsa.initd 6e716e6230fd3d2c33e3cb2dbf572d632c9ac6452c1768388bea7d3ca22f7c72cf6bcd702580f45cb9089983582011c8b04cbdb4420d14fb988167b1391ea547 alsa.confd" |