diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-01-09 03:21:06 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-01-09 08:59:41 +0100 |
| commit | 1e8ea1d7ed43fc66a7452dfa0557f42aa3916aea (patch) | |
| tree | 8050be1a6e0f2c3f07d8e697ef1c1b3cd503281e /source/l/alsa-plugins | |
| parent | 870284c8649cc95fed6d9bd8e1bb5a2b9ac64e84 (diff) | |
| download | current-1e8ea1d7ed43fc66a7452dfa0557f42aa3916aea.tar.gz current-1e8ea1d7ed43fc66a7452dfa0557f42aa3916aea.tar.xz | |
Wed Jan 9 03:21:06 UTC 201920190109032106
ap/alsa-utils-1.1.8-x86_64-1.txz: Upgraded.
ap/gutenprint-5.3.1-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
l/alsa-lib-1.1.8-x86_64-1.txz: Upgraded.
l/alsa-oss-1.1.8-x86_64-1.txz: Upgraded.
l/alsa-plugins-1.1.8-x86_64-1.txz: Upgraded.
extra/pure-alsa-system/alsa-lib-1.1.8-x86_64-1_alsa.txz: Upgraded.
extra/pure-alsa-system/alsa-plugins-1.1.8-x86_64-1_alsa.txz: Upgraded.
Diffstat (limited to 'source/l/alsa-plugins')
| -rwxr-xr-x | source/l/alsa-plugins/alsa-plugins.SlackBuild | 5 | ||||
| -rw-r--r-- | source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch | 34 |
2 files changed, 1 insertions, 38 deletions
diff --git a/source/l/alsa-plugins/alsa-plugins.SlackBuild b/source/l/alsa-plugins/alsa-plugins.SlackBuild index dc4ed9845..7fde7eb26 100755 --- a/source/l/alsa-plugins/alsa-plugins.SlackBuild +++ b/source/l/alsa-plugins/alsa-plugins.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alsa-plugins VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -77,9 +77,6 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 -# Upstream fix for USB devices causing a double free: -zcat $CWD/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch b/source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch deleted file mode 100644 index 9b3a81599..000000000 --- a/source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Tue, 23 Oct 2018 09:32:46 +0200 -Subject: [PATCH] a52_close: set slave to NULL to avoid double pcm free in - open fcn - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - a52/pcm_a52.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -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; - } - --- -1.7.11.7 - |