summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorArchana Polampalli <archana.polampalli@windriver.com>2025-03-05 06:15:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-06 11:16:47 +0000
commitf88aa1c7720da78ff2bb45f482ea474399668c7f (patch)
tree54d6061bf43326f9bcf1358d44c26718a17e7846 /meta
parent5aaf06fc7a6dbf62612213df59873885766f5419 (diff)
downloadpoky-f88aa1c7720da78ff2bb45f482ea474399668c7f.tar.gz
ffmpeg: upgrade 7.1 -> 7.1.1
Remove 0001-lavc-h264dsp-move-RISC-V-fn-pointers-to-.data.rel.ro.patch as it merged to 7.1.1 https://github.com/FFmpeg/FFmpeg/commit/4ea558152f05e41f15a548e2aab8e5d40546af5f Changelog: https://github.com/FFmpeg/FFmpeg/blob/n7.1.1/Changelog (From OE-Core rev: df6f3ac24d5ca7aedd45bbc424300916845b1f64) Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/0001-lavc-h264dsp-move-RISC-V-fn-pointers-to-.data.rel.ro.patch26
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.1.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.bb)6
2 files changed, 2 insertions, 30 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-lavc-h264dsp-move-RISC-V-fn-pointers-to-.data.rel.ro.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-lavc-h264dsp-move-RISC-V-fn-pointers-to-.data.rel.ro.patch
deleted file mode 100644
index 9dc10f1219..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-lavc-h264dsp-move-RISC-V-fn-pointers-to-.data.rel.ro.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 93f277f05cc71f69930bd680ac6eae5457b963f3 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
3Date: Sat, 16 Nov 2024 08:57:54 +0200
4Subject: [PATCH] lavc/h264dsp: move RISC-V fn pointers to .data.rel.ro
5
6This should fix PIC builds.
7
8Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/c3051d94a7939de93acd647d3a1719ce56c0c4f5]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 libavcodec/riscv/h264dsp_rvv.S | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/libavcodec/riscv/h264dsp_rvv.S b/libavcodec/riscv/h264dsp_rvv.S
15index 422ac02..97c6708 100644
16--- a/libavcodec/riscv/h264dsp_rvv.S
17+++ b/libavcodec/riscv/h264dsp_rvv.S
18@@ -176,7 +176,7 @@ endfunc
19
20 .global ff_h264_weight_funcs_8_rvv
21 .hidden ff_h264_weight_funcs_8_rvv
22-const ff_h264_weight_funcs_8_rvv
23+const ff_h264_weight_funcs_8_rvv, relocate=1
24 .irp w, 16, 8, 4, 2
25 #if __riscv_xlen == 32
26 .word ff_h264_weight_pixels\w\()_8_rvv
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.1.bb
index c8f226ff3a..4314ab9f31 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.1.bb
@@ -22,11 +22,9 @@ 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
25SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ 25SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz"
26 file://0001-lavc-h264dsp-move-RISC-V-fn-pointers-to-.data.rel.ro.patch \
27 "
28 26
29SRC_URI[sha256sum] = "40973d44970dbc83ef302b0609f2e74982be2d85916dd2ee7472d30678a7abe6" 27SRC_URI[sha256sum] = "733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1"
30 28
31# https://nvd.nist.gov/vuln/detail/CVE-2023-39018 29# https://nvd.nist.gov/vuln/detail/CVE-2023-39018
32# https://github.com/bramp/ffmpeg-cli-wrapper/issues/291 30# https://github.com/bramp/ffmpeg-cli-wrapper/issues/291