commit: c8e68487530e6ef184d02dfa14e4b4b358c122a4 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Feb 6 03:51:16 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Feb 6 03:58:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e68487
media-video/ffmpeg: fix parallel build w/ USE=opencl Closes: https://bugs.gentoo.org/782553 Thanks-to: Peter Levine <plevine457 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 1 + media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild | 1 + media-video/ffmpeg/ffmpeg-6.0-r11.ebuild | 1 + media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild | 1 + media-video/ffmpeg/ffmpeg-6.1-r4.ebuild | 1 + media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild | 1 + media-video/ffmpeg/ffmpeg-9999.ebuild | 1 + .../files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch | 13 +++++++++++++ .../ffmpeg/files/ffmpeg-6.1-opencl-parallel-gmake-fix.patch | 13 +++++++++++++ 9 files changed, 33 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index e17af76cfa74..00d867dd517c 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -348,6 +348,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.4.4-wint-conversion-vulkan.patch "${FILESDIR}"/${P}-fix-build-svt-av1-1.5.0.patch "${FILESDIR}"/${PN}-5.1.3-binutils-2.41.patch + "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch "${WORKDIR}"/${PN}-4.4.4-texinfo.patch ) diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild index 5fc9eca96bfd..698c9e33af5d 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild @@ -349,6 +349,7 @@ PATCHES=( "${FILESDIR}"/chromium-r1.patch "${FILESDIR}"/${PN}-5.1.2-get_cabac_inline_x86-32-bit.patch "${FILESDIR}"/${PN}-6.0-libplacebo-remove-deprecated-field.patch + "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild index 6d75a5d847db..3599c9b0aee6 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild @@ -348,6 +348,7 @@ PATCHES=( "${FILESDIR}"/${P}-wint-conversion-vulkan.patch "${FILESDIR}"/${P}-libplacebo-remove-deprecated-field.patch "${FILESDIR}"/${P}-binutils-2.41.patch + "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild index 188b14013a42..675c19801444 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild @@ -346,6 +346,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.1.2-get_cabac_inline_x86-32-bit.patch "${FILESDIR}"/${PN}-6.0-libplacebo-remove-deprecated-field.patch "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch + "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild index d3edaba40eb7..d462f165ce84 100644 --- a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild @@ -359,6 +359,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.1-0004-lavc-dvdsubenc-only-check-canvas-size-when-it-is-act.patch "${FILESDIR}"/${PN}-6.1-0005-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch "${FILESDIR}"/${PN}-6.1-0006-hwcontext_vulkan-guard-unistd.h-include.patch + "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild index 4d42b25f4162..d82fd894afc1 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild @@ -356,6 +356,7 @@ PATCHES=( "${FILESDIR}"/chromium-r2.patch "${FILESDIR}"/${PN}-6.1-wint-conversion.patch "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch + "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 0b4ac4354fb6..461eb1559ef2 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -354,6 +354,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r2.patch + "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch b/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch new file mode 100644 index 000000000000..c0b1b1b1ce76 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch @@ -0,0 +1,13 @@ +Bug: https://bugs.gentoo.org/782553 + +--- a/libavfilter/Makefile ++++ b/libavfilter/Makefile +@@ -562,7 +562,7 @@ + clean:: + $(RM) $(CLEANSUFFIXES:%=libavfilter/dnn/%) $(CLEANSUFFIXES:%=libavfilter/opencl/%) + +-OPENCL = $(subst $(SRC_PATH)/,,$(wildcard $(SRC_PATH)/libavfilter/opencl/*.cl)) ++OPENCL = $(wildcard libavfilter/opencl/*.cl) + .SECONDARY: $(OPENCL:.cl=.c) + libavfilter/opencl/%.c: TAG = OPENCL + libavfilter/opencl/%.c: $(SRC_PATH)/libavfilter/opencl/%.cl diff --git a/media-video/ffmpeg/files/ffmpeg-6.1-opencl-parallel-gmake-fix.patch b/media-video/ffmpeg/files/ffmpeg-6.1-opencl-parallel-gmake-fix.patch new file mode 100644 index 000000000000..c7eef79f347a --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.1-opencl-parallel-gmake-fix.patch @@ -0,0 +1,13 @@ +Bug: https://bugs.gentoo.org/782553 + +--- a/libavfilter/Makefile ++++ b/libavfilter/Makefile +@@ -663,7 +663,7 @@ clean:: + $(RM) $(CLEANSUFFIXES:%=libavfilter/dnn/%) $(CLEANSUFFIXES:%=libavfilter/opencl/%) \ + $(CLEANSUFFIXES:%=libavfilter/vulkan/%) + +-OPENCL = $(subst $(SRC_PATH)/,,$(wildcard $(SRC_PATH)/libavfilter/opencl/*.cl)) ++OPENCL = $(wildcard libavfilter/opencl/*.cl) + .SECONDARY: $(OPENCL:.cl=.c) + libavfilter/opencl/%.c: TAG = OPENCL + libavfilter/opencl/%.c: $(SRC_PATH)/libavfilter/opencl/%.cl
