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

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

aballier    10/07/22 20:44:05

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Add bzip2 and static-libs useflag, by Nikoli <nikoli@lavabit.com> in bug #324453 and fix my previous mistake by reintroducing the faad dep.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.363                media-video/ffmpeg/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- ChangeLog	22 Jul 2010 20:31:30 -0000	1.362
+++ ChangeLog	22 Jul 2010 20:44:05 -0000	1.363
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.362 2010/07/22 20:31:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.363 2010/07/22 20:44:05 aballier Exp $
+
+  22 Jul 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Add bzip2 and static-libs useflag, by Nikoli <nikoli@lavabit.com> in bug
+  #324453 and fix my previous mistake by reintroducing the faad dep.
 
   22 Jul 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
   sort rdepend, use same detection of live ebuild everywhere, cosmetics, by



1.46                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

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

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ffmpeg-9999-r1.ebuild	22 Jul 2010 20:31:30 -0000	1.45
+++ ffmpeg-9999-r1.ebuild	22 Jul 2010 20:44:05 -0000	1.46
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.45 2010/07/22 20:31:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.46 2010/07/22 20:44:05 aballier Exp $
 
 EAPI="2"
 
@@ -30,9 +30,9 @@
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="+3dnow +3dnowext alsa altivec amr bindist cpudetection custom-cflags
+IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags
 debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k
-+mmx +mmxext mp3 network oss pic rtmp schroedinger sdl speex +ssse3 test theora
++mmx +mmxext mp3 network oss pic rtmp schroedinger sdl speex +ssse3 static-libs test theora
 threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
@@ -44,6 +44,7 @@
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
+	bzip2? ( app-arch/bzip2 )
 	dirac? ( media-video/dirac )
 	encode? (
 		faac? ( media-libs/faac )
@@ -53,7 +54,6 @@
 		x264? ( >=media-libs/x264-0.0.20100605 )
 		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
-	faad? ( >=media-libs/faad2-2.6.1 )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -98,7 +98,9 @@
 	for i in debug doc network vaapi zlib; do
 		use ${i} || myconf="${myconf} --disable-${i}"
 	done
+	use bzip2 || myconf="${myconf} --disable-bzlib"
 	use sdl || myconf="${myconf} --disable-ffplay"
+	use static-libs || myconf="${myconf} --disable-static"
 
 	use custom-cflags && myconf="${myconf} --disable-optimizations"
 	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"