diff --git a/debian/changelog b/debian/changelog index 3307b6a..846e706 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ [ Jordi Mallach ] * New upstream release. * Acknowledge 1.2.4-1.1 NMU by Thorsten Glaser. + * Drop 976895.diff, cherry-picked from current version. [ Debian Janitor ] * Set upstream metadata fields: Repository. diff --git a/debian/patches/976895.diff b/debian/patches/976895.diff deleted file mode 100644 index 61388d4..0000000 --- a/debian/patches/976895.diff +++ /dev/null @@ -1,38 +0,0 @@ -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 -From: Jaroslav Kysela -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 --git a/debian/patches/series b/debian/patches/series index 52e6543..315c174 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-Enabled-extended-namehints-in-alsa.conf.patch -976895.diff