Add patch to avoid memory leak in arts when using akode plugin. Thanks to Matthew Stapleton for the patch in bug #128574.

Package-Manager: portage-2.1_pre7-r3

5 files changed, 111 insertions, 1 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index f71e2e718e65..43c634a7d7f7 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.195 2006/03/25 19:47:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.196 2006/04/02 23:57:30 flameeyes Exp $
+
+*kdemultimedia-3.5.2-r1 (02 Apr 2006)
+
+  02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/artsplugin-akode-3.5.2-memleak.patch,
+  +kdemultimedia-3.5.2-r1.ebuild:
+  Add patch to avoid memory leak in arts when using akode plugin. Thanks to
+  Matthew Stapleton for the patch in bug #128574.
 
 *kdemultimedia-3.5.2 (25 Mar 2006)
 
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index d91dde0d96c7..fad1d40131c3 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,6 +1,9 @@
 MD5 302ae3935b50c5dca4d9666c066cc33a ChangeLog 27980
 RMD160 6c6a089fb0258c5a958c2ceaa806ef71f00e11bf ChangeLog 27980
 SHA256 f458c9b24695092e51adeff1b4a826cacc7943425c0f9420a1e342ee1ca22d5a ChangeLog 27980
+MD5 d860129d92634080c3f7368ed282e098 files/artsplugin-akode-3.5.2-memleak.patch 797
+RMD160 593b8a40af0b373259d37410f57989cdfb9ec568 files/artsplugin-akode-3.5.2-memleak.patch 797
+SHA256 1a6d341f130430ca7faef4188899e4fe98c4ba808ea9702d352a9b28eb2b3642 files/artsplugin-akode-3.5.2-memleak.patch 797
 MD5 30810bdee5baa766c389b0a4d8533a4e files/digest-kdemultimedia-3.3.2 73
 RMD160 6211b7f15cd6ddbd0ae102b84cf225dd8d22ef01 files/digest-kdemultimedia-3.3.2 73
 SHA256 bb975749a40d6c7d175429d2dded352702855a584c90719081df6e279b0c0f52 files/digest-kdemultimedia-3.3.2 73
@@ -25,6 +28,9 @@ SHA256 126ac5a4d0f666da6b2d6ecb38305cdc7569556c64775d594c4644eb677dcdfd files/di
 MD5 c6f3f23fcb5a1fa806c5073f45b26b59 files/digest-kdemultimedia-3.5.2 265
 RMD160 5e81c0b91adc803bf7923ec3176b9ff50217ed22 files/digest-kdemultimedia-3.5.2 265
 SHA256 da5960a94d94974711cce49b9e15a2465e392feb2dd48db846adce8d9e02d864 files/digest-kdemultimedia-3.5.2 265
+MD5 c6f3f23fcb5a1fa806c5073f45b26b59 files/digest-kdemultimedia-3.5.2-r1 265
+RMD160 5e81c0b91adc803bf7923ec3176b9ff50217ed22 files/digest-kdemultimedia-3.5.2-r1 265
+SHA256 da5960a94d94974711cce49b9e15a2465e392feb2dd48db846adce8d9e02d864 files/digest-kdemultimedia-3.5.2-r1 265
 MD5 ab4383e2b9810696530127a0a5464bfc files/kdemultimedia-3.4-configure.patch 5211
 RMD160 5c3916b02411206806637b107bcf0f9f703c7cfc files/kdemultimedia-3.4-configure.patch 5211
 SHA256 8f101cbf2f37d5f99cdf4fdb5376be2315be2127d714d200d25d502c88feff11 files/kdemultimedia-3.4-configure.patch 5211
@@ -58,6 +64,9 @@ SHA256 51fde068f0c596b343e9d77e9081eea46733a653e19fe27e827445cfb83d433a kdemulti
 MD5 ec76155abade0655e4b782f2521eac1c kdemultimedia-3.5.1.ebuild 2196
 RMD160 7b6d5ea59d8a9214f93a0d067d1bf7526ae5fcc4 kdemultimedia-3.5.1.ebuild 2196
 SHA256 6c66c2e930d4eb46c386d653f1af83d46fb4248ae613b326b34d71cd1bdd1a9a kdemultimedia-3.5.1.ebuild 2196
+MD5 455e2bfcd9eb40872dc749d0ab66e480 kdemultimedia-3.5.2-r1.ebuild 2256
+RMD160 f1e6c6b4a6d8e379a9575c441b08fe13408e3f09 kdemultimedia-3.5.2-r1.ebuild 2256
+SHA256 4a651fb6e6af6ffa9c614541ad1ade2c9ca8b175c190fe705475e84bb833440d kdemultimedia-3.5.2-r1.ebuild 2256
 MD5 10e197281851ecde07593f23bc4f4ffe kdemultimedia-3.5.2.ebuild 2196
 RMD160 72d9dc45f5cdab07ce7fc91faffb6441a86e46a0 kdemultimedia-3.5.2.ebuild 2196
 SHA256 9e19d0ea84597d6a4d2dab3666d1954978ce4ba6e730b6c6bcb605c714161a25 kdemultimedia-3.5.2.ebuild 2196
