diff options
| author |   Alexander Golubev <fatzer2@gmail.com> | 2024-03-25 21:53:50 +0300 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-03-26 20:24:07 +0000 |
| commit | ba51a1ee8ed6dfb8f0beaae97119da9b27e09f35 (patch) | |
| tree | 016b8c31b297afd3831226087cf481264a2021aa /media-video | |
| parent | sys-libs/slang: readd "fix the build with LLD 17" patch to 2.3.3-r1 (diff) | |
| download | gentoo-ba51a1ee8ed6dfb8f0beaae97119da9b27e09f35.tar.gz gentoo-ba51a1ee8ed6dfb8f0beaae97119da9b27e09f35.tar.bz2 gentoo-ba51a1ee8ed6dfb8f0beaae97119da9b27e09f35.zip | |
media-video/ffmpeg: fix parallel build with opencl
Closes: https://bugs.gentoo.org/782553
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35917
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch | 21 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/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 = |