add libv4l useflag

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

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 1f288e56341c5405f7649d09083c8e758fdeba14..5014cf03b7938bee7355dd322832e4f842e185c6 100644 (file)
--- 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.481 2011/11/07 13:23:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.482 2011/11/07 13:30:57 aballier Exp $
+
+  07 Nov 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
+  metadata.xml:
+  add libv4l useflag
 
   07 Nov 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   add gnutls useflag

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 1c61b89bb2df5a780758c243f1fc975bfdae9040..68fb5d497d9579f839a596f137270de7e7e78e51 100644 (file)
--- 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 8601 RMD160 68fc39054fe75397170b34e46a938c08424a2e05 SHA1 bb16c6c583df8a11865da0181a95fb0261815b04 SHA256 b364d3ea589b19a94b3914a45fdbfcf97d5b919272682512232a56a70d95f45a
-MISC ChangeLog 69664 RMD160 6fdc4db714112ddfc816a24d8b940edeef9ccf03 SHA1 ca4f8314d0ecf31066f33d0f010ee16e81098c10 SHA256 23ef821b9b841bb2d27d0566af8aa970478b5df36599fefe984e550a86c521bf
-MISC metadata.xml 2862 RMD160 841a04e6fa02c8313032d35724df2b314e71a61b SHA1 9b8c0ecdf03b5e23b583cb83e175824845e0a099 SHA256 0db8ecae874692726285474c71dbc81af0d14c75efba28cad65a8a152ecd18f9
+EBUILD ffmpeg-9999.ebuild 8739 RMD160 d35aee49fd4c1c73665455f453854b8bed75f6b7 SHA1 8f8125bfd261815500833712587dad5b91951118 SHA256 ac466a391afc06a7a845ec0d528c93b94f641408ac92b9aca97e832140265205
+MISC ChangeLog 69774 RMD160 0d18247412029cd22d3e1939307e982b4c337481 SHA1 b130410b18e1311e3f3908b91865c2d2b871bf99 SHA256 4828486e1106a4d47af56da08ddd85dc29edbea49198fe190e3419fd4e0aa70c
+MISC metadata.xml 3022 RMD160 794769b4ccc4c9348f64b884ec5bdc9e81173994 SHA1 5b0d926db53d9e1314ed0fe2821d7952b5386133 SHA256 7566645dd9bf7db7cf3a7be1cfa3fec5c33f156aa52619a09a4b46f6581086ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6328EACgkQvFcC4BYPU0o44gCeKm3HyTQVrYghA499ePNqhZM0
-qPwAoKIOY0mylH+/YByjhpYDT3iHbZkQ
-=wvbB
+iEYEARECAAYFAk633ZcACgkQvFcC4BYPU0qDTwCdFOoWh9Fy2HDw5BmailS+1Gx3
+rhkAoLgrEO5Vy7c05qdQINyRtxUz+9q1
+=Eeqe
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 9731de496a3da003c287d88ff3f058a85b459123..d6389bc09aff9588ca384a35035a924208c637f0 100644 (file)
--- 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.61 2011/11/07 13:23:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.62 2011/11/07 13:30:57 aballier Exp $
 
 EAPI="4"
 
@@ -30,7 +30,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 fi
 IUSE="
        aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc
-       +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k
+       +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libv4l
        modplug mp3 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
@@ -68,6 +68,7 @@ RDEPEND="
        ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
        jack? ( media-sound/jack-audio-connection-kit )
        jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+       libv4l? ( media-libs/libv4l )
        modplug? ( media-libs/libmodplug )
        openal? ( >=media-libs/openal-1.1 )
        pulseaudio? ( media-sound/pulseaudio )
@@ -90,6 +91,7 @@ DEPEND="${RDEPEND}
        doc? ( app-text/texi2html )
        gnutls? ( dev-util/pkgconfig )
        ieee1394? ( dev-util/pkgconfig )
+       libv4l? ( dev-util/pkgconfig )
        mmx? ( dev-lang/yasm )
        rtmp? ( dev-util/pkgconfig )
        schroedinger? ( dev-util/pkgconfig )
@@ -98,7 +100,8 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 # faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )"
+REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+       libv4l? ( v4l )"
 
 S=${WORKDIR}/${P/_/-}
 
@@ -152,6 +155,7 @@ src_configure() {
        done
        use X && myconf="${myconf} --enable-x11grab"
        use pulseaudio && myconf="${myconf} --enable-libpulse"
+       use libv4l && myconf="${myconf} --enable-libv4l2"
        # Outdevs
        for i in alsa oss ; do
                use ${i} || myconf="${myconf} --disable-outdev=${i}"

diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index c8f3c611f53ad0039db51bd4bb83cd3a47246822..b7a0433fec140565a688174c47ebee42fc6e7053 100644 (file)
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -21,6 +21,7 @@
        <flag name="faac">Use external faac library for AAC encoding</flag>
        <flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
     <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
+       <flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
     <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>