mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
extra/ffmpeg4.4: fix
This commit is contained in:
parent
b52a5cbabb
commit
8424d1af03
2 changed files with 31 additions and 2 deletions
25
extra/ffmpeg4.4/0001-gcc14.patch
Normal file
25
extra/ffmpeg4.4/0001-gcc14.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
From c74cc45d7be995df755954e228031884ad9f38a0 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Sat, 22 Jun 2024 19:25:46 -0600
|
||||
Subject: [PATCH] gcc14
|
||||
|
||||
---
|
||||
libavutil/hwcontext_vaapi.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
|
||||
index 4b81bd1f67..709c105012 100644
|
||||
--- a/libavutil/hwcontext_vaapi.c
|
||||
+++ b/libavutil/hwcontext_vaapi.c
|
||||
@@ -1032,7 +1032,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst,
|
||||
uint32_t va_fourcc;
|
||||
int err, i, j, k;
|
||||
|
||||
- unsigned long buffer_handle;
|
||||
+ uintptr_t buffer_handle;
|
||||
VASurfaceAttribExternalBuffers buffer_desc;
|
||||
VASurfaceAttrib attrs[2] = {
|
||||
{
|
||||
--
|
||||
2.37.3
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
# - remove depends on rav1e, remove --enable-librav1e
|
||||
# - remove depends on svt-av1, remove --enable-libsvtav1
|
||||
# - remove --enable-lto
|
||||
# - patch to fix 32-bit FTBFS with GCC 14
|
||||
|
||||
pkgname=ffmpeg4.4
|
||||
pkgver=4.4.4
|
||||
|
@ -96,9 +97,11 @@ provides=(
|
|||
)
|
||||
_tag=71fb6132637a2a430375c24afc381fff8b854fe7
|
||||
source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
|
||||
binutils-2.41.patch)
|
||||
binutils-2.41.patch
|
||||
0001-gcc14.patch)
|
||||
b2sums=('SKIP'
|
||||
'b656a17dd3996c6871d322ba1fcf25410ed580d9600348cda087d705660601d06070492300d31c12d54b0e9914cb92bb9d997e51462c0577e1a90539bf0b76ee')
|
||||
'b656a17dd3996c6871d322ba1fcf25410ed580d9600348cda087d705660601d06070492300d31c12d54b0e9914cb92bb9d997e51462c0577e1a90539bf0b76ee'
|
||||
'd13ac8ed5baf4a0a8864fdfb6f53456d2ecab978fb5f59f571328d313fc554c64d225a7ce60fa16fbbb1cff28685784a6921852f6cfad5aa87c72ffd03887ee5')
|
||||
|
||||
pkgver() {
|
||||
cd ffmpeg
|
||||
|
@ -109,6 +112,7 @@ prepare() {
|
|||
cd ffmpeg
|
||||
git cherry-pick -n 031f1561cd286596cdb374da32f8aa816ce3b135 # remove compressed_ten_bit_format
|
||||
patch -p1 -i ../binutils-2.41.patch # Fix build with binutils 2.41
|
||||
patch -p1 -i ../0001-gcc14.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
Loading…
Reference in a new issue