| 1 |
commit: 7d5df743aa40b812ceaed2627f3a9547af546d2f |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 30 10:50:53 2015 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 30 12:00:46 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d5df743 |
| 7 |
|
| 8 |
media-video/ffmpeg: Add gmp/gcrypt useflags. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 11 +++++++++-- |
| 14 |
media-video/ffmpeg/metadata.xml | 1 + |
| 15 |
2 files changed, 10 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 18 |
index 464caa2..0db4f1f 100644 |
| 19 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 20 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 21 |
@@ -42,6 +42,10 @@ LICENSE=" |
| 22 |
gpl? ( GPL-3 ) |
| 23 |
!gpl? ( LGPL-3 ) |
| 24 |
) |
| 25 |
+ gmp? ( |
| 26 |
+ gpl? ( GPL-3 ) |
| 27 |
+ !gpl? ( LGPL-3 ) |
| 28 |
+ ) |
| 29 |
encode? ( |
| 30 |
aac? ( |
| 31 |
gpl? ( GPL-3 ) |
| 32 |
@@ -63,8 +67,8 @@ fi |
| 33 |
# or $(use_enable foo foo) if no :bar is set. |
| 34 |
# foo is added to IUSE. |
| 35 |
FFMPEG_FLAG_MAP=( |
| 36 |
- +bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl |
| 37 |
- +hardcoded-tables +iconv lzma +network openssl +postproc |
| 38 |
+ +bzip2:bzlib cpudetection:runtime-cpudetect debug doc gcrypt gnutls gmp |
| 39 |
+ +gpl +hardcoded-tables +iconv lzma +network openssl +postproc |
| 40 |
samba:libsmbclient sdl:ffplay sdl vaapi vdpau X:xlib xcb:libxcb |
| 41 |
xcb:libxcb-shm xcb:libxcb-xfixes +zlib |
| 42 |
# libavdevice options |
| 43 |
@@ -188,7 +192,9 @@ RDEPEND=" |
| 44 |
fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) |
| 45 |
frei0r? ( media-plugins/frei0r-plugins ) |
| 46 |
fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] ) |
| 47 |
+ gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] ) |
| 48 |
gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) |
| 49 |
+ gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] ) |
| 50 |
gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) |
| 51 |
gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) |
| 52 |
iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) |
| 53 |
@@ -342,6 +348,7 @@ multilib_src_configure() { |
| 54 |
|
| 55 |
# Decoders |
| 56 |
use amr && myconf+=( --enable-version3 ) |
| 57 |
+ use gmp && myconf+=( --enable-version3 ) |
| 58 |
use fdk && use gpl && myconf+=( --enable-nonfree ) |
| 59 |
|
| 60 |
for i in "${ffuse[@]#+}" ; do |
| 61 |
|
| 62 |
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml |
| 63 |
index 1bb06e4..c39cb97 100644 |
| 64 |
--- a/media-video/ffmpeg/metadata.xml |
| 65 |
+++ b/media-video/ffmpeg/metadata.xml |
| 66 |
@@ -24,6 +24,7 @@ |
| 67 |
<flag name="flite">Adds a text-to-speech filter based on <pkg>app-accessibility/flite</pkg>.</flag> |
| 68 |
<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag> |
| 69 |
<flag name="fribidi">Enables fribidi support in the drawtext filter.</flag> |
| 70 |
+ <flag name="gcrypt">Enables gcrypt support: Needed for rtmp(t)e support if openssl, librtmp or gmp is not used.</flag> |
| 71 |
<flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag> |
| 72 |
<flag name="gpl">Build GPL code. Should be enabled unless you require LGPL binaries.</flag> |
| 73 |
<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag> |
Archives