mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: Fix build on riscv

Browse Source 
(From OE-Core rev: 5f2dfecab15142b659b09edd7673f4714626513b)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2023-07-02 19:45:44 -07:00
committed by Richard Purdie
parent 7ab374fc51
commit 3195bb74c4
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libswscale-riscv-Fix-syntax-of-vsetvli.patch Normal file
View File

@@ -0,0 +1,35 @@
From 85eefb65eb632d827e17a72518dd289dcd721084 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 2 Jul 2023 19:29:55 -0700
Subject: [PATCH] libswscale/riscv: Fix syntax of vsetvli
Add missing operand which clang complains about but gcc assumes it to be
'm1' if not specifiied.
Fixes building with clang
| 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]
| vsetvli t4, t3, e8, ta, ma
| ^
Upstream-Status: Submitted [https://ffmpeg.org/pipermail/ffmpeg-devel/2023-July/311514.html]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
libswscale/riscv/rgb2rgb_rvv.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libswscale/riscv/rgb2rgb_rvv.S b/libswscale/riscv/rgb2rgb_rvv.S
index 5626d90..bbdfdbe 100644
--- a/libswscale/riscv/rgb2rgb_rvv.S
+++ b/libswscale/riscv/rgb2rgb_rvv.S
@@ -85,7 +85,7 @@ func ff_interleave_bytes_rvv, zve32x
mv t3, a3
addi a4, a4, -1
2:
- vsetvli t4, t3, e8, ta, ma
+ vsetvli t4, t3, e8, m1, ta, ma
sub t3, t3, t4
vle8.v v8, (t0)
add t0, t4, t0
--
2.41.0

3
meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb
View File

@@ -22,7 +22,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz"
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
file://0001-libswscale-riscv-Fix-syntax-of-vsetvli.patch"
SRC_URI[sha256sum] = "57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082"