[Pkg-alsa-devel] Bug#976895: alsa-lib: diff for NMU version 1.2.4-1.1

[Thorsten Glaser]

tags 976895 + fixed-upstream pending
thanks

Dear maintainer,

I’ve prepared an NMU for alsa-lib (versioned as 1.2.4-1.1) and
uploaded it to DELAYED/5. The diff is different from the one I
originally sent because in the meantime upstream fixed the bug
while keeping the new functionality I had reverted to fix it.

I expect any subsequent upstream release to have the fix so it
is short-lived. It’s crucial to some audio applications though.

bye,
//mirabilos
PS: Time for working on this sponsored by my employer, see below.
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg

*************************************************

Mit unserem Consulting bieten wir Unternehmen maßgeschneiderte Angebote in
Form von Beratung, Trainings sowie Workshops in den Bereichen
Softwaretechnologie, IT Strategie und Architektur, Innovation und Umsetzung
sowie Agile Organisation.

Besuchen Sie uns auf https://www.tarent.de/consulting .
Wir freuen uns auf Ihren Kontakt.

*************************************************
-------------- next part --------------
diff -Nru alsa-lib-1.2.4/debian/changelog alsa-lib-1.2.4/debian/changelog
--- alsa-lib-1.2.4/debian/changelog	2020-12-07 22:02:09.000000000 +0100
+++ alsa-lib-1.2.4/debian/changelog	2020-12-30 14:14:11.000000000 +0100
@@ -1,3 +1,10 @@
+alsa-lib (1.2.4-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Add upstream patch fixing a severe regression (Closes: #976895)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 30 Dec 2020 14:14:11 +0100
+
 alsa-lib (1.2.4-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru alsa-lib-1.2.4/debian/patches/976895.diff alsa-lib-1.2.4/debian/patches/976895.diff
--- alsa-lib-1.2.4/debian/patches/976895.diff	1970-01-01 01:00:00.000000000 +0100
+++ alsa-lib-1.2.4/debian/patches/976895.diff	2020-12-30 14:13:59.000000000 +0100
@@ -0,0 +1,38 @@
+Origin: upstream, commit:afe6ff3b33ee6e5ea3511fe458bfd4e516b10bcf
+Description: pcm: plugin status - fix the return value (regression)
+ The snd_pcm_plugin_avail_update() error code in snd_pcm_plugin_status()
+ should not be reported to the caller. The state errors can be determined
+ using the state member in the status structure.
+ .
+ Fixes: 4f90392f07e ("pcm: fix the snd_pcm_plugin_status() avail and delay fields")
+ BugLink: https://github.com/alsa-project/alsa-lib/issues/107
+ Signed-off-by: Jaroslav Kysela <perex at perex.cz>
+From: Jaroslav Kysela <perex at perex.cz>
+Bug: https://github.com/alsa-project/alsa-lib/issues/107
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=976895
+
+--- a/src/pcm/pcm_plugin.c
++++ b/src/pcm/pcm_plugin.c
+@@ -541,19 +541,17 @@ static snd_pcm_sframes_t snd_pcm_plugin_
+ static int snd_pcm_plugin_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
+ {
+ 	snd_pcm_plugin_t *plugin = pcm->private_data;
+-	snd_pcm_sframes_t err, avail;
++	snd_pcm_sframes_t err;
+ 
+ 	/* sync with the latest hw and appl ptrs */
+-	avail = snd_pcm_plugin_avail_update(pcm);
+-	if (avail < 0)
+-		return avail;
++	snd_pcm_plugin_avail_update(pcm);
+ 
+ 	err = snd_pcm_status(plugin->gen.slave, status);
+ 	if (err < 0)
+ 		return err;
+ 	status->appl_ptr = *pcm->appl.ptr;
+ 	status->hw_ptr = *pcm->hw.ptr;
+-	status->avail = avail;
++	status->avail = snd_pcm_mmap_avail(pcm);
+ 	status->delay = snd_pcm_mmap_delay(pcm);
+ 	return 0;
+ }
diff -Nru alsa-lib-1.2.4/debian/patches/series alsa-lib-1.2.4/debian/patches/series
--- alsa-lib-1.2.4/debian/patches/series	2020-08-20 19:56:34.000000000 +0200
+++ alsa-lib-1.2.4/debian/patches/series	2020-12-30 14:11:40.000000000 +0100
@@ -1 +1,2 @@
 0001-Enabled-extended-namehints-in-alsa.conf.patch
+976895.diff