[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999.ebuild metadata.xml ChangeLog

["Alexis Ballier (aballier)" <aballier@gentoo.org>]

aballier    11/11/07 13:17:18

  Modified:             ffmpeg-9999.ebuild metadata.xml ChangeLog
  Log:
  add openssl useflag
  
  (Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

Revision  Changes    Path
1.60                 media-video/ffmpeg/ffmpeg-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.59&r2=1.60

Index: ffmpeg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ffmpeg-9999.ebuild	2 Nov 2011 14:08:52 -0000	1.59
+++ ffmpeg-9999.ebuild	7 Nov 2011 13:17:18 -0000	1.60
@@ -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 @@
 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 @@
 	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 @@
 	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



1.32                 media-video/ffmpeg/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?r1=1.31&r2=1.32

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/metadata.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- metadata.xml	27 Sep 2011 18:14:53 -0000	1.31
+++ metadata.xml	7 Nov 2011 13:17:18 -0000	1.32
@@ -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>



1.480                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.480&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.480&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.479&r2=1.480

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -r1.479 -r1.480
--- ChangeLog	7 Nov 2011 12:31:16 -0000	1.479
+++ ChangeLog	7 Nov 2011 13:17:18 -0000	1.480
@@ -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)