diff options
Diffstat (limited to 'media-video/ffmpeg/ffmpeg-9999.ebuild')
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 50 |
1 files changed, 7 insertions, 43 deletions
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 992b5f8baa39..188eb6e7b762 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -334,6 +334,7 @@ GPL_REQUIRED_USE=" ) " REQUIRED_USE=" + chromium? ( opus ) cuda? ( nvenc ) fftools_cws2fws? ( zlib ) glslang? ( vulkan !shaderc ) @@ -350,17 +351,13 @@ RESTRICT=" S=${WORKDIR}/${P/_/-} PATCHES=( - "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}"/chromium-r2.patch ) MULTILIB_WRAPPED_HEADERS=( /usr/include/libavutil/avconfig.h ) -build_separate_libffmpeg() { - use opencl -} - pkg_setup() { # ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg. # May cause breakage while updating, #862996, #625210, #833821. @@ -386,6 +383,7 @@ src_prepare() { # will ignore user's preference. sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die + ln -snf "${FILESDIR}"/chromium.c chromium.c || die echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die } @@ -538,20 +536,6 @@ multilib_src_configure() { ${EXTRA_FFMPEG_CONF} echo "${@}" "${@}" || die - - if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then - einfo "Configuring for Chromium" - mkdir -p ../chromium || die - pushd ../chromium >/dev/null || die - set -- "${@}" \ - --disable-shared \ - --enable-static \ - --enable-pic \ - --disable-opencl - echo "${@}" - "${@}" || die - popd >/dev/null || die - fi } multilib_src_compile() { @@ -564,16 +548,8 @@ multilib_src_compile() { fi done - if use chromium; then - if build_separate_libffmpeg; then - einfo "Compiling for Chromium" - pushd ../chromium >/dev/null || die - emake V=1 libffmpeg - popd >/dev/null || die - else - emake V=1 libffmpeg - fi - fi + use chromium && + emake V=1 libffmpeg fi } @@ -592,20 +568,8 @@ multilib_src_install() { fi done - if use chromium; then - if build_separate_libffmpeg; then - einfo "Installing for Chromium" - pushd ../chromium >/dev/null || die - emake V=1 DESTDIR="${D}" install-libffmpeg - popd >/dev/null || die - else - emake V=1 DESTDIR="${D}" install-libffmpeg - - # When not built separately, libffmpeg has no code of - # its own so this QA check raises a false positive. - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*" - fi - fi + use chromium && + emake V=1 DESTDIR="${D}" install-libffmpeg fi } |