diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-11-07 13:17:18 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-11-07 13:17:18 +0000 |
| commit | cd02a044a515842420de34d966913e72fd27cc33 (patch) | |
| tree | 2230dc21772f49d35083651800d5ca4fc89ad43b /media-video/ffmpeg | |
| parent | remove mask for texlive packages that are now gone (diff) | |
| download | gentoo-2-cd02a044a515842420de34d966913e72fd27cc33.tar.gz gentoo-2-cd02a044a515842420de34d966913e72fd27cc33.tar.bz2 gentoo-2-cd02a044a515842420de34d966913e72fd27cc33.zip | |
add openssl useflag
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 11 | ||||
| -rw-r--r-- | media-video/ffmpeg/metadata.xml | 1 |
3 files changed, 12 insertions, 6 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 8e0ff2250ce7..ef2da66726ef 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.479 2011/11/07 12:31:16 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.480 2011/11/07 13:17:18 aballier Exp $ + + 07 Nov 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild, + metadata.xml: + add openssl useflag *ffmpeg-0.8.6 (07 Nov 2011) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index dd2f39c1e23b..5f63b49d703e 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.59 2011/11/02 14:08:52 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.60 2011/11/07 13:17:18 aballier Exp $ EAPI="4" @@ -31,9 +31,9 @@ fi IUSE=" aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k modplug mp3 - network openal oss pic pulseaudio qt-faststart rtmp schroedinger sdl speex - static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 - xvid +zlib + network openal openssl oss pic pulseaudio qt-faststart rtmp schroedinger sdl + speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X + x264 xvid +zlib " # String for CPU features in the useflag[:configure_option] form @@ -96,7 +96,7 @@ DEPEND="${RDEPEND} v4l? ( sys-kernel/linux-headers ) " # faac is license-incompatible with ffmpeg -REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) )" +REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )" S=${WORKDIR}/${P/_/-} @@ -119,6 +119,7 @@ src_configure() { use sdl || myconf="${myconf} --disable-ffplay" use cpudetection && myconf="${myconf} --enable-runtime-cpudetect" + use openssl && myconf="${myconf} --enable-openssl --enable-nonfree" # Encoders if use encode diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index 80da8f959fe8..c8f3c611f53a 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -24,6 +24,7 @@ <flag name="mmxext">Enables mmx2 support</flag> <flag name="neon">Enables NEON optimizations for arm processors.</flag> <flag name="network">Enables network streaming support</flag> + <flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag> <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag> <flag name="qt-faststart">Build and install qt-faststart application</flag> <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag> |