mirror of
https://github.com/void-linux/void-packages.git
synced 2025-09-03 02:23:11 +02:00
ffmpeg6: update to 6.1.3.
This commit is contained in:
John
John Zimmermann
parent
de01de37cb
commit
6825b9efcb
5 changed files with 3 additions and 149 deletions
|
|
@ -1,31 +0,0 @@
|
|||
From 7405f1ad5351cc24b91a0227aeeaf24ff9d12278 Mon Sep 17 00:00:00 2001
|
||||
From: Ramiro Polla <ramiro.polla@gmail.com>
|
||||
Date: Wed, 3 Jul 2024 00:30:08 +0200
|
||||
Subject: [PATCH] configure: restore autodetection of v4l2 and fbdev
|
||||
|
||||
The detection logic for v4l2 and fbdev was accidentally modified to
|
||||
depend on v4l2-m2m in 43b3412.
|
||||
---
|
||||
configure | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index b28221f258965..fa2e384350958 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -7145,11 +7145,12 @@ pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
|
||||
rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
|
||||
xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
|
||||
|
||||
+check_headers linux/fb.h
|
||||
+check_headers linux/videodev2.h
|
||||
+test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
|
||||
+
|
||||
# check V4L2 codecs available in the API
|
||||
if enabled v4l2_m2m; then
|
||||
- check_headers linux/fb.h
|
||||
- check_headers linux/videodev2.h
|
||||
- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
|
||||
check_cc v4l2_m2m linux/videodev2.h "int i = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_VIDEO_M2M | V4L2_BUF_FLAG_LAST;"
|
||||
check_cc vc1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_VC1_ANNEX_G;"
|
||||
check_cc mpeg1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG1;"
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
From 00b64fca55a3a009c9d0e391c85f4fd3291e5d12 Mon Sep 17 00:00:00 2001
|
||||
From: Ramiro Polla <ramiro.polla@gmail.com>
|
||||
Date: Thu, 29 Aug 2024 15:40:00 +0200
|
||||
Subject: [PATCH] configure: improve check for POSIX ioctl
|
||||
|
||||
Instead of relying on system #ifdefs which may or may not be correct,
|
||||
detect the POSIX ioctl signature at configure time.
|
||||
---
|
||||
configure | 2 ++
|
||||
libavdevice/v4l2.c | 2 +-
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 44cfaebf21860..a8e67d230c4a9 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2524,6 +2524,7 @@ HAVE_LIST="
|
||||
opencl_videotoolbox
|
||||
perl
|
||||
pod2man
|
||||
+ posix_ioctl
|
||||
texi2html
|
||||
xmllint
|
||||
zlib_gzip
|
||||
@@ -7166,6 +7167,7 @@ xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
|
||||
check_headers linux/fb.h
|
||||
check_headers linux/videodev2.h
|
||||
test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
|
||||
+test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl
|
||||
|
||||
# check V4L2 codecs available in the API
|
||||
if enabled v4l2_m2m; then
|
||||
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
|
||||
index 42d4b97c8f701..0ae68723382f4 100644
|
||||
--- a/libavdevice/v4l2.c
|
||||
+++ b/libavdevice/v4l2.c
|
||||
@@ -111,7 +111,7 @@ struct video_data {
|
||||
int (*open_f)(const char *file, int oflag, ...);
|
||||
int (*close_f)(int fd);
|
||||
int (*dup_f)(int fd);
|
||||
-#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
|
||||
+#if HAVE_POSIX_IOCTL
|
||||
int (*ioctl_f)(int fd, int request, ...);
|
||||
#else
|
||||
int (*ioctl_f)(int fd, unsigned long int request, ...);
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@arm.com>
|
||||
Date: Fri, 9 Aug 2024 11:32:00 +0100
|
||||
Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with
|
||||
binutils 2.43
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
binutils 2.43 has stricter validation for labels[1] and results in errors
|
||||
when building ffmpeg for armv5:
|
||||
|
||||
src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0'
|
||||
|
||||
Remove the leading zero in the "01" label to resolve this error.
|
||||
|
||||
[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
|
||||
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
Signed-off-by: Martin Storsjö <martin@martin.st>
|
||||
---
|
||||
libavcodec/arm/mlpdsp_armv5te.S | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
|
||||
index 4f9aa485fd21a..d31568611c30f 100644
|
||||
--- a/libavcodec/arm/mlpdsp_armv5te.S
|
||||
+++ b/libavcodec/arm/mlpdsp_armv5te.S
|
||||
@@ -229,7 +229,7 @@ A .endif
|
||||
.endif
|
||||
|
||||
// Begin loop
|
||||
-01:
|
||||
+1:
|
||||
.if TOTAL_TAPS == 0
|
||||
// Things simplify a lot in this case
|
||||
// In fact this could be pipelined further if it's worth it...
|
||||
@@ -241,7 +241,7 @@ A .endif
|
||||
str ST0, [PST, #-4]!
|
||||
str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
|
||||
str ST0, [PSAMP], #4 * MAX_CHANNELS
|
||||
- bne 01b
|
||||
+ bne 1b
|
||||
.else
|
||||
.if \fir_taps & 1
|
||||
.set LOAD_REG, 1
|
||||
@@ -333,7 +333,7 @@ T orr AC0, AC0, AC1
|
||||
str ST3, [PST, #-4]!
|
||||
str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
|
||||
str ST3, [PSAMP], #4 * MAX_CHANNELS
|
||||
- bne 01b
|
||||
+ bne 1b
|
||||
.endif
|
||||
b 99f
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
*** a/libavcodec/libx265.c 2024-08-01 19:22:48.000000000 -0400
|
||||
--- b/libavcodec/libx265.c 2025-05-31 01:04:16.111611835 -0400
|
||||
*************** FF_ENABLE_DEPRECATION_WARNINGS
|
||||
*** 705,709 ****
|
||||
}
|
||||
!
|
||||
ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
|
||||
! pic ? &x265pic : NULL, &x265pic_out);
|
||||
|
||||
--- 705,709 ----
|
||||
}
|
||||
! x265_picture *x265pic_out_ptr = &x265pic_out;
|
||||
ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
|
||||
! pic ? &x265pic : NULL, &x265pic_out_ptr);
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# Template file for 'ffmpeg6'
|
||||
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
|
||||
pkgname=ffmpeg6
|
||||
version=6.1.2
|
||||
revision=8
|
||||
version=6.1.3
|
||||
revision=1
|
||||
hostmakedepends="pkg-config perl"
|
||||
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
|
||||
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
|
||||
|
|
@ -22,7 +22,7 @@ license="GPL-3.0-or-later"
|
|||
homepage="https://www.ffmpeg.org"
|
||||
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
|
||||
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
|
||||
checksum=3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38
|
||||
checksum=bc5f1e4a4d283a6492354684ee1124129c52293bcfc6a9169193539fbece3487
|
||||
|
||||
build_options="vaapi vdpau fdk_aac nvcodec libvpl"
|
||||
desc_option_sofa="Enable support for AES SOFA"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue