diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-11-10 15:25:45 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-11-10 15:25:45 +0000 |
| commit | c283aa7910d06c1d24898c6dfcce8c1e70931170 (patch) | |
| tree | b499ca0c18dc695a30d0c5243a0ed8b6103da5c1 /media-video | |
| parent | Stable on arm, wrt bug #488802 (diff) | |
| download | gentoo-2-c283aa7910d06c1d24898c6dfcce8c1e70931170.tar.gz gentoo-2-c283aa7910d06c1d24898c6dfcce8c1e70931170.tar.bz2 gentoo-2-c283aa7910d06c1d24898c6dfcce8c1e70931170.zip | |
Fix pre-processor checks for 2.1.0 when avcodec USE flag is disabled; fixes bug #489612, reported by Maciej Piechotka.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.1.0.ebuild | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index f8014a6e6cc4..c212fd6c9faf 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vlc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.871 2013/10/27 13:24:41 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.872 2013/11/10 15:25:45 tomwij Exp $ + + 10 Nov 2013; Tom Wijsman <TomWij@gentoo.org> vlc-2.1.0.ebuild: + Fix pre-processor checks for 2.1.0 when avcodec USE flag is disabled; fixes + bug #489612, reported by Maciej Piechotka. 27 Oct 2013; Tom Wijsman <TomWij@gentoo.org> vlc-2.1.0.ebuild, vlc-2.1.9999.ebuild, vlc-9999.ebuild: diff --git a/media-video/vlc/vlc-2.1.0.ebuild b/media-video/vlc/vlc-2.1.0.ebuild index 075b6871dadc..1706ab20359f 100644 --- a/media-video/vlc/vlc-2.1.0.ebuild +++ b/media-video/vlc/vlc-2.1.0.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/vlc/vlc-2.1.0.ebuild,v 1.5 2013/10/27 13:24:41 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.0.ebuild,v 1.6 2013/11/10 15:25:45 tomwij Exp $ EAPI="5" @@ -241,6 +241,9 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.1.0-avcodec-check-update-buffered_time-earlier-so-we-sho.patch epatch "${FILESDIR}"/${PN}-2.1.0-transcode-don-t-check-drift-if-we-have-VLC_TS_INVALI.patch + # Disable avcodec checks when avcodec is not used. + sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die + eautoreconf # Disable automatic running of tests. |