diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-01-17 14:04:28 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-01-17 14:04:28 +0000 |
| commit | e2a0d51b12d7284e8cbbddcdf7fb4eb723c3c862 (patch) | |
| tree | 5b40c61d1e7231769a28c8280d84fa727932bf3d /media-video/mplayer | |
| parent | Add a comment to make clear we need sys-apps/man (for man2html) and not just ... (diff) | |
| download | gentoo-2-e2a0d51b12d7284e8cbbddcdf7fb4eb723c3c862.tar.gz gentoo-2-e2a0d51b12d7284e8cbbddcdf7fb4eb723c3c862.tar.bz2 gentoo-2-e2a0d51b12d7284e8cbbddcdf7fb4eb723c3c862.zip | |
Apply only conditionally the libav-9 patch since it breaks with all non-masked version of ffmpeg or libav...
(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.1-r1.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index ea3fbcee44dd..fbdcfea192e8 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.869 2013/01/17 09:01:57 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.870 2013/01/17 14:04:28 aballier Exp $ + + 17 Jan 2013; Alexis Ballier <aballier@gentoo.org> mplayer-1.1-r1.ebuild: + Apply only conditionally the libav-9 patch since it breaks with all + non-masked version of ffmpeg or libav... 17 Jan 2013; Luca Barbato <lu_zero@gentoo.org> mplayer-1.1-r1.ebuild, +files/mplayer-1.1-libav-9.patch: 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() { |