From: "Alexis Ballier (aballier)" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999.ebuild ChangeLog
Date: Wed, 18 Feb 2015 11:52:45 +0000 (UTC) [thread overview]
Message-ID: <20150218115245.4ABDD12059@oystercatcher.gentoo.org> (raw)
aballier 15/02/18 11:52:45
Modified: ffmpeg-9999.ebuild ChangeLog
Log:
factorize filling IUSE and the map useflag -> configure option.
Signed-off-by: aballier@gentoo.org
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.182 media-video/ffmpeg/ffmpeg-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.182&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.182&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.181&r2=1.182
Index: ffmpeg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- ffmpeg-9999.ebuild 18 Feb 2015 10:47:35 -0000 1.181
+++ ffmpeg-9999.ebuild 18 Feb 2015 11:52:45 -0000 1.182
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.181 2015/02/18 10:47:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.182 2015/02/18 11:52:45 aballier Exp $
EAPI="5"
@@ -57,15 +57,48 @@
if [ "${PV#9999}" = "${PV}" ] ; then
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+ +bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl
+ +hardcoded-tables +iconv lzma +network openssl +postproc
+ samba:libsmbclient sdl:ffplay vaapi vdpau X:xlib xcb:libxcb
+ xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+ # libavdevice options
+ cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+ opengl
+ # indevs
+ libv4l:libv4l2 pulseaudio:libpulse
+ # decoders
+ amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+ jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+ modplug:libmodplug opus:libopus quvi:libquvi rtmp:librtmp ssh:libssh
+ schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+ zvbi:libzvbi
+ # libavfilter options
+ bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa
+ libass truetype:libfreetype
+ # libswresample options
+ libsoxr
+ # Threads; we only support pthread for now but ffmpeg supports more
+ +threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+ aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame
+ aacplus:libaacplus faac:libfaac theora:libtheora twolame:libtwolame
+ wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
IUSE="
- aac aacplus alsa amr amrenc bindist bluray bs2b +bzip2 cdio celt
- cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
- fribidi gme gnutls +gpl gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
- jpeg2k ladspa libass libcaca libsoxr libv4l lzma modplug mp3 +network
- openal opengl openssl opus oss pic +postproc pulseaudio quvi rtmp samba schroedinger
- sdl speex ssh static-libs test theora threads truetype twolame v4l vaapi
- vdpau vorbis vpx wavpack webp X x264 x265 xcb xvid +zlib zvbi
- "
+ alsa bindist +encode examples jack oss pic static-libs test v4l
+ ${FFMPEG_FLAG_MAP[@]%:*}
+ ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
@@ -256,24 +289,13 @@
multilib_src_configure() {
local myconf=( ${EXTRA_FFMPEG_CONF} )
- # options to use as use_enable in the foo[:bar] form.
- # This will feed configure with $(use_enable foo bar)
- # or $(use_enable foo foo) if no :bar is set.
- local ffuse=(
- bzip2:bzlib cpudetection:runtime-cpudetect debug doc
- gnutls gpl hardcoded-tables iconv lzma network openssl postproc samba:libsmbclient
- sdl:ffplay vaapi vdpau X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes zlib
- )
+ local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
use openssl && use gpl && myconf+=( --enable-nonfree )
use samba && myconf+=( --enable-version3 )
# Encoders
- if use encode
- then
- ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
- for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
- ffuse+=( ${i}:lib${i} )
- done
+ if use encode ; then
+ ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
# Licensing.
if use aac || use amrenc ; then
@@ -286,15 +308,11 @@
myconf+=( --disable-encoders )
fi
- # libavdevice options
- ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
-
# Indevs
use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
for i in alsa oss jack ; do
use ${i} || myconf+=( --disable-indev=${i} )
done
- ffuse+=( libv4l:libv4l2 pulseaudio:libpulse )
use xcb || ffuse+=( X:x11grab )
# Outdevs
@@ -302,24 +320,11 @@
use ${i} || myconf+=( --disable-outdev=${i} )
done
- # libavfilter options
- ffuse+=( bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype )
-
- # libswresample options
- ffuse+=( libsoxr )
-
- # Threads; we only support pthread for now but ffmpeg supports more
- ffuse+=( threads:pthreads )
-
# Decoders
- ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
use amr && myconf+=( --enable-version3 )
- for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
- ffuse+=( ${i}:lib${i} )
- done
use fdk && use gpl && myconf+=( --enable-nonfree )
- for i in "${ffuse[@]}" ; do
+ for i in "${ffuse[@]#+}" ; do
myconf+=( $(use_enable ${i%:*} ${i#*:}) )
done
@@ -334,6 +339,7 @@
for i in ${CPU_FEATURES}; do
use ${i%:*} || myconf+=( --disable-${i#*:} )
done
+
if use pic ; then
myconf+=( --enable-pic )
# disable asm code if PIC is required
1.833 media-video/ffmpeg/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.833&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.833&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.832&r2=1.833
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -r1.832 -r1.833
--- ChangeLog 18 Feb 2015 10:47:35 -0000 1.832
+++ ChangeLog 18 Feb 2015 11:52:45 -0000 1.833
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.832 2015/02/18 10:47:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.833 2015/02/18 11:52:45 aballier Exp $
+
+ 18 Feb 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+ factorize filling IUSE and the map useflag -> configure option.
18 Feb 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
zvbi requires gpl too
next reply other threads:[~2015-02-18 11:52 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-18 11:52 Alexis Ballier (aballier) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-05-19 9:24 [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999.ebuild ChangeLog Alexis Ballier (aballier)
2015-03-06 14:14 Alexis Ballier (aballier)
2015-03-05 13:50 Alexis Ballier (aballier)
2015-02-18 14:36 Alexis Ballier (aballier)
2015-02-18 14:28 Alexis Ballier (aballier)
2015-02-18 11:54 Alexis Ballier (aballier)
2015-02-18 10:47 Alexis Ballier (aballier)
2015-02-18 10:44 Alexis Ballier (aballier)
2015-02-18 9:58 Alexis Ballier (aballier)
2014-10-31 10:53 Alexis Ballier (aballier)
2014-08-29 19:05 Alexis Ballier (aballier)
2014-08-29 19:00 Alexis Ballier (aballier)
2014-07-27 9:08 Alexis Ballier (aballier)
2014-07-27 8:56 Alexis Ballier (aballier)
2014-07-27 8:52 Alexis Ballier (aballier)
2014-07-27 8:06 Alexis Ballier (aballier)
2014-07-05 13:40 Alexis Ballier (aballier)
2014-06-03 6:20 Alexis Ballier (aballier)
2014-03-15 9:17 Alexis Ballier (aballier)
2014-03-11 19:01 Alexis Ballier (aballier)
2014-02-17 18:13 Alexis Ballier (aballier)
2014-02-12 13:15 Alexis Ballier (aballier)
2013-10-11 5:42 Alexis Ballier (aballier)
2013-10-11 5:31 Alexis Ballier (aballier)
2013-10-11 5:27 Alexis Ballier (aballier)
2013-07-02 12:10 Alexis Ballier (aballier)
2013-06-14 17:15 Alexis Ballier (aballier)
2013-05-24 14:25 Alexis Ballier (aballier)
2013-05-23 0:23 Alexis Ballier (aballier)
2013-03-09 12:07 Alexis Ballier (aballier)
2013-03-09 12:01 Alexis Ballier (aballier)
2013-03-09 11:46 Alexis Ballier (aballier)
2013-03-04 12:09 Alexis Ballier (aballier)
2013-03-04 11:59 Alexis Ballier (aballier)
2013-03-04 11:48 Alexis Ballier (aballier)
2013-03-04 11:40 Alexis Ballier (aballier)
2013-02-18 18:55 Alexis Ballier (aballier)
2013-02-13 17:42 Alexis Ballier (aballier)
2013-01-27 23:51 Alexis Ballier (aballier)
2013-01-13 19:23 Alexis Ballier (aballier)
2012-12-08 12:06 Alexis Ballier (aballier)
2012-09-29 15:17 Alexis Ballier (aballier)
2012-09-29 2:08 Alexis Ballier (aballier)
2012-09-21 11:49 Alexis Ballier (aballier)
2012-08-17 13:05 Alexis Ballier (aballier)
2012-07-23 13:04 Alexis Ballier (aballier)
2012-05-12 0:24 Alexis Ballier (aballier)
2012-04-24 13:17 Alexis Ballier (aballier)
2012-04-24 13:14 Alexis Ballier (aballier)
2012-04-11 13:44 Alexis Ballier (aballier)
2012-03-20 9:42 Alexis Ballier (aballier)
2012-03-13 23:17 Alexis Ballier (aballier)
2012-01-28 12:19 Alexis Ballier (aballier)
2011-12-15 11:46 Alexis Ballier (aballier)
2011-12-15 11:43 Alexis Ballier (aballier)
2011-12-15 11:25 Alexis Ballier (aballier)
2011-12-15 11:21 Alexis Ballier (aballier)
2011-12-15 11:15 Alexis Ballier (aballier)
2011-12-06 13:13 Alexis Ballier (aballier)
2011-12-03 15:41 Alexis Ballier (aballier)
2011-11-09 13:01 Alexis Ballier (aballier)
2011-11-07 13:23 Alexis Ballier (aballier)
2011-11-02 14:08 Alexis Ballier (aballier)
2011-10-21 12:52 Alexis Ballier (aballier)
2011-10-05 14:17 Alexis Ballier (aballier)
2011-07-06 21:49 Alexis Ballier (aballier)
2011-06-29 15:07 Alexis Ballier (aballier)
2011-06-29 15:01 Alexis Ballier (aballier)
2011-06-29 14:50 Alexis Ballier (aballier)
2011-06-27 14:25 Alexis Ballier (aballier)
2011-06-23 12:42 Alexis Ballier (aballier)
2011-06-22 18:44 Alexis Ballier (aballier)
2011-04-13 12:40 Alexis Ballier (aballier)
2011-04-12 13:44 Alexis Ballier (aballier)
2011-04-12 13:26 Alexis Ballier (aballier)
2011-04-01 23:16 Alexis Ballier (aballier)
2011-03-30 11:57 Alexis Ballier (aballier)
2011-03-21 11:37 Alexis Ballier (aballier)
2011-01-29 20:03 Alexis Ballier (aballier)
2011-01-21 15:04 Luca Barbato (lu_zero)
2010-10-30 15:42 Alexis Ballier (aballier)
2010-10-01 1:46 Alexis Ballier (aballier)
2010-08-02 5:12 Alexis Ballier (aballier)
2009-04-04 14:35 Alexis Ballier (aballier)
2009-02-10 19:54 Alexis Ballier (aballier)
2009-01-27 7:50 Alexis Ballier (aballier)
2009-01-27 7:41 Alexis Ballier (aballier)
2009-01-20 19:44 Alexis Ballier (aballier)
2008-12-23 12:13 Alexis Ballier (aballier)
2008-12-20 19:16 Luca Barbato (lu_zero)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150218115245.4ABDD12059@oystercatcher.gentoo.org \
--to=aballier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox