commit: ad0cb7464d90af3480697b3695b84751f9890f77 Author: Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com> AuthorDate: Wed Mar 16 11:20:20 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 16 15:17:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad0cb746
media-video/ffmpeg: backport small GNU ranlib hardcoding fix I've landed this fix in ffmpeg upstream and would like to backport it to Gentoo so the --ranlib="$(tc-getRANLIB) option set in the ebuilds has an effect, to be able to use the LLVM tool which is currently ignored. Because this is a small fix not impacting the majority of users who don't care about mixed LLVM/GNU tools usage, I don't think we nede to bump the ebuild revisons to cause rebuilds. Closes: https://bugs.gentoo.org/835419 Signed-off-by: Adrian Ratiu <adrian.ratiu <AT> collabora.com> Closes: https://github.com/gentoo/gentoo/pull/24602 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild | 1 + media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild | 1 + media-video/ffmpeg/ffmpeg-4.4-r1.ebuild | 1 + media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild | 1 + media-video/ffmpeg/ffmpeg-5.0.ebuild | 1 + .../ffmpeg-5.0-backport-ranlib-build-fix.patch | 59 ++++++++++++++++++++++ 7 files changed, 65 insertions(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild index 59583db2d8db..4646abcd5728 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild @@ -320,7 +320,7 @@ PATCHES=( "${FILESDIR}"/chromium-r1.patch "${WORKDIR}/${PN}"-4.2.2-ppc64-gcc.patch # both ppc patches from "${WORKDIR}/${PN}"-4.2.2-ppc64-altivec.patch # https://trac.ffmpeg.org/ticket/7861 - + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild index e202c8064726..4bed84ce408b 100644 --- a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild @@ -321,6 +321,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch "${FILESDIR}"/${PN}-4.3-altivec-novsx-yuv2rgb.patch "${FILESDIR}"/${PN}-4.3.1-srt-1.4.2-build.patch + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild index 13b361860963..398b9df600b8 100644 --- a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild @@ -320,6 +320,7 @@ PATCHES=( "${FILESDIR}"/chromium-r1.patch "${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch "${FILESDIR}"/${PN}-4.3-altivec-novsx-yuv2rgb.patch + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild index c8ef29a7f0c0..197fd338b64d 100644 --- a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild @@ -318,6 +318,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild index 8ac03f042f31..0650f5458c0e 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild @@ -323,6 +323,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-5.0.ebuild b/media-video/ffmpeg/ffmpeg-5.0.ebuild index 6bed93997754..b6c059f58997 100644 --- a/media-video/ffmpeg/ffmpeg-5.0.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.0.ebuild @@ -322,6 +322,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-5.0-backport-ranlib-build-fix.patch b/media-video/ffmpeg/files/ffmpeg-5.0-backport-ranlib-build-fix.patch new file mode 100644 index 000000000000..1c264f752099 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-5.0-backport-ranlib-build-fix.patch @@ -0,0 +1,59 @@ +From bc5ccea3b9d2c71929af6271bd8afe9b6cfab436 Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu <[email protected]> +Date: Mon, 14 Feb 2022 15:00:07 +0200 +Subject: [PATCH] configure: move ranlib -D test after setting defaults +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport [from master bc5ccea3b9d2c7] + +In Gentoo and ChromeOS we want to allow pure LLVM builds without +using GNU tools, so we block any unwanted mixed GNU/LLVM usages +(GNU tools are still kept around in our chroots for projects +like glibc which cannot yet be built otherwise). + +The default ${cross_prefix}${ranlib_default} points to GNU and +fails, so move the test a bit later - after the defaults are +set and the proper values get overriden - such that ffmpeg +configure calls the llvm-ranlib we desire. [1] + +[1] https://gitweb.gentoo.org/repo/gentoo.git/tree/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild?id=7a34377e3277a6a0e2eedd40e90452a44c55f1e6#n477 + +Signed-off-by: Adrian Ratiu <[email protected]> +Signed-off-by: Martin Storsjö <[email protected]> +--- + configure | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure b/configure +index 7d22c2a345..82642deabe 100755 +--- a/configure ++++ b/configure +@@ -4403,11 +4403,7 @@ cc_default="${cross_prefix}${cc_default}" + cxx_default="${cross_prefix}${cxx_default}" + nm_default="${cross_prefix}${nm_default}" + pkg_config_default="${cross_prefix}${pkg_config_default}" +-if ${cross_prefix}${ranlib_default} 2>&1 | grep -q "\-D "; then +- ranlib_default="${cross_prefix}${ranlib_default} -D" +-else +- ranlib_default="${cross_prefix}${ranlib_default}" +-fi ++ranlib_default="${cross_prefix}${ranlib_default}" + strip_default="${cross_prefix}${strip_default}" + windres_default="${cross_prefix}${windres_default}" + +@@ -4440,6 +4436,10 @@ set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \ + enabled cross_compile || host_cc_default=$cc + set_default host_cc + ++if ${ranlib} 2>&1 | grep -q "\-D "; then ++ ranlib="${ranlib} -D" ++fi ++ + pkg_config_fail_message="" + if ! $pkg_config --version >/dev/null 2>&1; then + warn "$pkg_config not found, library detection may fail." +-- +2.35.1 +
