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

[Samuli Suominen (ssuominen)]

ssuominen    11/11/01 00:37:26

  Modified:             ffmpeg-0.7.6.ebuild ffmpeg-9999.ebuild ChangeLog
                        ffmpeg-0.8.5.ebuild
  Log:
  Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt #385241
  
  (Portage version: 2.2.0_alpha71_p73/cvs/Linux x86_64)

Revision  Changes    Path
1.9                  media-video/ffmpeg/ffmpeg-0.7.6.ebuild

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

Index: ffmpeg-0.7.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.6.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ffmpeg-0.7.6.ebuild	23 Oct 2011 08:18:24 -0000	1.8
+++ ffmpeg-0.7.6.ebuild	1 Nov 2011 00:37:26 -0000	1.9
@@ -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-0.7.6.ebuild,v 1.8 2011/10/23 08:18:24 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.6.ebuild,v 1.9 2011/11/01 00:37:26 ssuominen Exp $
 
 EAPI="2"
 
@@ -32,8 +32,8 @@
 	+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection
 	custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables
 	ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp
-	schroedinger sdl speex +ssse3 static-libs test theora threads truetype v4l
-	v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib
+	schroedinger sdl speex +ssse3 static-libs test theora threads truetype
+	v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
 	"
 
 VIDEO_CARDS="nvidia"
@@ -87,7 +87,6 @@
 	test? ( net-misc/wget )
 	truetype? ( dev-util/pkgconfig )
 	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
 "
 
 S=${WORKDIR}/${P/_/-}
@@ -143,7 +142,10 @@
 	# libavdevice options
 	use ieee1394 && myconf="${myconf} --enable-libdc1394"
 	# Indevs
-	for i in v4l v4l2 alsa oss jack ; do
+	# v4l1 gone since linux-headers-2.6.38
+	myconf="${myconf} --disable-indev=v4l"
+	use v4l || myconf="${myconf} --disable-indev=v4l2"
+	for i in alsa oss jack ; do
 		use ${i} || myconf="${myconf} --disable-indev=${i}"
 	done
 	use X && myconf="${myconf} --enable-x11grab"



1.58                 media-video/ffmpeg/ffmpeg-9999.ebuild

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

Index: ffmpeg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ffmpeg-9999.ebuild	21 Oct 2011 12:52:01 -0000	1.57
+++ ffmpeg-9999.ebuild	1 Nov 2011 00:37:26 -0000	1.58
@@ -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.57 2011/10/21 12:52:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.58 2011/11/01 00:37:26 ssuominen Exp $
 
 EAPI="4"
 
@@ -32,7 +32,7 @@
 	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 qt-faststart rtmp schroedinger sdl speex static-libs
-	test theora threads truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid
+	test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid
 	+zlib
 	"
 
@@ -93,7 +93,6 @@
 	test? ( net-misc/wget )
 	truetype? ( dev-util/pkgconfig )
 	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
 "
 # faac is license-incompatible with ffmpeg
 REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) )"
@@ -140,7 +139,10 @@
 	use ieee1394 && myconf="${myconf} --enable-libdc1394"
 	use openal && myconf="${myconf} --enable-openal"
 	# Indevs
-	for i in v4l v4l2 alsa oss jack ; do
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf="${myconf} --disable-indev=v4l"
+	use v4l || myconf="${myconf} --disable-indev=v4l2"
+	for i in alsa oss jack ; do
 		use ${i} || myconf="${myconf} --disable-indev=${i}"
 	done
 	use X && myconf="${myconf} --enable-x11grab"



1.476                media-video/ffmpeg/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -r1.475 -r1.476
--- ChangeLog	23 Oct 2011 08:18:24 -0000	1.475
+++ ChangeLog	1 Nov 2011 00:37:26 -0000	1.476
@@ -1,6 +1,11 @@
 # 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.475 2011/10/23 08:18:24 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.476 2011/11/01 00:37:26 ssuominen Exp $
+
+  01 Nov 2011; Samuli Suominen <ssuominen@g.o> ffmpeg-0.7.6.ebuild,
+  ffmpeg-0.8.5.ebuild, ffmpeg-9999.ebuild:
+  Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt
+  #385241
 
   23 Oct 2011; Kacper Kowalik <xarthisius@g.o>
   +files/ffmpeg-0.7.6-fix_ppc64_32ul.patch, ffmpeg-0.7.6.ebuild:



1.2                  media-video/ffmpeg/ffmpeg-0.8.5.ebuild

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

Index: ffmpeg-0.8.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.8.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-0.8.5.ebuild	5 Oct 2011 14:06:08 -0000	1.1
+++ ffmpeg-0.8.5.ebuild	1 Nov 2011 00:37:26 -0000	1.2
@@ -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-0.8.5.ebuild,v 1.1 2011/10/05 14:06:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.8.5.ebuild,v 1.2 2011/11/01 00:37:26 ssuominen Exp $
 
 EAPI="4"
 
@@ -32,7 +32,7 @@
 	aac aacplus alsa amr bindist +bzip2 celt cpudetection debug dirac doc
 	+encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network
 	oss pic qt-faststart rtmp schroedinger sdl speex static-libs test theora
-	threads truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib
+	threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
 	"
 
 # String for CPU features in the useflag[:configure_option] form
@@ -89,7 +89,6 @@
 	test? ( net-misc/wget )
 	truetype? ( dev-util/pkgconfig )
 	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
 "
 # faac is license-incompatible with ffmpeg
 REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) )"
@@ -134,7 +133,10 @@
 	# libavdevice options
 	use ieee1394 && myconf="${myconf} --enable-libdc1394"
 	# Indevs
-	for i in v4l v4l2 alsa oss jack ; do
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf="${myconf} --disable-indev=v4l"
+	use v4l || myconf="${myconf} --disable-indev=v4l2"
+	for i in alsa oss jack ; do
 		use ${i} || myconf="${myconf} --disable-indev=${i}"
 	done
 	use X && myconf="${myconf} --enable-x11grab"