diff mbox series

[1/1] ffmpeg: upgrade 7.1 -> 7.1.1

Message ID 20250305061527.1156730-1-archana.polampalli@windriver.com
State Accepted, archived
Commit df6f3ac24d5ca7aedd45bbc424300916845b1f64
Headers show
Series [1/1] ffmpeg: upgrade 7.1 -> 7.1.1 | expand

Commit Message

Polampalli, Archana March 5, 2025, 6:15 a.m. UTC 
From: Archana Polampalli <archana.polampalli@windriver.com>

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

Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
---
 ...e-RISC-V-fn-pointers-to-.data.rel.ro.patch | 26 -------------------
 .../ffmpeg/{ffmpeg_7.1.bb => ffmpeg_7.1.1.bb} |  6 ++---
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0001-lavc-h264dsp-move-RISC-V-fn-pointers-to-.data.rel.ro.patch
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_7.1.bb => ffmpeg_7.1.1.bb} (97%)
diff mbox series

Patch

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 @@ 
-From 93f277f05cc71f69930bd680ac6eae5457b963f3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sat, 16 Nov 2024 08:57:54 +0200
-Subject: [PATCH] lavc/h264dsp: move RISC-V fn pointers to .data.rel.ro
-
-This should fix PIC builds.
-
-Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/c3051d94a7939de93acd647d3a1719ce56c0c4f5]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libavcodec/riscv/h264dsp_rvv.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/riscv/h264dsp_rvv.S b/libavcodec/riscv/h264dsp_rvv.S
-index 422ac02..97c6708 100644
---- a/libavcodec/riscv/h264dsp_rvv.S
-+++ b/libavcodec/riscv/h264dsp_rvv.S
-@@ -176,7 +176,7 @@ endfunc
- 
-         .global ff_h264_weight_funcs_8_rvv
-         .hidden ff_h264_weight_funcs_8_rvv
--const ff_h264_weight_funcs_8_rvv
-+const ff_h264_weight_funcs_8_rvv, relocate=1
-         .irp    w, 16, 8, 4, 2
- #if __riscv_xlen == 32
-         .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
similarity index 97%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.bb
rename to 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 \
                     file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
                     file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
-SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
-           file://0001-lavc-h264dsp-move-RISC-V-fn-pointers-to-.data.rel.ro.patch \
-           "
+SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz"
 
-SRC_URI[sha256sum] = "40973d44970dbc83ef302b0609f2e74982be2d85916dd2ee7472d30678a7abe6"
+SRC_URI[sha256sum] = "733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1"
 
 # https://nvd.nist.gov/vuln/detail/CVE-2023-39018
 # https://github.com/bramp/ffmpeg-cli-wrapper/issues/291