From deb3e2c880cac6a67a2d2e09be5f763fca1a5c8d Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Fri, 27 Apr 2018 15:36:57 +0300 Subject: ffmpeg: merge with gentoo repo --- media-video/ffmpeg/ffmpeg-scm.ebuild | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'media-video/ffmpeg/ffmpeg-scm.ebuild') diff --git a/media-video/ffmpeg/ffmpeg-scm.ebuild b/media-video/ffmpeg/ffmpeg-scm.ebuild index 69ecfb8..4a06b47 100644 --- a/media-video/ffmpeg/ffmpeg-scm.ebuild +++ b/media-video/ffmpeg/ffmpeg-scm.ebuild @@ -53,23 +53,24 @@ LICENSE=" # foo is added to IUSE. FFMPEG_FLAG_MAP=( +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp - +gpl +hardcoded-tables +iconv lzma +network openssl +postproc + +gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib # libavdevice options cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl opencl # indevs - libv4l:libv4l2 pulseaudio:libpulse + libv4l:libv4l2 pulseaudio:libpulse libdrm # decoders - amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh - speex:libspeex svg:librsvg vorbis:libvorbis - vpx:libvpx zvbi:libzvbi + speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi # libavfilter options + appkit bs2b:libbs2b chromaprint flite:libflite frei0r - fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype + fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype rubberband:librubberband zeromq:libzmq zimg:libzimg # libswresample options libsoxr @@ -80,7 +81,7 @@ FFMPEG_FLAG_MAP=( # Same as above but for encoders, i.e. they do something only with USE=encode. FFMPEG_ENCODER_FLAG_MAP=( amrenc:libvo-amrwbenc mp3:libmp3lame - kvazaar:libkvazaar nvenc:nvenc + kvazaar:libkvazaar libaom openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid ) @@ -161,11 +162,11 @@ RDEPEND=" cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) + codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) kvazaar? ( >=media-libs/kvazaar-1.2[${MULTILIB_USEDEP}] ) mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) - nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] ) snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] ) theora? ( @@ -176,7 +177,7 @@ RDEPEND=" wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - x265? ( media-libs/x265[${MULTILIB_USEDEP}] ) + x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] ) xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] ) @@ -201,15 +202,19 @@ RDEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) + libaom? ( media-libs/libaom[${MULTILIB_USEDEP}] ) libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) + libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) @@ -223,6 +228,7 @@ RDEPEND=" svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) + video_cards_nvidia? ( media-libs/nv-codec-headers[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] @@ -236,7 +242,7 @@ RDEPEND=" ) xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) - zimg? ( >=media-libs/zimg-2.7.0:=[${MULTILIB_USEDEP}] ) + zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) !media-video/qt-faststart @@ -253,10 +259,6 @@ DEPEND="${RDEPEND} v4l? ( sys-kernel/linux-headers ) " -RDEPEND="${RDEPEND} - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" - # Code requiring FFmpeg to be built under gpl license GPL_REQUIRED_USE=" postproc? ( gpl ) @@ -283,7 +285,7 @@ RESTRICT=" S=${WORKDIR}/${P/_/-} PATCHES=( - "${FILESDIR}"/chromium.patch + "${FILESDIR}"/chromium-r1.patch ) MULTILIB_WRAPPED_HEADERS=( -- cgit v1.2.3