Version bump and added patch for new ffmpeg headers compatibility (bug #223949), thanks to Ben de Groot.

Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.25-gentoo-r3 x86_64

4 files changed, 101 insertions, 2 deletions

diff --git a/media-sound/picard/ChangeLog b/media-sound/picard/ChangeLog
index bcefc2f64ccf..2b0750458603 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.9 2008/04/11 12:46:09 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.10 2008/06/13 15:45:20 coldwind Exp $
+
+*picard-0.10.0_rc1 (13 Jun 2008)
+
+  13 Jun 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/picard-0.10.0_rc1-ffmpeg-headers.patch, +picard-0.10.0_rc1.ebuild:
+  Version bump and added patch for new ffmpeg headers compatibility (bug
+  #223949), thanks to Ben de Groot.
 
   11 Apr 2008; Santiago M. Mola <coldwind@gentoo.org> picard-0.9.0.ebuild:
   Remove qt-4.2 dep wrt bug #217190
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index f667b7f81eca..a49f21507b60 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,7 @@
+AUX picard-0.10.0_rc1-ffmpeg-headers.patch 594 RMD160 9d7dbf3a4c8802269e478a2585498fe3f2860dc4 SHA1 61cda19d72af8500cdeac5fb710db6e4e2dca295 SHA256 1f7860958dd735f8b1abeebd9c0d271216a874c1ad3dee19ce88933c2a984f1c
+DIST picard-0.10.0rc1.tar.gz 448969 RMD160 da3721ef777a82fb4cf1e7063b10fdbd12b66e87 SHA1 96587dc2bfcb694c80bfcd5e2abb170ac681987c SHA256 419a939f74d8476eabd880f82039254d150e6e97bb3f822ed990bb755de22226
 DIST picard-0.9.0.tar.gz 401571 RMD160 6e42ab1bea1ffe9dc7ca964f7080fea7c1fc24ad SHA1 45d04acfc1daef405e1b0e2a1779802c663ce8dc SHA256 5235de52a8e537b24be774a2ebdabd84679bf5adccf8a28766f8be9153a726b3
+EBUILD picard-0.10.0_rc1.ebuild 2040 RMD160 d7a597739a159a3e2196c5acf90178221c61165f SHA1 b2fe39f94569dbb84fbafd9261bad4d7feb231bc SHA256 c1c45b1cd2ee354fe4d37018e6ec72058b27ff5fb1f71a0eea3712e1c88f40af
 EBUILD picard-0.9.0.ebuild 1846 RMD160 57a176c0f722fd858faa52fb32e65d400863c0da SHA1 04bd8308e26b431d12fef011e870206b85eb9624 SHA256 ff8b0343dac1a57d3636f5cea94c5e8dfe5255459f5b590ed57d89f932e0036a
-MISC ChangeLog 1654 RMD160 26697b34bfcf02ead86127ee22c191c49aa49739 SHA1 cae711ce40447ff5f5926eec7c0f34978427dd04 SHA256 0c12b409bf098cdef4ad30048e85d506fd64a349bdce0b2fc319b6cd467d9680
+MISC ChangeLog 1929 RMD160 63e15351d8c02e73f817121cdeeb77539f785216 SHA1 db5aeb36f0425719a6b77a88dea7f079601ba73a SHA256 8eee98bfd5862fe635fa4bd1b6d0a9b00de60748a36aecd20da2e02680d37ee5
 MISC metadata.xml 700 RMD160 acb7a92f8d83b1aeed710ddbaba14e6acf156aab SHA1 ef7dd0f244890ca785d3600f15786834388e5917 SHA256 1168298f9b8bab4d9d7edbf6bc1ac4b87e68380de4ea2455629e0bb3560d2839
diff --git a/media-sound/picard/files/picard-0.10.0_rc1-ffmpeg-headers.patch b/media-sound/picard/files/picard-0.10.0_rc1-ffmpeg-headers.patch
new file mode 100644
index 000000000000..16733ce1ab36
--- /dev/null
+++ b/media-sound/picard/files/picard-0.10.0_rc1-ffmpeg-headers.patch
@@ -0,0 +1,18 @@
+Source: Imported from Berkano overlay, by Ben de Groot.
+Upstream: Sent, http://bugs.musicbrainz.org/ticket/3777
+Reason: Compatibility with new ffmpeg headers,
+        starting from media-video/ffmpeg-0.4.9_p20080326.
+--- picard-0.10.0rc1-orig/picard/musicdns/avcodec.c 2008-05-29 00:10:50.000000000 +0200
++++ picard-0.10.0rc1/picard/musicdns/avcodec.c  2008-05-29 00:11:17.000000000 +0200
+@@ -24,8 +24,8 @@
+ #define inline __inline
+ #endif
+ 
+-#include <avcodec.h>
+-#include <avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ #include <Python.h>
+ 
+ #ifdef _WIN32
+
diff --git a/media-sound/picard/picard-0.10.0_rc1.ebuild b/media-sound/picard/picard-0.10.0_rc1.ebuild
new file mode 100644
index 000000000000..7a977454b28f
--- /dev/null
+++ b/media-sound/picard/picard-0.10.0_rc1.ebuild
@@ -0,0 +1,71 @@
+# 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.10.0_rc1.ebuild,v 1.1 2008/06/13 15:45:20 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/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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.13
+	cdaudio? ( >=media-libs/libdiscid-0.1.1 )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326
+		>=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
+		ewarn "The 'ffmpeg' USE flag is disabled. Acoustic fingerprinting and"
+		ewarn "recognition will not be available."
+	fi
+	if ! use cdaudio; then
+		ewarn "The 'cdaudio' USE flag is disabled. CD index lookup and"
+		ewarn "identification will not be available. You can get audio CD support"
+		ewarn "by installing media-libs/libdiscid."
+	fi
+
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# This raises ffmpeg dep to >=0.4.9_p20080326
+	epatch "${FILESDIR}"/${P}-ffmpeg-headers.patch
+}
+
+src_compile() {
+	${python} setup.py config || die "setup.py config failed"
+	if ! use ffmpeg; then
+		sed -i -e "s:\(^with-avcodec\ =\ \).*:\1False:" \
+			-e "s:\(^with-libofa\ =\ \).*:\1False:" \
+			build.cfg || die "sed failed"
+	fi
+	${python} setup.py build $(use nls || echo "--disable-locales") \
+		|| die "setup.py build failed"
+}
+
+src_install() {
+	distutils_src_install --disable-autoupdate --skip-build \
+		$(use nls || echo "--disable-locales")
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	echo
+	elog "You should set the environment variable BROWSER to something like"
+	elog "\"firefox '%s' &\" to let python know which browser to use."
+}