Bug#683783: unblock: alsa-lib/1.0.25-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package alsa-lib
I've added a trivial patch, taken from upstream git, that fixes a KDE
issue.
debdiff is attached.
unblock alsa-lib/1.0.25-4
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=ca_ES.UTF-8@valencia, LC_CTYPE=ca_ES.UTF-8@valencia (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru alsa-lib-1.0.25/debian/changelog alsa-lib-1.0.25/debian/changelog
--- alsa-lib-1.0.25/debian/changelog 2012-05-19 18:26:34.000000000 +0200
+++ alsa-lib-1.0.25/debian/changelog 2012-08-03 23:37:33.000000000 +0200
@@ -1,3 +1,11 @@
+alsa-lib (1.0.25-4) unstable; urgency=low
+
+ * Add htcl_remove_useless_assert.patch: apply patch from git to remove
+ incorrect assert which causes KMix to crash on KDE logins
+ (thanks, Ralf Jung; closes: #681078).
+
+ -- Jordi Mallach <jordi@debian.org> Fri, 03 Aug 2012 23:35:47 +0200
+
alsa-lib (1.0.25-3) unstable; urgency=low
* Merge from Ubuntu:
diff -Nru alsa-lib-1.0.25/debian/patches/htcl_remove_useless_assert.patch alsa-lib-1.0.25/debian/patches/htcl_remove_useless_assert.patch
--- alsa-lib-1.0.25/debian/patches/htcl_remove_useless_assert.patch 1970-01-01 01:00:00.000000000 +0100
+++ alsa-lib-1.0.25/debian/patches/htcl_remove_useless_assert.patch 2012-08-03 23:32:02.000000000 +0200
@@ -0,0 +1,31 @@
+From 86e27cdbf119440101a850e1b44baebfefe863ca Mon Sep 17 00:00:00 2001
+From: Martin Sandsmark <martin.sandsmark@kde.org>
+Date: Thu, 5 Jul 2012 09:40:07 +0200
+Subject: [PATCH 1/1] hctl: Remove a useless assert
+
+The case where the element is unavailable (for example gone away since
+the event was created) is handled beneath.
+
+See also bug 5471.
+ https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5471
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ src/control/hcontrol.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/control/hcontrol.c b/src/control/hcontrol.c
+index 8ffc434..ee1d907 100644
+--- a/src/control/hcontrol.c
++++ b/src/control/hcontrol.c
+@@ -761,7 +761,6 @@ static int snd_hctl_handle_event(snd_hctl_t *hctl, snd_ctl_event_t *event)
+ if (event->data.elem.mask & (SNDRV_CTL_EVENT_MASK_VALUE |
+ SNDRV_CTL_EVENT_MASK_INFO)) {
+ elem = snd_hctl_find_elem(hctl, &event->data.elem.id);
+- assert(elem);
+ if (!elem)
+ return -ENOENT;
+ res = snd_hctl_elem_throw_event(elem, event->data.elem.mask &
+--
+1.7.10.4
+
diff -Nru alsa-lib-1.0.25/debian/patches/series alsa-lib-1.0.25/debian/patches/series
--- alsa-lib-1.0.25/debian/patches/series 2012-01-30 01:16:36.000000000 +0100
+++ alsa-lib-1.0.25/debian/patches/series 2012-08-03 23:32:57.000000000 +0200
@@ -1,3 +1,4 @@
add-maintainer-mode.patch
multiarch-safe-dlopen-search-path.patch
spelling_fixes.patch
+htcl_remove_useless_assert.patch
Reply to: