summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-04-21 09:01:16 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-04-21 09:01:16 +0000
commit9e070a5fd6085c7d289792a49334de436569d84a (patch)
tree7dbfcfec8d878b76a9eb927bc66c94856c514488 /media-sound
parentFix build with new ffmpeg/libav. FIxes bug#409685. (diff)
downloadgentoo-2-9e070a5fd6085c7d289792a49334de436569d84a.tar.gz
gentoo-2-9e070a5fd6085c7d289792a49334de436569d84a.tar.bz2
gentoo-2-9e070a5fd6085c7d289792a49334de436569d84a.zip
Fix building with newer libav api. Fixes bug#390821.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/potamus/ChangeLog8
-rw-r--r--media-sound/potamus/potamus-0.11.ebuild46
-rw-r--r--media-sound/potamus/potamus-0.12.ebuild18
3 files changed, 19 insertions, 53 deletions
diff --git a/media-sound/potamus/ChangeLog b/media-sound/potamus/ChangeLog
index 977af987e0b4..4749f9d00c9b 100644
--- a/media-sound/potamus/ChangeLog
+++ b/media-sound/potamus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/potamus
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/ChangeLog,v 1.9 2011/04/21 19:36:14 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/ChangeLog,v 1.10 2012/04/21 09:01:15 scarabeus Exp $
+
+ 21 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> -potamus-0.11.ebuild,
+ potamus-0.12.ebuild:
+ Fix building with newer libav api. Fixes bug#390821.
*potamus-0.12 (21 Apr 2011)
diff --git a/media-sound/potamus/potamus-0.11.ebuild b/media-sound/potamus/potamus-0.11.ebuild
deleted file mode 100644
index 781fae401152..000000000000
--- a/media-sound/potamus/potamus-0.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/potamus-0.11.ebuild,v 1.2 2011/04/21 19:36:14 radhermit Exp $
-
-EAPI=2
-inherit gnome2-utils
-
-DESCRIPTION="a lightweight audio player with a simple interface and an emphasis on high audio quality."
-HOMEPAGE="http://offog.org/code/potamus.html"
-SRC_URI="http://offog.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
- >=gnome-base/libglade-2
- media-libs/libao
- media-libs/libsamplerate
- media-libs/libvorbis
- media-libs/libmad
- media-libs/audiofile
- media-libs/libmodplug
- virtual/ffmpeg
- media-libs/flac
- media-sound/jack-audio-connection-kit"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc NEWS README TODO
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/media-sound/potamus/potamus-0.12.ebuild b/media-sound/potamus/potamus-0.12.ebuild
index 048ea12ad0f7..0eac2213e2bc 100644
--- a/media-sound/potamus/potamus-0.12.ebuild
+++ b/media-sound/potamus/potamus-0.12.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/potamus-0.12.ebuild,v 1.1 2011/04/21 19:36:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/potamus-0.12.ebuild,v 1.2 2012/04/21 09:01:15 scarabeus Exp $
+
+EAPI=4
-EAPI=2
inherit gnome2
DESCRIPTION="a lightweight audio player with a simple interface and an emphasis on high audio quality."
@@ -28,7 +29,14 @@ RDEPEND="x11-libs/gtk+:2
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+src_prepare() {
+ gnome2_src_prepare
+
+ sed -i -e \
+ 's:CODEC_TYPE_AUDIO:AVMEDIA_TYPE_AUDIO:g' \
+ src/input-avcodec.c || die
+}
+
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc NEWS README TODO
+ default
}