diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-04-12 09:39:09 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-04-12 09:39:09 +0000 |
| commit | 909843d31e20b8f910e9a5d42132effdec007ef4 (patch) | |
| tree | a958a2890ca7a9cf29a5375f5cfd1e3ab28744c0 /media-libs/xine-lib | |
| parent | Stable for x86, wrt bug #506154 (diff) | |
| download | gentoo-2-909843d31e20b8f910e9a5d42132effdec007ef4.tar.gz gentoo-2-909843d31e20b8f910e9a5d42132effdec007ef4.tar.bz2 gentoo-2-909843d31e20b8f910e9a5d42132effdec007ef4.zip | |
avformat requires >=ffmpeg-2.2 (bug #507474)
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'media-libs/xine-lib')
| -rw-r--r-- | media-libs/xine-lib/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/xine-lib/metadata.xml | 4 | ||||
| -rw-r--r-- | media-libs/xine-lib/xine-lib-1.2.5.ebuild | 11 |
3 files changed, 16 insertions, 5 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index f2a85e76aa01..cff9d6328021 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.702 2014/04/11 19:38:05 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.703 2014/04/12 09:39:09 polynomial-c Exp $ + + 12 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> xine-lib-1.2.5.ebuild, + metadata.xml: + avformat requires >=ffmpeg-2.2 (bug #507474). *xine-lib-1.2.5 (11 Apr 2014) diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml index 2fe887addfbf..004ae832024e 100644 --- a/media-libs/xine-lib/metadata.xml +++ b/media-libs/xine-lib/metadata.xml @@ -7,6 +7,10 @@ </maintainer> <longdescription>An open source library for media applications</longdescription> <use> + <flag name="avformat"> + Enables libformat support for reading and writing various media containers. + libavformat is part of FFmpeg. + </flag> <flag name="bluray"> Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg> </flag> diff --git a/media-libs/xine-lib/xine-lib-1.2.5.ebuild b/media-libs/xine-lib/xine-lib-1.2.5.ebuild index 365913934041..7e57c8391fa7 100644 --- a/media-libs/xine-lib/xine-lib-1.2.5.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.5.ebuild,v 1.1 2014/04/11 19:38:05 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.5.ebuild,v 1.2 2014/04/12 09:39:09 polynomial-c Exp $ EAPI=5 @@ -25,13 +25,16 @@ HOMEPAGE="http://xine.sourceforge.net/" LICENSE="GPL-2" SLOT="1" -IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}" +IUSE="a52 aac aalib +alsa altivec avformat bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}" +# At the time of this version bump only >=ffmpeg-2.2 provides the required +# .so library version for avformat support (>=55.19.0) (bug #507474). RDEPEND="${NLS_RDEPEND} dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib - || ( media-video/ffmpeg:0 media-libs/libpostproc media-video/libav ) + avformat? ( >=media-video/ffmpeg-2.2:0 ) + !avformat? ( || ( media-video/ffmpeg:0 media-libs/libpostproc media-video/libav ) ) virtual/ffmpeg virtual/libiconv a52? ( media-libs/a52dec ) @@ -143,7 +146,6 @@ src_configure() { [[ ${PV} == *9999* ]] || myconf="$(use_enable nls)" econf \ - --enable-avformat \ $(use_enable ipv6) \ $(use_enable altivec) \ $(use_enable vis) \ @@ -178,6 +180,7 @@ src_configure() { $(use_enable mng) \ --disable-real-codecs \ --disable-w32dll \ + $(use_enable avformat) \ $(use_enable vpx) \ $(use_with truetype freetype) $(use_with truetype fontconfig) \ $(use_with X x) \ |