media-video/ffmpeg: fix building with >=media-libs/fdk-aac-2
authorThomas Deutschmann <whissi@gentoo.org>
Sun, 7 Jul 2019 18:58:21 +0000 (20:58 +0200)
committerThomas Deutschmann <whissi@gentoo.org>
Sun, 7 Jul 2019 18:58:41 +0000 (20:58 +0200)
Closes: https://bugs.gentoo.org/682890
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild [new file with mode: 0644]
media-video/ffmpeg/files/ffmpeg-3.4.6-fix-building-against-fdk-aac-2.patch [new file with mode: 0644]

diff --git a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
new file mode 100644 (file)
index 0000000..6343c59
--- /dev/null
@@ -0,0 +1,489 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=55.57.57
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+       SCM="git-r3"
+       EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+       SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+       SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+       SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+       !gpl? ( LGPL-2.1 )
+       gpl? ( GPL-2 )
+       amr? (
+               gpl? ( GPL-3 )
+               !gpl? ( LGPL-3 )
+       )
+       gmp? (
+               gpl? ( GPL-3 )
+               !gpl? ( LGPL-3 )
+       )
+       encode? (
+               amrenc? (
+                       gpl? ( GPL-3 )
+                       !gpl? ( LGPL-3 )
+               )
+       )
+       samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+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 gcrypt gnutls gmp
+               +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
+               # indevs
+               libv4l:libv4l2 pulseaudio:libpulse libdrm
+               # decoders
+               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+               jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
+               mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+               speex:libspeex svg:librsvg vorbis:libvorbis
+               vpx:libvpx zvbi:libzvbi
+               # libavfilter options
+               appkit
+               bs2b:libbs2b chromaprint flite:libflite frei0r
+               fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+               rubberband:librubberband zeromq:libzmq zimg:libzimg
+               # 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=(
+       amrenc:libvo-amrwbenc mp3:libmp3lame
+       kvazaar:libkvazaar nvenc:nvenc
+       openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+       wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+       alsa chromium doc +encode jack oss pic static-libs test v4l
+       ${FFMPEG_FLAG_MAP[@]%:*}
+       ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+       cpu_flags_arm_thumb:armv5te
+       cpu_flags_arm_v6:armv6
+       cpu_flags_arm_thumb2:armv6t2
+       cpu_flags_arm_neon:neon
+       cpu_flags_arm_vfp:vfp
+       cpu_flags_arm_vfpv3:vfpv3
+       cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+       arm64? ( cpu_flags_arm_v8 )
+       cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+       cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+       cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+       cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+       cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+       cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+       cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+       cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+       cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+       cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+       cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+       cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+       cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+       cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+       cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+       cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+       cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+       cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+       cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+       cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+       ${ARM_CPU_FEATURES[@]}
+       ${MIPS_CPU_FEATURES[@]}
+       ${PPC_CPU_FEATURES[@]}
+       ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+       ${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+       ${ARM_CPU_REQUIRED_USE}
+       ${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+       alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+       amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+       bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+       bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+       bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+       cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+       chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+       encode? (
+               amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+               kvazaar? ( media-libs/kvazaar[${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? (
+                       >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+                       >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+               )
+               twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+               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-1.6:=[${MULTILIB_USEDEP}] )
+               xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+       )
+       fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+       flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+       fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+       frei0r? ( media-plugins/frei0r-plugins )
+       fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+       gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+       gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+       gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+       gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+       gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+       iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+       iec61883? (
+               >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+               >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+       )
+       ieee1394? (
+               >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+       )
+       jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+       jpeg2k? ( >=media-libs/openjpeg-2:2[${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}] )
+       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}] )
+       pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+       librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+       rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+       samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
+       sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+       speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+       ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+       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}] )
+       vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+       vorbis? (
+               >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+               >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+       )
+       vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+       X? (
+               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+               >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+       )
+       xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+       zeromq? ( >=net-libs/zeromq-4.1.6 )
+       zimg? ( >=media-libs/zimg-2.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
+       postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+       >=sys-devel/make-3.81
+       doc? ( sys-apps/texinfo )
+       >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+       ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+       cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+       test? ( net-misc/wget sys-devel/bc )
+       v4l? ( sys-kernel/linux-headers )
+"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+       postproc? ( gpl )
+       frei0r? ( gpl )
+       cdio? ( gpl )
+       samba? ( gpl )
+       encode? (
+               x264? ( gpl )
+               x265? ( gpl )
+               xvid? ( gpl )
+               X? ( !xcb? ( gpl ) )
+       )
+"
+REQUIRED_USE="
+       libv4l? ( v4l )
+       fftools_cws2fws? ( zlib )
+       test? ( encode )
+       ${GPL_REQUIRED_USE}
+       ${CPU_REQUIRED_USE}"
+RESTRICT="
+       gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+       "${FILESDIR}"/chromium.patch
+       "${FILESDIR}"/${PN}-3.4.6-fix-building-against-fdk-aac-2.patch #682890
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+       if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+               export revision=git-N-${FFMPEG_REVISION}
+       fi
+       default
+       echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+       local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+       local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+       use openssl && use gpl && myconf+=( --enable-nonfree )
+       use samba && myconf+=( --enable-version3 )
+
+       # Encoders
+       if use encode ; then
+               ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+               # Licensing.
+               if use amrenc ; then
+                       myconf+=( --enable-version3 )
+               fi
+       else
+               myconf+=( --disable-encoders )
+       fi
+
+       # Indevs
+       use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+       for i in alsa oss jack ; do
+               use ${i} || myconf+=( --disable-indev=${i} )
+       done
+
+       # Outdevs
+       for i in alsa oss sdl ; do
+               use ${i} || myconf+=( --disable-outdev=${i} )
+       done
+
+       # Decoders
+       use amr && myconf+=( --enable-version3 )
+       use gmp && myconf+=( --enable-version3 )
+       use fdk && use gpl && myconf+=( --enable-nonfree )
+
+       for i in "${ffuse[@]#+}" ; do
+               myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+       done
+
+       # (temporarily) disable non-multilib deps
+       if ! multilib_is_native_abi; then
+               for i in frei0r libzmq ; do
+                       myconf+=( --disable-${i} )
+               done
+       fi
+
+       # CPU features
+       for i in "${CPU_FEATURES_MAP[@]}" ; do
+               use ${i%:*} || myconf+=( --disable-${i#*:} )
+       done
+
+       if use pic ; then
+               myconf+=( --enable-pic )
+               # disable asm code if PIC is required
+               # as the provided asm decidedly is not PIC for x86.
+               [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+       fi
+       [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+       # Try to get cpu type based on CFLAGS.
+       # Bug #172723
+       # We need to do this so that features of that CPU will be better used
+       # If they contain an unknown CPU it will not hurt since ffmpeg's configure
+       # will just ignore it.
+       for i in $(get-flag mcpu) $(get-flag march) ; do
+               [[ ${i} = native ]] && i="host" # bug #273421
+               myconf+=( --cpu=${i} )
+               break
+       done
+
+       # LTO support, bug #566282
+       is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+       # Mandatory configuration
+       myconf=(
+               --enable-avfilter
+               --enable-avresample
+               --disable-stripping
+               --disable-libcelt # bug #664158
+               "${myconf[@]}"
+       )
+
+       # cross compile support
+       if tc-is-cross-compiler ; then
+               myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+               case ${CHOST} in
+                       *freebsd*)
+                               myconf+=( --target-os=freebsd )
+                               ;;
+                       *mingw32*)
+                               myconf+=( --target-os=mingw32 )
+                               ;;
+                       *linux*)
+                               myconf+=( --target-os=linux )
+                               ;;
+               esac
+       fi
+
+       # doc
+       myconf+=(
+               $(multilib_native_use_enable doc)
+               $(multilib_native_use_enable doc htmlpages)
+               $(multilib_native_enable manpages)
+       )
+
+       set -- "${S}/configure" \
+               --prefix="${EPREFIX}/usr" \
+               --libdir="${EPREFIX}/usr/$(get_libdir)" \
+               --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+               --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+               --mandir="${EPREFIX}/usr/share/man" \
+               --enable-shared \
+               --cc="$(tc-getCC)" \
+               --cxx="$(tc-getCXX)" \
+               --ar="$(tc-getAR)" \
+               --optflags="${CFLAGS}" \
+               $(use_enable static-libs static) \
+               "${myconf[@]}"
+       echo "${@}"
+       "${@}" || die
+
+       if multilib_is_native_abi && use chromium; then
+               einfo "Configuring for Chromium"
+               mkdir -p ../chromium || die
+               pushd ../chromium >/dev/null || die
+               set -- "${@}" \
+                       --disable-shared \
+                       --enable-static \
+                       --enable-pic \
+                       --extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+               echo "${@}"
+               "${@}" || die
+               popd >/dev/null || die
+       fi
+}
+
+multilib_src_compile() {
+       emake V=1
+
+       if multilib_is_native_abi; then
+               for i in "${FFTOOLS[@]}" ; do
+                       if use fftools_${i} ; then
+                               emake V=1 tools/${i}$(get_exeext)
+                       fi
+               done
+
+               if use chromium; then
+                       einfo "Compiling for Chromium"
+                       pushd ../chromium >/dev/null || die
+                       emake V=1 libffmpeg
+                       popd >/dev/null || die
+               fi
+       fi
+}
+
+multilib_src_install() {
+       emake V=1 DESTDIR="${D}" install install-doc
+
+       if multilib_is_native_abi; then
+               for i in "${FFTOOLS[@]}" ; do
+                       if use fftools_${i} ; then
+                               dobin tools/${i}$(get_exeext)
+                       fi
+               done
+
+               if use chromium; then
+                       einfo "Installing for Chromium"
+                       pushd ../chromium >/dev/null || die
+                       emake V=1 DESTDIR="${D}" install-libffmpeg
+                       popd >/dev/null || die
+               fi
+       fi
+}
+
+multilib_src_install_all() {
+       dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+       [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+       LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+               emake V=1 fate
+}
diff --git a/media-video/ffmpeg/files/ffmpeg-3.4.6-fix-building-against-fdk-aac-2.patch b/media-video/ffmpeg/files/ffmpeg-3.4.6-fix-building-against-fdk-aac-2.patch
new file mode 100644 (file)
index 0000000..0ee99da
--- /dev/null
@@ -0,0 +1,74 @@
+https://bugs.gentoo.org/682890
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/141c960e21d2860e354f9b90df136184dd00a9a8
+
+--- a/libavcodec/libfdk-aacenc.c
++++ b/libavcodec/libfdk-aacenc.c
+@@ -26,6 +26,11 @@
+ #include "audio_frame_queue.h"
+ #include "internal.h"
++#define FDKENC_VER_AT_LEAST(vl0, vl1) \
++    (defined(AACENCODER_LIB_VL0) && \
++        ((AACENCODER_LIB_VL0 > vl0) || \
++         (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1)))
++
+ typedef struct AACContext {
+     const AVClass *class;
+     HANDLE_AACENCODER handle;
+@@ -290,7 +295,11 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
+     }
+     avctx->frame_size = info.frameLength;
++#if FDKENC_VER_AT_LEAST(4, 0)
++    avctx->initial_padding = info.nDelay;
++#else
+     avctx->initial_padding = info.encoderDelay;
++#endif
+     ff_af_queue_init(avctx, &s->afq);
+     if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
+@@ -323,28 +332,35 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
+     int out_buffer_size, out_buffer_element_size;
+     void *in_ptr, *out_ptr;
+     int ret;
++    uint8_t dummy_buf[1];
+     AACENC_ERROR err;
+     /* handle end-of-stream small frame and flushing */
+     if (!frame) {
++        /* Must be a non-null pointer, even if it's a dummy. We could use
++         * the address of anything else on the stack as well. */
++        in_ptr               = dummy_buf;
++        in_buffer_size       = 0;
++
+         in_args.numInSamples = -1;
+     } else {
+-        in_ptr                   = frame->data[0];
+-        in_buffer_size           = 2 * avctx->channels * frame->nb_samples;
+-        in_buffer_element_size   = 2;
++        in_ptr               = frame->data[0];
++        in_buffer_size       = 2 * avctx->channels * frame->nb_samples;
+-        in_args.numInSamples     = avctx->channels * frame->nb_samples;
+-        in_buf.numBufs           = 1;
+-        in_buf.bufs              = &in_ptr;
+-        in_buf.bufferIdentifiers = &in_buffer_identifier;
+-        in_buf.bufSizes          = &in_buffer_size;
+-        in_buf.bufElSizes        = &in_buffer_element_size;
++        in_args.numInSamples = avctx->channels * frame->nb_samples;
+         /* add current frame to the queue */
+         if ((ret = ff_af_queue_add(&s->afq, frame)) < 0)
+             return ret;
+     }
++    in_buffer_element_size   = 2;
++    in_buf.numBufs           = 1;
++    in_buf.bufs              = &in_ptr;
++    in_buf.bufferIdentifiers = &in_buffer_identifier;
++    in_buf.bufSizes          = &in_buffer_size;
++    in_buf.bufElSizes        = &in_buffer_element_size;
++
+     /* The maximum packet size is 6144 bits aka 768 bytes per channel. */
+     if ((ret = ff_alloc_packet(avpkt, FFMAX(8192, 768 * avctx->channels)))) {
+         av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");