Fixed bug #78167 regarding an alsa memory leak in both stable and unstable. Patch should be removed next release.

(Portage version: 2.0.51.19)

4 files changed, 26 insertions, 3 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index b046994230c3..67243f2d4c25 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.104 2005/03/09 04:03:39 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.105 2005/03/16 06:36:15 chriswhite Exp $
+
+  16 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/alsa-lib-mixer.patch, alsa-lib-1.0.8.ebuild,
+  alsa-lib-1.0.8_rc1.ebuild:
+  Fixed bug #78167 regarding an alsa memory leak in both stable and unstable.
+  Patch should be removed next release.
 
   09 Mar 2005; Mike Gardiner <obz@gentoo.org> alsa-lib-1.0.7.ebuild:
   Keyworded ppc
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild
index 7011c4fb8b73..f62eee6c2501 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild,v 1.4 2005/03/09 01:40:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild,v 1.5 2005/03/16 06:36:15 chriswhite Exp $
 
 IUSE="jack doc"
 
@@ -29,6 +29,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${PN}-mixer.patch
 }
 
 src_compile() {
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.8_rc1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.8_rc1.ebuild
index 74379b007b95..ef74482973e3 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.8_rc1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.8_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.8_rc1.ebuild,v 1.3 2005/01/22 06:40:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.8_rc1.ebuild,v 1.4 2005/03/16 06:36:15 chriswhite Exp $
 
 inherit eutils
 
@@ -23,6 +23,12 @@ DEPEND="${RDEPEND}
 
 PDEPEND="jack? ( =media-plugins/alsa-jack-${PV}* )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-mixer.patch
+}
+
 src_compile() {
 	local myconf=""
 
diff --git a/media-libs/alsa-lib/files/alsa-lib-mixer.patch b/media-libs/alsa-lib/files/alsa-lib-mixer.patch
new file mode 100644
index 000000000000..dfdb8b03c8bd
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-mixer.patch
@@ -0,0 +1,10 @@
+--- src/mixer/bag.c.old	2005-03-16 14:39:05.000000000 +0900
++++ src/mixer/bag.c	2005-03-16 14:39:26.000000000 +0900
+@@ -59,6 +59,7 @@
+ 		bag1_t *b = list_entry(pos, bag1_t, list);
+ 		if (b->ptr == ptr) {
+ 			list_del(&b->list);
++			free(b);
+ 			return 0;
+ 		}
+ 	}