diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-11-04 19:45:38 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-11-05 08:59:43 +0100 |
commit | 243141c37dcbe4b5714d524e2397660c54691b5d (patch) | |
tree | 45914fffd3d6f8039a8d97068cece78d05f96dda /source/l/alsa-lib | |
parent | 0dada1b8719e049f5e3d73034824296a89c4506f (diff) | |
download | current-243141c37dcbe4b5714d524e2397660c54691b5d.tar.gz |
Sun Nov 4 19:45:38 UTC 201820181104194538
a/btrfs-progs-v4.19-x86_64-1.txz: Upgraded.
a/haveged-1.9.4-x86_64-2.txz: Rebuilt.
rc.haveged: eliminate startup noise.
a/kernel-generic-4.19.1-x86_64-1.txz: Upgraded.
a/kernel-huge-4.19.1-x86_64-1.txz: Upgraded.
a/kernel-modules-4.19.1-x86_64-1.txz: Upgraded.
d/cmake-3.12.4-x86_64-1.txz: Upgraded.
d/kernel-headers-4.19.1-x86-1.txz: Upgraded.
k/kernel-source-4.19.1-noarch-1.txz: Upgraded.
Temporarily build in speakup drivers until the modular ones are fixed.
Thanks to Didier Spaier.
SPEAKUP m -> y
SPEAKUP_SYNTH_ACNTPC m -> y
SPEAKUP_SYNTH_ACNTSA m -> y
SPEAKUP_SYNTH_APOLLO m -> y
SPEAKUP_SYNTH_AUDPTR m -> y
SPEAKUP_SYNTH_BNS m -> y
SPEAKUP_SYNTH_DECEXT m -> y
SPEAKUP_SYNTH_DECTLK m -> y
SPEAKUP_SYNTH_DTLK m -> y
SPEAKUP_SYNTH_DUMMY m -> y
SPEAKUP_SYNTH_KEYPC m -> y
SPEAKUP_SYNTH_LTLK m -> y
SPEAKUP_SYNTH_SOFT m -> y
SPEAKUP_SYNTH_SPKOUT m -> y
SPEAKUP_SYNTH_TXPRT m -> y
l/alsa-lib-1.1.7-x86_64-2.txz: Rebuilt.
Fixed PCM interval. Thanks to aaditya.
l/xapian-core-1.4.9-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/alsa-lib')
-rwxr-xr-x | source/l/alsa-lib/alsa-lib.SlackBuild | 4 | ||||
-rw-r--r-- | source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch | 72 |
2 files changed, 75 insertions, 1 deletions
diff --git a/source/l/alsa-lib/alsa-lib.SlackBuild b/source/l/alsa-lib/alsa-lib.SlackBuild index d6c6517c..0c2b56c1 100755 --- a/source/l/alsa-lib/alsa-lib.SlackBuild +++ b/source/l/alsa-lib/alsa-lib.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alsa-lib VERSION=${VERSION:-$(echo alsa-lib-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -81,6 +81,8 @@ if [ ! -r src/conf/smixer.conf ]; then cp -a $CWD/smixer.conf src/conf fi +zcat $CWD/alsa-lib.fix.pcm.interval.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch b/source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch new file mode 100644 index 00000000..fa8f379a --- /dev/null +++ b/source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch @@ -0,0 +1,72 @@ +From b420056604f06117c967b65d43d01536c5ffcbc9 Mon Sep 17 00:00:00 2001 +From: Timo Wischer <twischer@de.adit-jv.com> +Date: Thu, 18 Oct 2018 13:33:24 +0200 +Subject: [PATCH] pcm: interval: Interpret (x x+1] correctly and return x+1 + +Without this change an interval of (x x+1] will be interpreted as an +empty interval but the right value would be x+1. +This leads to a failing snd_pcm_hw_params() call which returns -EINVAL. + +An example issue log is given in the following: +snd_pcm_hw_params failed with err -22 (Invalid argument) +ACCESS: MMAP_NONINTERLEAVED +FORMAT: S16_LE +SUBFORMAT: STD +SAMPLE_BITS: 16 +FRAME_BITS: 16 +CHANNELS: 1 +RATE: 16000 +PERIOD_TIME: (15999 16000] +PERIOD_SIZE: (255 256] +PERIOD_BYTES: (510 512] +PERIODS: [2 3) +BUFFER_TIME: 32000 +BUFFER_SIZE: 512 +BUFFER_BYTES: 1024 + +In case of (x x+1) we have to interpret it anyway as a single value of x to +compensate rounding issues. +For example the period size will result in an interval of (352 353) when +the period time is 16ms and the sample rate 22050 Hz +(16ms * 22,05 kHz = 352,8 frames). But 352 has to be chosen to allow a +buffer size of 705 (32ms * 22,05 kHz = 705,6 frames) which has to be >= 2x +period size to avoid Xruns. The buffer size will not end up with an +interval of (705 706) simular to the period size because +snd_pcm_rate_hw_refine_cchange() calls snd_interval_floor() for the buffer +size. Therefore this value will be interpreted as an integer interval +instead of a real interval further on. + +This issue seems to exist since the change of 9bb985c38 ("pcm: +snd_interval_refine_first/last: exclude value only if also excluded +before") + +Signed-off-by: Timo Wischer <twischer@de.adit-jv.com> +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +--- + src/pcm/interval_inline.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/pcm/interval_inline.h b/src/pcm/interval_inline.h +index a68e292..d9a30b2 100644 +--- a/src/pcm/interval_inline.h ++++ b/src/pcm/interval_inline.h +@@ -51,12 +51,14 @@ INTERVAL_INLINE int snd_interval_single(const snd_interval_t *i) + { + assert(!snd_interval_empty(i)); + return (i->min == i->max || +- (i->min + 1 == i->max && i->openmax)); ++ (i->min + 1 == i->max && (i->openmin || i->openmax))); + } + + INTERVAL_INLINE int snd_interval_value(const snd_interval_t *i) + { + assert(snd_interval_single(i)); ++ if (i->openmin && !i->openmax) ++ return i->max; + return i->min; + } + +-- +1.7.11.7 + + |