diff --git a/kde-base/kdemultimedia/files/artsplugin-akode-3.5.2-memleak.patch b/kde-base/kdemultimedia/files/artsplugin-akode-3.5.2-memleak.patch
new file mode 100644
index 000000000000..6852e3f7ad3c
--- /dev/null
+++ b/kde-base/kdemultimedia/files/artsplugin-akode-3.5.2-memleak.patch
@@ -0,0 +1,25 @@
+diff -Naur kdemultimedia-3.5.1/akode_artsplugin/akodePlayObject_impl.cpp kdemultimedia-3.5.1-2/akode_artsplugin/akodePlayObject_impl.cpp
+--- kdemultimedia-3.5.1/akode_artsplugin/akodePlayObject_impl.cpp	2005-09-10 18:20:04.000000000 +1000
++++ kdemultimedia-3.5.1-2/akode_artsplugin/akodePlayObject_impl.cpp	2006-03-01 10:54:32.000000000 +1000
+@@ -83,6 +83,8 @@
+ akodePlayObject_impl::~akodePlayObject_impl()
+ {
+     unload();
++
++    delete m_packetQueue;
+ }
+ 
+ bool akodePlayObject_impl::loadPlugin(const string &plugin)
+@@ -219,10 +221,9 @@
+         delete bufferedDecoder;
+         bufferedDecoder = 0;
+     }
+-#else
+-    delete frameDecoder
+-    frameDecoder = 0;
+ #endif
++    delete frameDecoder;
++    frameDecoder = 0;
+     decoder = 0;
+     if (buffer != inBuffer)
+         delete inBuffer;
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.2-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.2-r1
new file mode 100644
index 000000000000..91878b7b23bc
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.2-r1
@@ -0,0 +1,3 @@
+MD5 f98ef8465bf4de1eb36bc3bdb1f4f7d6 kdemultimedia-3.5.2.tar.bz2 6272386
+RMD160 4f6fcb790e63f4af7a309677babd5e2ed938514f kdemultimedia-3.5.2.tar.bz2 6272386
+SHA256 01562af68008c10c04346a94d0dea7cedcb77673c0b7cd5cfc74360bf309a2f8 kdemultimedia-3.5.2.tar.bz2 6272386
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.2-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..d9bbd878939c
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.2-r1.ebuild,v 1.1 2006/04/02 23:57:30 flameeyes Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa audiofile encode flac gstreamer mp3 musicbrainz theora vorbis xine"
+
+DEPEND="~kde-base/kdebase-${PV}
+	media-sound/cdparanoia
+	media-libs/akode
+	>=media-libs/taglib-1.2
+	audiofile? ( media-libs/audiofile )
+	xine? ( >=media-libs/xine-lib-1.0 )
+	alsa? ( media-libs/alsa-lib )
+	theora? ( media-libs/libtheora )
+	gstreamer? ( =media-libs/gstreamer-0.8*
+	             =media-libs/gst-plugins-0.8* )
+	musicbrainz? ( media-libs/tunepimp
+	               media-libs/musicbrainz )
+	encode? ( mp3? ( media-sound/lame )
+	          vorbis? ( media-sound/vorbis-tools )
+	          flac? ( media-libs/flac ) )"
+
+RDEPEND="${DEPEND}
+	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
+		     vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
+		               =media-plugins/gst-plugins-vorbis-0.8* )
+		     flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/artsplugin-akode-${PV}-memleak.patch"
+
+src_compile() {
+	local myconf="--with-cdparanoia --with-taglib
+	              --with-akode $(use_with alsa)
+	              $(use_with audiofile) $(use_with gstreamer)
+	              $(use_with xine) $(use_with theora)
+	              $(use_with musicbrainz)"
+
+	# encoding can happen through:
+	# - kio_audiocd (based on libflac for flac,
+	#   on libvorbis for vorbis, on the lame binary for mp3)
+	# - kaudiocreator (based on the flac binary for flac,
+	#   on the lame binary for mp3, on the oggenc binary for vorbis)
+	# - krec (based on libvorbis for vorbis,
+	#   on libmp3lame for mp3)
+	if use encode; then
+		myconf="${myconf} $(use_with mp3 lame)
+	                $(use_with vorbis) $(use_with flac)"
+	else
+		myconf="${myconf} --without-lame
+	                --without-vorbis --without-flac"
+	fi
+
+	# Not used anymore and scheduled for removal.
+	export DO_NOT_COMPILE="${DO_NOT_COMPILE} mpeglib mpeglib_artsplug"
+
+	kde_src_compile
+}