From 114f412408922f39e11b9f1365003f6a9ca563ec Mon Sep 17 00:00:00 2001 From: Aleksey Vasilenko Date: Sat, 23 Aug 2025 01:59:21 +0300 Subject: [PATCH] ffmpeg: update to 6.1.3 - Remove 2 upstreamed patches Signed-off-by: Aleksey Vasilenko --- multimedia/ffmpeg/Makefile | 6 +-- ...tore-autodetection-of-v4l2-and-fbdev.patch | 29 ------------- ...figure-improve-check-for-POSIX-ioctl.patch | 41 ------------------- 3 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 multimedia/ffmpeg/patches/100-configure-restore-autodetection-of-v4l2-and-fbdev.patch delete mode 100644 multimedia/ffmpeg/patches/110-configure-improve-check-for-POSIX-ioctl.patch diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 411975f8aa..ca6e057fbe 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ffmpeg -PKG_VERSION:=6.1.2 -PKG_RELEASE:=3 +PKG_VERSION:=6.1.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ffmpeg.org/releases/ -PKG_HASH:=3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38 +PKG_HASH:=bc5f1e4a4d283a6492354684ee1124129c52293bcfc6a9169193539fbece3487 PKG_MAINTAINER:=Ted Hess , \ Ian Leonard diff --git a/multimedia/ffmpeg/patches/100-configure-restore-autodetection-of-v4l2-and-fbdev.patch b/multimedia/ffmpeg/patches/100-configure-restore-autodetection-of-v4l2-and-fbdev.patch deleted file mode 100644 index 337d28fc70..0000000000 --- a/multimedia/ffmpeg/patches/100-configure-restore-autodetection-of-v4l2-and-fbdev.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7405f1ad5351cc24b91a0227aeeaf24ff9d12278 Mon Sep 17 00:00:00 2001 -From: Ramiro Polla -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(-) - ---- a/configure -+++ b/configure -@@ -6985,11 +6985,12 @@ pod2man --help > /dev/null 2>&1 && e - 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;" diff --git a/multimedia/ffmpeg/patches/110-configure-improve-check-for-POSIX-ioctl.patch b/multimedia/ffmpeg/patches/110-configure-improve-check-for-POSIX-ioctl.patch deleted file mode 100644 index 5b7bd03a62..0000000000 --- a/multimedia/ffmpeg/patches/110-configure-improve-check-for-POSIX-ioctl.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 00b64fca55a3a009c9d0e391c85f4fd3291e5d12 Mon Sep 17 00:00:00 2001 -From: Ramiro Polla -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(-) - ---- a/configure -+++ b/configure -@@ -2450,6 +2450,7 @@ HAVE_LIST=" - opencl_vaapi_intel_media - perl - pod2man -+ posix_ioctl - texi2html - xmllint - zlib_gzip -@@ -6988,6 +6989,7 @@ xmllint --version > /dev/null 2>&1 && e - 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 ---- a/libavdevice/v4l2.c -+++ b/libavdevice/v4l2.c -@@ -107,7 +107,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, ...); -- 2.30.2