diff options
| author |   Christian Faulhammer <fauli@gentoo.org> | 2008-04-28 22:54:18 +0000 |
|---|---|---|
| committer | Christian Faulhammer <fauli@gentoo.org> | 2008-04-28 22:54:18 +0000 |
| commit | 8a1b10351bca7f0b05b09b17b7ea5a992071e3aa (patch) | |
| tree | 865cb863555a03e3e145a8d6301f3756c6a61e80 | |
| parent | Version bump (bug #201846). (diff) | |
| download | historical-8a1b10351bca7f0b05b09b17b7ea5a992071e3aa.tar.gz historical-8a1b10351bca7f0b05b09b17b7ea5a992071e3aa.tar.bz2 historical-8a1b10351bca7f0b05b09b17b7ea5a992071e3aa.zip | |
make it work with some newer versions of ffmpeg, see bug 218105; patch provided by Ben de Groot <yngwin AT gentoo DOT org>
Package-Manager: portage-2.1.4.4
| -rw-r--r-- | media-sound/cmus/ChangeLog | 9 | ||||
| -rw-r--r-- | media-sound/cmus/Manifest | 15 | ||||
| -rw-r--r-- | media-sound/cmus/cmus-2.2.0.ebuild | 13 | ||||
| -rw-r--r-- | media-sound/cmus/files/cmus-2.2.0-new-ffmpeg.patch | 15 |
4 files changed, 46 insertions, 6 deletions
diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog index 5a9e6c92fb73..4d75355f119f 100644 --- a/media-sound/cmus/ChangeLog +++ b/media-sound/cmus/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/cmus -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.17 2007/10/14 11:34:11 opfer Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.18 2008/04/28 22:54:17 opfer Exp $ + + 28 Apr 2008; Christian Faulhammer <opfer@gentoo.org> + +files/cmus-2.2.0-new-ffmpeg.patch, cmus-2.2.0.ebuild: + make it work with some newer versions of ffmpeg, see bug 218105; patch + provided by Ben de Groot <yngwin AT gentoo DOT org> 14 Oct 2007; Christian Faulhammer <opfer@gentoo.org> cmus-2.2.0.ebuild: new HOMEPAGE value and new download location diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest index 030a88b7e54f..abb7e0821859 100644 --- a/media-sound/cmus/Manifest +++ b/media-sound/cmus/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX cmus-2.2.0-new-ffmpeg.patch 395 RMD160 dc96f1b0f7cd44d16ca8cfda6f5ec9ceb8f62a8b SHA1 d4cb8d41e374cdd06c57172567afac9c13436a55 SHA256 613ff226ed5eaf74ad0314cb7032bc64221b7588bd16d831fbcd709a701a8ca5 DIST cmus-2.2.0.tar.bz2 155448 RMD160 1287666c16332ad34222461e29d8355ef607e7b5 SHA1 a6472633ac55660eb3aec5d2ae0296da86903bb2 SHA256 f18ffafc7161a383ddc79b34cc16a5a38f675454c49799dac5d172bf22d12005 -EBUILD cmus-2.2.0.ebuild 2853 RMD160 fc53fa805b7351fdf302da99ec364b15de215cab SHA1 a5689981768d000014bc472f83d63d3502640398 SHA256 1d3231c0acdd67414d079e1ffb6dacf6de7fe9254549465f76f5b1014280d20c -MISC ChangeLog 2939 RMD160 2f1048522f34110fa9a7711a268be3bc8d6771db SHA1 ee70f6cfda831b3d0f2eabfd572ca0a388513ce4 SHA256 94fdf756ac899998a450f863748c1e4bbd8eb6658f423d4d2b55efb691da704f +EBUILD cmus-2.2.0.ebuild 3014 RMD160 8366fa71d85e7f5a46800bd316e0c20e56937fb7 SHA1 6bf7f8ec903144c70327e99f7aff7f8ca9140510 SHA256 fc80fa8e18670959a5323c6d8c0ea36da2f0a63b9552a2629346390201dc2bc8 +MISC ChangeLog 3179 RMD160 d1f6867364654db4fcd60a4b725c67aa5aa5cf02 SHA1 f2b3cb137be3931431f4d1cf916774b92b60398f SHA256 4c20d1a90cb874a3c3bfd090e70ce692f9e184f4cf3b2bf93ee3581f2ecdecec MISC metadata.xml 267 RMD160 20bfbfa228d9c5ca5763d1285b306583ff0e3f03 SHA1 0c2d8a6d417e0503516229d097e19f591ae92ffb SHA256 bed7dbe54b8db30cba32aa717fb01c066c35e22fc43531bd5464111646ee4a16 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkgWVZ8ACgkQNQqtfCuFneMAqwCeMrau/JuKULucdqm9JxpDvhhV +8D4AnjtWX8XUR7wYCSByhAqHtIlcVYkf +=fL1D +-----END PGP SIGNATURE----- diff --git a/media-sound/cmus/cmus-2.2.0.ebuild b/media-sound/cmus/cmus-2.2.0.ebuild index dfff93c3c1df..5b1852b45187 100644 --- a/media-sound/cmus/cmus-2.2.0.ebuild +++ b/media-sound/cmus/cmus-2.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.2.0.ebuild,v 1.6 2007/10/14 11:34:11 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.2.0.ebuild,v 1.7 2008/04/28 22:54:17 opfer Exp $ inherit eutils multilib @@ -54,6 +54,15 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + cd "${WORKDIR}" + if $(has_version ">=media-video/ffmpeg-0.4.9_p20080326") + then + epatch "${FILESDIR}"/${P}-new-ffmpeg.patch + fi +} + src_compile() { local debuglevel=1 myconf="CONFIG_SUN=n" diff --git a/media-sound/cmus/files/cmus-2.2.0-new-ffmpeg.patch b/media-sound/cmus/files/cmus-2.2.0-new-ffmpeg.patch new file mode 100644 index 000000000000..89812b21b193 --- /dev/null +++ b/media-sound/cmus/files/cmus-2.2.0-new-ffmpeg.patch @@ -0,0 +1,15 @@ +--- cmus-2.2.0-orig/ffmpeg.c 2007-07-27 16:52:13.000000000 +0200 ++++ cmus-2.2.0/ffmpeg.c 2008-04-25 16:32:40.000000000 +0200 +@@ -18,9 +18,9 @@ + */ + + #include <stdio.h> +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/avio.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> ++#include <libavformat/avio.h> + + #include "ip.h" + #include "xmalloc.h" |