* update ffmpeg4.4 to 4.4.5-1
This commit is contained in:
parent
adc7260665
commit
707ca181a0
@ -6,8 +6,8 @@
|
||||
# Contributor: Paul Mattal <paul@archlinux.org>
|
||||
|
||||
pkgname=ffmpeg4.4
|
||||
pkgver=4.4.4
|
||||
pkgrel=6.1
|
||||
pkgver=4.4.5
|
||||
pkgrel=1
|
||||
pkgdesc='Complete solution to record, convert and stream audio and video'
|
||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||
url=https://ffmpeg.org/
|
||||
@ -98,13 +98,9 @@ provides=(
|
||||
libswresample.so
|
||||
libswscale.so
|
||||
)
|
||||
_tag=71fb6132637a2a430375c24afc381fff8b854fe7
|
||||
source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
|
||||
binutils-2.41.patch
|
||||
gcc14.patch)
|
||||
b2sums=('87d63165eb2cde4e0702f6217cb93f171e2f57139b7251cbcfc32c1465e1753e6de7f3e49f1602ac980fbb7ec279edcc5938255a8a95a328c9c6d3882ef96fdb'
|
||||
'b656a17dd3996c6871d322ba1fcf25410ed580d9600348cda087d705660601d06070492300d31c12d54b0e9914cb92bb9d997e51462c0577e1a90539bf0b76ee'
|
||||
'b4e3f10cb0edf0f60965221626c4c6f7328a5071aa066877c4fa66f37dd3be113f3895ba25b19f535ca4fc87eaa79527ad86bd9b68f57ed426deaf5fa563e1ef')
|
||||
_tag=9bcede27c26b2f7cd469ab6b5c8b9694c30cfca3
|
||||
source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag})
|
||||
b2sums=('d9975a7578d982a1beab69cd63b6894bc4ab0338cf15716c3775bc09ffafe469eb0213c07b0575d4ca192148d29e67d00f0c3779aea0a1c1099b5505589db67b')
|
||||
|
||||
options=(!distcc)
|
||||
|
||||
@ -115,15 +111,8 @@ pkgver() {
|
||||
|
||||
prepare() {
|
||||
cd ffmpeg
|
||||
git cherry-pick -n 988f2e9eb063db7c1a678729f58aab6eba59a55b # fix nvenc on older gpus
|
||||
git cherry-pick -n 031f1561cd286596cdb374da32f8aa816ce3b135 # remove compressed_ten_bit_format
|
||||
patch -p1 -i ../binutils-2.41.patch # Fix build with binutils 2.41
|
||||
|
||||
# use non-deprecated nvenc GUID for conftest
|
||||
git cherry-pick -n 03823ac0c6a38bd6ba972539e3203a592579792f
|
||||
git cherry-pick -n d2b46c1ef768bc31ba9180f6d469d5b8be677500
|
||||
|
||||
patch -Np0 -i ${srcdir}/gcc14.patch
|
||||
git cherry-pick -n 74b14ccd314aa091fa6217ebd4954489fbb7ccc8 # fix build against x265 4.0
|
||||
}
|
||||
|
||||
build() {
|
||||
@ -135,6 +124,7 @@ build() {
|
||||
--disable-power8 # buildbot may be a power9
|
||||
--disable-vsx # later SIMD, disable them forcefully
|
||||
)
|
||||
export CFLAGS+=' -Wno-incompatible-pointer-types'
|
||||
;;
|
||||
x86_64) _configure_flags=(
|
||||
--enable-libmfx
|
||||
|
||||
@ -1,75 +0,0 @@
|
||||
From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
|
||||
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
||||
Date: Sun, 16 Jul 2023 18:18:02 +0300
|
||||
Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
|
||||
instructions within inline assembly
|
||||
|
||||
Fixes assembling with binutil as >= 2.41
|
||||
|
||||
Signed-off-by: James Almer <jamrial@gmail.com>
|
||||
---
|
||||
libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
|
||||
1 file changed, 23 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
|
||||
index 6298f5ed19..ca7e2dffc1 100644
|
||||
--- a/libavcodec/x86/mathops.h
|
||||
+++ b/libavcodec/x86/mathops.h
|
||||
@@ -35,12 +35,20 @@
|
||||
static av_always_inline av_const int MULL(int a, int b, unsigned shift)
|
||||
{
|
||||
int rt, dummy;
|
||||
+ if (__builtin_constant_p(shift))
|
||||
__asm__ (
|
||||
"imull %3 \n\t"
|
||||
"shrdl %4, %%edx, %%eax \n\t"
|
||||
:"=a"(rt), "=d"(dummy)
|
||||
- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
|
||||
+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ (
|
||||
+ "imull %3 \n\t"
|
||||
+ "shrdl %4, %%edx, %%eax \n\t"
|
||||
+ :"=a"(rt), "=d"(dummy)
|
||||
+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
|
||||
+ );
|
||||
return rt;
|
||||
}
|
||||
|
||||
@@ -113,19 +121,31 @@ __asm__ volatile(\
|
||||
// avoid +32 for shift optimization (gcc should do that ...)
|
||||
#define NEG_SSR32 NEG_SSR32
|
||||
static inline int32_t NEG_SSR32( int32_t a, int8_t s){
|
||||
+ if (__builtin_constant_p(s))
|
||||
__asm__ ("sarl %1, %0\n\t"
|
||||
: "+r" (a)
|
||||
- : "ic" ((uint8_t)(-s))
|
||||
+ : "i" (-s & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ ("sarl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+ : "c" ((uint8_t)(-s))
|
||||
+ );
|
||||
return a;
|
||||
}
|
||||
|
||||
#define NEG_USR32 NEG_USR32
|
||||
static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
|
||||
+ if (__builtin_constant_p(s))
|
||||
__asm__ ("shrl %1, %0\n\t"
|
||||
: "+r" (a)
|
||||
- : "ic" ((uint8_t)(-s))
|
||||
+ : "i" (-s & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ ("shrl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+ : "c" ((uint8_t)(-s))
|
||||
+ );
|
||||
return a;
|
||||
}
|
||||
|
||||
--
|
||||
2.30.2
|
||||
@ -1,21 +0,0 @@
|
||||
--- libavutil/hwcontext_vaapi.c.orig 2024-06-09 21:22:38.289653589 +0200
|
||||
+++ libavutil/hwcontext_vaapi.c 2024-06-09 21:26:27.703209698 +0200
|
||||
@@ -1088,7 +1088,7 @@
|
||||
buffer_desc.width = src_fc->width;
|
||||
buffer_desc.height = src_fc->height;
|
||||
buffer_desc.data_size = desc->objects[0].size;
|
||||
- buffer_desc.buffers = &buffer_handle;
|
||||
+ buffer_desc.buffers = (uintptr_t *)&buffer_handle;
|
||||
buffer_desc.num_buffers = 1;
|
||||
buffer_desc.flags = 0;
|
||||
|
||||
@@ -1355,7 +1355,7 @@
|
||||
}
|
||||
|
||||
av_log(hwfc, AV_LOG_DEBUG, "DRM PRIME fd is %ld.\n",
|
||||
- mapping->buffer_info.handle);
|
||||
+ (long int)mapping->buffer_info.handle);
|
||||
|
||||
mapping->drm_desc.nb_objects = 1;
|
||||
mapping->drm_desc.objects[0] = (AVDRMObjectDescriptor) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user