[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/

["Sam James" <sam@gentoo.org>]

commit:     ba51a1ee8ed6dfb8f0beaae97119da9b27e09f35
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 25 18:53:50 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 20:24:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba51a1ee

media-video/ffmpeg: fix parallel build with opencl

Closes: https://bugs.gentoo.org/782553
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35917
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch    | 21 ++++++++++-----------
 .../ffmpeg-6.1-opencl-parallel-gmake-fix.patch      | 21 ++++++++++-----------
 2 files changed, 20 insertions(+), 22 deletions(-)

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
index c0b1b1b1ce76..9ac8ec79cf2e 100644
--- 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
@@ -1,13 +1,12 @@
 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
+--- ffmpeg-4.4.4/tools/cl2c.orig        2024-03-14 04:53:45.468507151 +0300
++++ ffmpeg-4.4.4/tools/cl2c     2024-03-14 04:54:53.503086088 +0300
+@@ -24,6 +24,7 @@
+
+ name=$(basename "$input" | sed 's/.cl$//')
+
++mkdir -p "$(dirname "$output")"
+ cat >$output <<EOF
+ // Generated from $input
+ const char *ff_opencl_source_$name =

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
index c7eef79f347a..271a18999fb3 100644
--- 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
@@ -1,13 +1,12 @@
 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
+--- ffmpeg-6.1.1/tools/source2c.orig        2024-03-14 04:53:45.468507151 +0300
++++ ffmpeg-6.1.1/tools/source2c     2024-03-14 04:54:53.503086088 +0300
+@@ -24,6 +24,7 @@
+
+ name=$(basename "$input" | sed 's/.cl$//')
+
++mkdir -p "$(dirname "$output")"
+ cat >$output <<EOF
+ // Generated from $input
+ const char *ff_opencl_source_$name =