summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2008-12-10 16:51:43 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2008-12-10 16:51:43 +0000
commit5cdfc661d5b5fb94777ee94dd19b7cba35f70f12 (patch)
treea7fc25a0bcc9bb7a4dbdf0b5b06d9aaeb1fe9415 /media-sound/potamus
parentVersion bump, bug #249949. (diff)
downloadhistorical-5cdfc661d5b5fb94777ee94dd19b7cba35f70f12.tar.gz
historical-5cdfc661d5b5fb94777ee94dd19b7cba35f70f12.tar.bz2
historical-5cdfc661d5b5fb94777ee94dd19b7cba35f70f12.zip
Fix building with recent FFMPEG versions, thanks to loki_val for advice.
Package-Manager: portage-2.1.6/cvs/Linux 2.6.27.7 i686
Diffstat (limited to 'media-sound/potamus')
-rw-r--r--media-sound/potamus/ChangeLog6
-rw-r--r--media-sound/potamus/Manifest5
-rw-r--r--media-sound/potamus/files/potamus-0.9-ffmpeg.patch14
-rw-r--r--media-sound/potamus/potamus-0.9.ebuild12
4 files changed, 31 insertions, 6 deletions
diff --git a/media-sound/potamus/ChangeLog b/media-sound/potamus/ChangeLog
index 50e89ec7240e..079fa6a24065 100644
--- a/media-sound/potamus/ChangeLog
+++ b/media-sound/potamus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/potamus
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/ChangeLog,v 1.4 2008/01/26 12:11:01 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/ChangeLog,v 1.5 2008/12/10 16:51:43 ssuominen Exp $
+
+ 10 Dec 2008; <ssuominen@gentoo.org> +files/potamus-0.9-ffmpeg.patch,
+ potamus-0.9.ebuild:
+ Fix building with recent FFMPEG versions, thanks to loki_val for advice.
*potamus-0.9 (26 Jan 2008)
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
index 2e53c567f3a9..806223aa1707 100644
--- a/media-sound/potamus/Manifest
+++ b/media-sound/potamus/Manifest
@@ -1,4 +1,5 @@
+AUX potamus-0.9-ffmpeg.patch 462 RMD160 2ad986897db7e96fd618f23270a3fb62178981cf SHA1 aa481833f996906fb38f13846f5f236bcf678f7b SHA256 7dd997c98f31fc33d069ddf8d49e65f5f1904dc7faa88e988971a3c708db2e84
DIST potamus-0.9.tar.gz 116386 RMD160 84344c016f06e76ff9634fa3576d7a8150baf78c SHA1 6e3f67fe558ee3a09f9007fbbf7386e488357eeb SHA256 c30b4a36ab2cc0a72f36693931240684cf0a0ab5e585c1cd56c841fc683d372c
-EBUILD potamus-0.9.ebuild 974 RMD160 04a42daaf17616e0c1068d2d1cce289a1edf5cc4 SHA1 b4d56316f370ad81f4e96747da1482a6807794bf SHA256 fc3c669fdd4f882c56e46c906ad84ab39a96f8c4a3283b47ec2c98e5bd73ec0a
-MISC ChangeLog 915 RMD160 2e6040a908cfefe1a21986f223edc911a97fcec7 SHA1 07bc878b6dc08f941608a74c2f366590cc6719d8 SHA256 4b495fa6707ce7649f96c9d615935b5ad6f8d9478dec48a77df4192c8ec52366
+EBUILD potamus-0.9.ebuild 1086 RMD160 5f8bc45b9cb4fc962a904ecdaba1f9b32b34d0e3 SHA1 92aeaf3967be7d29ce382f9f5b70122740f7beb6 SHA256 8dd8487b29a6755b8c980aa010b67db595735119b41e6b54c047be0141106dd2
+MISC ChangeLog 1089 RMD160 42eb690423442e972c86bf3fd93011f5439b6794 SHA1 a05bcb6ad60f2b8945ca57ec8a93b5075c1bfa42 SHA256 e279b83ea7292015a3a68c7f73a08d304d22429b3151a8c0a3c57cd007bac5dd
MISC metadata.xml 219 RMD160 1311be2ec3797b97e67acd02afa5083523d06721 SHA1 8d1e8571dd1d104255107dd46473ddc08e0de932 SHA256 5cceaad9e92392f27e672ac3a4c7127bf5b8f60a737788cd6d4856568e2f795c
diff --git a/media-sound/potamus/files/potamus-0.9-ffmpeg.patch b/media-sound/potamus/files/potamus-0.9-ffmpeg.patch
new file mode 100644
index 000000000000..6e8252ac293b
--- /dev/null
+++ b/media-sound/potamus/files/potamus-0.9-ffmpeg.patch
@@ -0,0 +1,14 @@
+diff -ur potamus-0.9.orig/src/input-avcodec.c potamus-0.9/src/input-avcodec.c
+--- potamus-0.9.orig/src/input-avcodec.c 2007-12-02 17:55:57.000000000 +0200
++++ potamus-0.9/src/input-avcodec.c 2008-12-10 18:48:29.000000000 +0200
+@@ -19,8 +19,8 @@
+
+ #include <glib.h>
+ #include <stdlib.h>
+-#include <avcodec.h>
+-#include <avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ #include "buffer.h"
+ #include "format.h"
+ #include "input.h"
diff --git a/media-sound/potamus/potamus-0.9.ebuild b/media-sound/potamus/potamus-0.9.ebuild
index 396c0b22bda6..b2e6c58652fc 100644
--- a/media-sound/potamus/potamus-0.9.ebuild
+++ b/media-sound/potamus/potamus-0.9.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/potamus-0.9.ebuild,v 1.1 2008/01/26 12:11:01 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/potamus-0.9.ebuild,v 1.2 2008/12/10 16:51:43 ssuominen Exp $
-inherit gnome2-utils
+inherit eutils 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"
@@ -21,12 +21,18 @@ RDEPEND=">=x11-libs/gtk+-2
media-libs/libmad
media-libs/audiofile
media-libs/libmodplug
- media-video/ffmpeg
+ >=media-video/ffmpeg-0.4.9_p20080326
media-libs/flac
media-libs/bio2jack"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-ffmpeg.patch
+}
+
src_install() {
emake DESTDIR="${D}" install || die "emake install failed."
dodoc NEWS README TODO