diff options
| -rw-r--r-- | community/alsa-plugins/APKBUILD (renamed from testing/alsa-plugins/APKBUILD) | 69 | ||||
| -rw-r--r-- | testing/alsa-plugins/alsa-plugins-1.1.7-double_free_fix.patch | 31 |
2 files changed, 52 insertions, 48 deletions
diff --git a/testing/alsa-plugins/APKBUILD b/community/alsa-plugins/APKBUILD index 17e734cc88e..14a985d9911 100644 --- a/testing/alsa-plugins/APKBUILD +++ b/community/alsa-plugins/APKBUILD @@ -1,15 +1,31 @@ +# Contributor: Taner Tas <taner76@gmail.com> # Maintainer: Taner Tas <taner76@gmail.com> pkgname=alsa-plugins -pkgver=1.1.7 -pkgrel=2 +pkgver=1.1.8 +pkgrel=0 pkgdesc="Advanced Linux Sound Architecture (ALSA) plugins" url="http://www.alsa-project.org" arch="all !s390x" license="GPL-2.0-or-later LGPL-2.1-or-later" -makedepends="linux-headers alsa-lib-dev speex-dev ffmpeg-dev libsamplerate-dev pulseaudio-dev jack-dev" -subpackages="$pkgname-pulse $pkgname-doc $pkgname-lavrate $pkgname-a52 $pkgname-jack" -source="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2 - $pkgname-$pkgver-double_free_fix.patch" +makedepends=" + alsa-lib-dev + ffmpeg-dev + jack-dev + libsamplerate-dev + linux-headers + pulseaudio-dev + speex-dev + " +subpackages=" + $pkgname-doc + $pkgname-pulse + $pkgname-lavrate + $pkgname-a52 + $pkgname-jack + " +source=" + ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2 + " prepare() { default_prepare @@ -44,27 +60,26 @@ EOF lavrate() { pkgdesc="FFmpeg samplerate conversion plugins for alsa" - mkdir -p "$subpkgdir"/usr/lib/alsa-lib/ - mv "$pkgdir"/usr/lib/alsa-lib/*lavrate* "$subpkgdir"/usr/lib/alsa-lib/ + _mv_lib *lavrate* + _mv_conf 10-rate-lav.conf } pulse() { pkgdesc="Pulseaudio support plugins for alsa-only applications" - mkdir -p "$subpkgdir"/usr/lib/alsa-lib/ - mv "$pkgdir"/usr/lib/alsa-lib/*pulse.so "$subpkgdir"/usr/lib/alsa-lib/ - mv "$pkgdir"/usr/share "$subpkgdir"/usr/ + _mv_lib *pulse.so + _mv_conf *pulseaudio* } a52() { pkgdesc="Converts S16 linear sound format to A52 compressed format and sends it to an SPDIF output" - mkdir -p "$subpkgdir"/usr/lib/alsa-lib/ - mv "$pkgdir"/usr/lib/alsa-lib/*a52.so "$subpkgdir"/usr/lib/alsa-lib/ + _mv_lib *a52.so + _mv_conf 60-a52-encoder.conf } jack() { pkgdesc="Allows native ALSA applications to work with jackd" - mkdir -p "$subpkgdir"/usr/lib/alsa-lib/ - mv "$pkgdir"/usr/lib/alsa-lib/*jack.so "$subpkgdir"/usr/lib/alsa-lib/ + _mv_lib *jack.so + _mv_conf 50-jack.conf } package() { @@ -73,5 +88,25 @@ package() { find $pkgdir -name *.la -type f -exec rm -f {} \; } -sha512sums="c3bb22ec3c5a167fb246cfc94131d53800e321b486ab743c3395a9d91dee0ff9703f6e4a2feaea5a4ee42a7e486d835d48ab880c784c5c34bb4eb5e9ded06d8e alsa-plugins-1.1.7.tar.bz2 -a57d1fe16ac51bd3010ba9ee705bd4d32e339f5f35ff7388910ecf0b8024d491d38a573a730f0a5a640cb688d7fadac05ca1e0162a08beb397e7fc0883c15a25 alsa-plugins-1.1.7-double_free_fix.patch" +_mv_lib() { + mkdir -p "$subpkgdir"/usr/lib/alsa-lib/ + + for i in "$@"; do + mv "$pkgdir"/usr/lib/alsa-lib/${i} \ + "$subpkgdir"/usr/lib/alsa-lib/ + done +} + +_mv_conf() { + mkdir -p "$subpkgdir"/etc/alsa/conf.d/ \ + "$subpkgdir"/usr/share/alsa/alsa.conf.d + + for i in "$@"; do + mv "$pkgdir"/usr/share/alsa/alsa.conf.d/${i} \ + "$subpkgdir"/usr/share/alsa/alsa.conf.d/ + mv "$pkgdir"/etc/alsa/conf.d/${i} \ + "$subpkgdir"/etc/alsa/conf.d/ + done +} + +sha512sums="bb1a4411921ec332f47b43515f6d3b4c03a01568854950b9b5c3f0d8172d9a0c4a5b3652bc64c62eae5ea3aaa5d95fe3d32c0a213fe99adf490a9807bcb58ecd alsa-plugins-1.1.8.tar.bz2" diff --git a/testing/alsa-plugins/alsa-plugins-1.1.7-double_free_fix.patch b/testing/alsa-plugins/alsa-plugins-1.1.7-double_free_fix.patch deleted file mode 100644 index f62ede8be20..00000000000 --- a/testing/alsa-plugins/alsa-plugins-1.1.7-double_free_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Jaroslav Kysela <perex@perex.cz> -Date: Tue, 23 Oct 2018 07:32:46 +0000 (+0200) -Subject: a52_close: set slave to NULL to avoid double pcm free in open fcn -X-Git-Tag: v1.1.8~19 -X-Git-Url: http://git.alsa-project.org/?p=alsa-plugins.git;a=commitdiff_plain;h=a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9 - -a52_close: set slave to NULL to avoid double pcm free in open fcn - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - -diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c -index e431fd0..b005bc2 100644 ---- a/a52/pcm_a52.c -+++ b/a52/pcm_a52.c -@@ -654,10 +654,13 @@ static int a52_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfd, - static int a52_close(snd_pcm_ioplug_t *io) - { - struct a52_ctx *rec = io->private_data; -+ snd_pcm_t *slave = rec->slave; - - a52_free(rec); -- if (rec->slave) -- return snd_pcm_close(rec->slave); -+ if (slave) { -+ rec->slave = NULL; -+ return snd_pcm_close(slave); -+ } - return 0; - } - |