commit: fb535b822ae7b73a575559e929c82e2310005ee6
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 22:56:28 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 23:20:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb535b82
media-video/ffmpeg: Stop building a separate Chromium library for 6.1+
A long time ago, enabling OpenCL broke the libffmpeg.so Chromium library, so we
had to perform a separate build without it when necessary. That issue seems to
have gone away now so simplify the build.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-video/ffmpeg/ffmpeg-6.1.ebuild | 47 ++++++-----------------------------
media-video/ffmpeg/ffmpeg-9999.ebuild | 47 ++++++-----------------------------
2 files changed, 14 insertions(+), 80 deletions(-)
diff --git a/media-video/ffmpeg/ffmpeg-6.1.ebuild
b/media-video/ffmpeg/ffmpeg-6.1.ebuild
index 992b5f8baa39..665e6e7610cb 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.ebuild
@@ -357,10 +357,6 @@ 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.
@@ -538,20 +534,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 +546,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
}
@@ -593,18 +567,11 @@ multilib_src_install() {
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
+ 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
}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 992b5f8baa39..665e6e7610cb 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -357,10 +357,6 @@ 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.
@@ -538,20 +534,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 +546,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
}
@@ -593,18 +567,11 @@ multilib_src_install() {
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
+ 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
}
