commit: 1d09fb44837e0b8265fafa0e1f69f4968050e22b Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Aug 8 09:56:40 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Aug 8 10:08:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d09fb44
media-video/ffmpeg: backport build fix for >=libv4l-1.30 Closes: https://bugs.gentoo.org/961205 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild | 1 + media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild | 1 + .../ffmpeg/files/ffmpeg-7.1.1-libv4l-1.30.patch | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild index 8b2829b7b6d2..587dbb91fb98 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild @@ -288,6 +288,7 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${WORKDIR}"/patches + "${FILESDIR}"/ffmpeg-7.1.1-libv4l-1.30.patch ) pkg_pretend() { diff --git a/media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild index ea5fb10d2d3c..ec2c4d3daede 100644 --- a/media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild @@ -343,6 +343,7 @@ PATCHES=( "${FILESDIR}"/ffmpeg-6.1-opencl-parallel-gmake-fix.patch "${FILESDIR}"/ffmpeg-7.1.1-svt-av1-3.patch "${FILESDIR}"/ffmpeg-7.1.1-npp13.patch + "${FILESDIR}"/ffmpeg-7.1.1-libv4l-1.30.patch ) pkg_pretend() { diff --git a/media-video/ffmpeg/files/ffmpeg-7.1.1-libv4l-1.30.patch b/media-video/ffmpeg/files/ffmpeg-7.1.1-libv4l-1.30.patch new file mode 100644 index 000000000000..0b372e0c48fc --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-7.1.1-libv4l-1.30.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/961205 +https://trac.ffmpeg.org/ticket/11570 +https://github.com/FFmpeg/FFmpeg/commit/5fea5e3e11d6 +--- a/configure ++++ b/configure +@@ -2524,3 +2524,3 @@ + pod2man +- posix_ioctl ++ ioctl_posix + texi2html +@@ -7183,3 +7183,3 @@ + 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 ++test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable ioctl_posix + +--- a/libavdevice/v4l2.c ++++ b/libavdevice/v4l2.c +@@ -113,3 +113,3 @@ + int (*dup_f)(int fd); +-#if HAVE_POSIX_IOCTL ++#if HAVE_IOCTL_POSIX + int (*ioctl_f)(int fd, int request, ...);
