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

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 47 insertions, 19 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/Manifest b/media-sound/picard/Manifest
index a8090bcf2a65..571242905875 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX picard-0.10-ffmpeg-avcodec_decode_audio2.patch 828 RMD160 2f6607de98c71002b2bc457cc2977c1c644a912b SHA1 3d4ce74d8ace3ed067b70c3b67993b09bc047904 SHA256 40b9496c1a0287442a70f2742c08a014044d334a7bc6193278c9a5fe25e600d4
 AUX picard-0.10.0_rc1-ffmpeg-headers.patch 594 RMD160 9d7dbf3a4c8802269e478a2585498fe3f2860dc4 SHA1 61cda19d72af8500cdeac5fb710db6e4e2dca295 SHA256 1f7860958dd735f8b1abeebd9c0d271216a874c1ad3dee19ce88933c2a984f1c
 DIST picard-0.10.tar.gz 459526 RMD160 0c7bf4ac4471d8bf8faa56be6bb59ee0f6bca790 SHA1 e519d0b63a7e64d3c9131afa20a7ffca6a8a813c SHA256 dc86f5defcfef8e750e404369bdd1184b41cb944f3c37bb5bc5112ebab065777
-DIST picard-0.9.0.tar.gz 401571 RMD160 6e42ab1bea1ffe9dc7ca964f7080fea7c1fc24ad SHA1 45d04acfc1daef405e1b0e2a1779802c663ce8dc SHA256 5235de52a8e537b24be774a2ebdabd84679bf5adccf8a28766f8be9153a726b3
 EBUILD picard-0.10-r1.ebuild 2269 RMD160 57da0acd61b5a4d571265164f222f2ede58da4ee SHA1 33c9139941a7378addcabfb4006baac788d09332 SHA256 bfd478ec6a328de7d94bc6b1bf24ec2d874a4e94055f963d440bed1260a35fee
-EBUILD picard-0.9.0.ebuild 2033 RMD160 6e132257d0f288594ebc696b01ce00748e1b0fef SHA1 e41785259e3e891853aa5c5cb6d346c9fada6259 SHA256 d0e643df809fb1014222332f741b07b1283b459716078e2aff7e11c7274070db
-MISC ChangeLog 2751 RMD160 335096993a86e95acd98e7743cb4f9efe9a7c33a SHA1 ba27cab5bd68ef7473582a2fc02ab34d70cf02db SHA256 66ca693717d36e1d6f2dea78b6c4b37b7e20986ae17ca1b9c85c922ddedb364e
+EBUILD picard-0.10-r2.ebuild 2335 RMD160 1ede9f2414b5687fcb1438089b722c7f5c9a80d0 SHA1 2406dfd0788cc70551e36235b4675c596fcf9278 SHA256 17271ee02dcb1fcd1e4096e1126036612a4626683505e779834c453ae0b9a92c
+MISC ChangeLog 3008 RMD160 a606c3047a169cb18b6e22ab4f3ce04f31206833 SHA1 0bc167acc27c75dd81068fc0d1cd4ff59e81e991 SHA256 15a6991f8e2b03a72047de06dddd098dd1cbebd6240bc4b58575f38e65d6afbe
 MISC metadata.xml 806 RMD160 0aa68fa3348f1b73ac7af38d538357999b8efb6a SHA1 2ab1c62d1c765e1d5d79935309c9c1efc9867801 SHA256 08cb60249ced18a24e2a17fd2bccc19260875170022373e2193acaee779a8625
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkWxqQACgkQkKaRLQcq0GI/aQCfWjBzqbEyRpyfM/65uzt+q+ZY
-veYAn0VDFUE5SgaufuyBSSM6CS8PX71j
-=6nm6
------END PGP SIGNATURE-----
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() {