add openssl useflag

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 18 insertions, 12 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/Manifest b/media-video/ffmpeg/Manifest
index bc3f34adec42..82c4997f8210 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -10,13 +10,13 @@ EBUILD ffmpeg-0.7.6.ebuild 8428 RMD160 605d4178c97232660275ed3e7b516b734f26dd83
 EBUILD ffmpeg-0.7.7.ebuild 8443 RMD160 b724f2c4f6ee80056bf4f93f49e5787ff2c5f1f4 SHA1 427bd743982b3f3f6673b10ca79e0a83a4ffe3dc SHA256 248ea1da5738e3eb06a4fe6d3e59e4991aac90a076fb4cc6361138a14528b8ad
 EBUILD ffmpeg-0.8.5.ebuild 8043 RMD160 6d0818622d1b63f56ca61ee97c7e2b1bb797d229 SHA1 7590930cb73be2c4333005f88a6680a23e308da1 SHA256 74aaf70cf001c3a3be73dd7ae2e28ade46f568ed6c795b5a032fda93731a18b0
 EBUILD ffmpeg-0.8.6.ebuild 8042 RMD160 4709694f4d6b3da1c20b6cd0e7f2783e8bcdd6f5 SHA1 170e0f605117aa622c6b42d1f60e252df9092b16 SHA256 ec9f7859106af231a8d8993dbd3ca2ec66b70eddc9761f7b8976f6007f558423
-EBUILD ffmpeg-9999.ebuild 8397 RMD160 4d8e612ce23db12417b239953e7d79f68402530e SHA1 c0804a573bd2348cdf9b171509e147fc718b3522 SHA256 967a946319071857f4d3e6bb3d905fd8a1a069f29ccf04e12eddfeaa41c3a2d9
-MISC ChangeLog 69459 RMD160 0589bbc9b2bc2604c21b04a5095559c3298ff479 SHA1 27a12e924ab9c311fd54838cbe1444ccc313d7f8 SHA256 ac86d9d04ea8eed1e597dcea433f9a256f788916b4a5e80e02b62faeb1ac38b3
-MISC metadata.xml 2730 RMD160 30f7472831c62be2fd787b0c914681db7853361e SHA1 3a5abcd6fc24ce3e19497aa4b3d5cbf740ef7a4d SHA256 1e86d46c8891df413c68f98fe41e61691820fb66781717394a03327b907eeddc
+EBUILD ffmpeg-9999.ebuild 8483 RMD160 a73c0c12024391fb7f25bd29a7574db7b8228555 SHA1 289b7e7c5b38defb7f4e7ac4b3c0c2d6f653e06f SHA256 101f5844994a02accc6b366d4f59d3b7ca66269a3da36a510cb109f1eeff2404
+MISC ChangeLog 69570 RMD160 f3543e7e5c752f17d3511060bc32e6b3700db33e SHA1 7385e5b564e8ab096e69929f3b2c3559253284c7 SHA256 ceaaf9ef825f9880314cb1a36d56b45664348812939c482708ba57a1e4f34cb2
+MISC metadata.xml 2862 RMD160 841a04e6fa02c8313032d35724df2b314e71a61b SHA1 9b8c0ecdf03b5e23b583cb83e175824845e0a099 SHA256 0db8ecae874692726285474c71dbc81af0d14c75efba28cad65a8a152ecd18f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk63z5oACgkQvFcC4BYPU0rdkQCbB/CS3EJ9fbJ7WlhbaKcyCKSY
-5lQAoLG83lb2lIvVCNsXVBrR5bQ+AhqP
-=T1bO
+iEYEARECAAYFAk632mQACgkQvFcC4BYPU0oWnQCgwx/BqzSSD5f79BuoU/QXlvh6
+yVEAoKnbeKRBkte46sZGZRWXKZtSdZfx
+=zPsM
 -----END PGP SIGNATURE-----
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>