Fix bug #246148, thanks to Markus Rathgeb <maggu2810@web.de>.

(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 44 insertions, 6 deletions

diff --git a/media-sound/picard/ChangeLog b/media-sound/picard/ChangeLog
index 69893635be6f..3bebc59b5769 100644
--- a/media-sound/picard/ChangeLog
+++ b/media-sound/picard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/picard
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.15 2008/11/09 11:16:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.16 2008/12/01 21:19:32 coldwind Exp $
+
+*picard-0.10-r2 (01 Dec 2008)
+
+  01 Dec 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/picard-0.10-ffmpeg-avcodec_decode_audio2.patch,
+  -picard-0.9.0.ebuild, +picard-0.10-r2.ebuild:
+  Fix bug #246148, thanks to Markus Rathgeb <maggu2810@web.de>.
 
   09 Nov 2008; Markus Meier <maekke@gentoo.org> picard-0.10-r1.ebuild:
   amd64/x86 stable, bug #245947
diff --git a/media-sound/picard/files/picard-0.10-ffmpeg-avcodec_decode_audio2.patch b/media-sound/picard/files/picard-0.10-ffmpeg-avcodec_decode_audio2.patch
new file mode 100644
index 000000000000..bec38313c2a2
--- /dev/null
+++ b/media-sound/picard/files/picard-0.10-ffmpeg-avcodec_decode_audio2.patch
@@ -0,0 +1,17 @@
+Source: Markus Rathgeb <maggu2810@web.de>
+Upstream: Applied in trunk, 0.11 will be fixed.
+Reason: avcodec_decode_audio is deprecated in latest ffmpeg.
+http://bugs.gentoo.org/show_bug.cgi?id=246148
+http://forums.musicbrainz.org/viewtopic.php?id=1369
+--- picard-0.10/picard/musicdns/avcodec.c.org   2008-11-09 12:47:41.000000000 +0100
++++ picard-0.10/picard/musicdns/avcodec.c       2008-11-09 12:47:49.000000000 +0100
+@@ -278,7 +278,8 @@
+         data = packet.data;
+
+         while (size > 0) {
+-            len = avcodec_decode_audio(codec_context, (int16_t *)buffer_ptr, &output_size, data, size);
++            output_size = buffer_size + AVCODEC_MAX_AUDIO_FRAME_SIZE;
++            len = avcodec_decode_audio2(codec_context, (int16_t *)buffer_ptr, &output_size, data, size);
+
+             if (len < 0)
+                 break;
diff --git a/media-sound/picard/picard-0.9.0.ebuild b/media-sound/picard/picard-0.10-r2.ebuild
index 0dbb1f1f1e88..81d9db6e6a4c 100644
--- a/media-sound/picard/picard-0.9.0.ebuild
+++ b/media-sound/picard/picard-0.10-r2.ebuild
@@ -1,29 +1,31 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-0.9.0.ebuild,v 1.6 2008/06/30 20:51:11 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-0.10-r2.ebuild,v 1.1 2008/12/01 21:19:32 coldwind Exp $
 
 inherit eutils distutils
 
+MY_P="${P/_/}"
 DESCRIPTION="An improved rewrite/port of the Picard Tagger using Qt"
 HOMEPAGE="http://musicbrainz.org/doc/PicardQt"
-SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${P}.tar.gz"
+SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cdaudio ffmpeg nls"
 
 RDEPEND=">=dev-lang/python-2.4
 	|| ( >=dev-lang/python-2.5 >=dev-python/ctypes-0.9 )
 	>=dev-python/PyQt4-4.2
-	>=media-libs/mutagen-1.9
+	media-libs/mutagen
 	cdaudio? ( >=media-libs/libdiscid-0.1.1 )
-	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326
+	ffmpeg? ( media-video/ffmpeg
 		>=media-libs/libofa-0.9.2 )"
 
 DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS.txt INSTALL.txt NEWS.txt"
+S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	if ! use ffmpeg; then
@@ -42,6 +44,15 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if has_version '>=media-video/ffmpeg-0.4.9_p20080326' ; then
+		epatch "${FILESDIR}"/${PN}-0.10.0_rc1-ffmpeg-headers.patch
+	fi
+	epatch "${FILESDIR}"/${P}-ffmpeg-avcodec_decode_audio2.patch
+}
+
 src_compile() {
 	${python} setup.py config || die "setup.py config failed"
 	if ! use ffmpeg; then
@@ -56,6 +67,9 @@ src_compile() {
 src_install() {
 	distutils_src_install --disable-autoupdate --skip-build \
 		$(use nls || echo "--disable-locales")
+
+	doicon picard-{16,32}.png
+	domenu picard.desktop
 }
 
 pkg_postinst() {