diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-01-17 14:04:36 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-01-17 14:04:36 +0000 |
| commit | 008e8fc8eb95caaf2626fb00388c08bf6fffde49 (patch) | |
| tree | d36e45d36aab7b371297c1e0fc407522dfd6af8f /media-video/mplayer/mplayer-1.1-r1.ebuild | |
| parent | Add a comment to make clear we need sys-apps/man (for man2html) and not just ... (diff) | |
| download | historical-008e8fc8eb95caaf2626fb00388c08bf6fffde49.tar.gz historical-008e8fc8eb95caaf2626fb00388c08bf6fffde49.tar.bz2 historical-008e8fc8eb95caaf2626fb00388c08bf6fffde49.zip | |
Apply only conditionally the libav-9 patch since it breaks with all non-masked version of ffmpeg or libav...
Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video/mplayer/mplayer-1.1-r1.ebuild')
| -rw-r--r-- | media-video/mplayer/mplayer-1.1-r1.ebuild | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media-video/mplayer/mplayer-1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1-r1.ebuild index fa0e675cd139..7e74c6795c4f 100644 --- a/media-video/mplayer/mplayer-1.1-r1.ebuild +++ b/media-video/mplayer/mplayer-1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.15 2013/01/17 09:01:57 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.16 2013/01/17 14:04:28 aballier Exp $ EAPI=4 @@ -195,7 +195,6 @@ PATCHES=( "${FILESDIR}/${PN}-1.0_rc4-pkg-config.patch" "${FILESDIR}/${P}-ffmpeg.patch" "${FILESDIR}/${P}-libav-0.8.patch" - "${FILESDIR}/${P}-libav-9.patch" "${FILESDIR}/${P}-codecid.patch" ) @@ -269,6 +268,9 @@ src_prepare() { fi base_src_prepare + if has_version '>=media-video/libav-9_rc' || has_version '>=media-video/ffmpeg-1' ; then + epatch "${FILESDIR}/${P}-libav-9.patch" + fi } src_configure() { |