diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-07-02 19:45:44 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-10 11:36:34 +0100 |
commit | 3195bb74c4809ac9630557c8a5695be69728469d (patch) | |
tree | 224cb7028e6b9e0d758509fc60e30ee78ae88a6f /meta/recipes-multimedia/ffmpeg | |
parent | 7ab374fc5180c188d947c7413d9f87641384f7e1 (diff) | |
download | poky-3195bb74c4809ac9630557c8a5695be69728469d.tar.gz |
ffmpeg: Fix build on riscv
(From OE-Core rev: 5f2dfecab15142b659b09edd7673f4714626513b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libswscale-riscv-Fix-syntax-of-vsetvli.patch | 35 | ||||
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb | 3 |
2 files changed, 37 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libswscale-riscv-Fix-syntax-of-vsetvli.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libswscale-riscv-Fix-syntax-of-vsetvli.patch new file mode 100644 index 0000000000..94e0ba6d10 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libswscale-riscv-Fix-syntax-of-vsetvli.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 85eefb65eb632d827e17a72518dd289dcd721084 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 2 Jul 2023 19:29:55 -0700 | ||
4 | Subject: [PATCH] libswscale/riscv: Fix syntax of vsetvli | ||
5 | |||
6 | Add missing operand which clang complains about but gcc assumes it to be | ||
7 | 'm1' if not specifiied. | ||
8 | |||
9 | Fixes building with clang | ||
10 | | src/libswscale/riscv/rgb2rgb_rvv.S:88:25: error: operand must be e[8|16|32|64|128|256|512|1024],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu] | ||
11 | | vsetvli t4, t3, e8, ta, ma | ||
12 | | ^ | ||
13 | |||
14 | Upstream-Status: Submitted [https://ffmpeg.org/pipermail/ffmpeg-devel/2023-July/311514.html] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | libswscale/riscv/rgb2rgb_rvv.S | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/libswscale/riscv/rgb2rgb_rvv.S b/libswscale/riscv/rgb2rgb_rvv.S | ||
21 | index 5626d90..bbdfdbe 100644 | ||
22 | --- a/libswscale/riscv/rgb2rgb_rvv.S | ||
23 | +++ b/libswscale/riscv/rgb2rgb_rvv.S | ||
24 | @@ -85,7 +85,7 @@ func ff_interleave_bytes_rvv, zve32x | ||
25 | mv t3, a3 | ||
26 | addi a4, a4, -1 | ||
27 | 2: | ||
28 | - vsetvli t4, t3, e8, ta, ma | ||
29 | + vsetvli t4, t3, e8, m1, ta, ma | ||
30 | sub t3, t3, t4 | ||
31 | vle8.v v8, (t0) | ||
32 | add t0, t4, t0 | ||
33 | -- | ||
34 | 2.41.0 | ||
35 | |||
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb index f84d9bb6d0..181c17d9d6 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb | |||
@@ -22,7 +22,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
22 | file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ | 22 | file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ |
23 | file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" | 23 | file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" |
24 | 24 | ||
25 | SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz" | 25 | SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ |
26 | file://0001-libswscale-riscv-Fix-syntax-of-vsetvli.patch" | ||
26 | 27 | ||
27 | SRC_URI[sha256sum] = "57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082" | 28 | SRC_URI[sha256sum] = "57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082" |
28 | 29 | ||