Index | Thread | Search

From:
Brad Smith <brad@comstyle.com>
Subject:
UPDATE: FFmpeg
To:
ports@openbsd.org
Date:
Thu, 13 Jun 2024 16:51:15 -0400

Download raw body.

Thread
  • Brad Smith:

    UPDATE: FFmpeg

Backport a bug fix from upstream.

lavd/v4l2: Use proper field type for second parameter of ioctl() with BSD's


Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.237
diff -u -p -u -p -r1.237 Makefile
--- Makefile	18 Dec 2023 15:13:06 -0000	1.237
+++ Makefile	11 May 2024 21:17:16 -0000
@@ -3,7 +3,7 @@ COMMENT=	audio/video converter and strea
 V=		4.4.4
 DISTNAME=	ffmpeg-${V}
 EPOCH=		1
-REVISION=	3
+REVISION=	4
 CATEGORIES=	graphics multimedia
 SITES=		https://ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.xz
Index: patches/patch-libavdevice_v4l2_c
===================================================================
RCS file: patches/patch-libavdevice_v4l2_c
diff -N patches/patch-libavdevice_v4l2_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-libavdevice_v4l2_c	11 May 2024 21:17:16 -0000
@@ -0,0 +1,20 @@
+lavd/v4l2: Use proper field type for second parameter of ioctl() with BSD's
+9e674b31606c805dd31b4bb754364a72a5877238
+
+Index: libavdevice/v4l2.c
+--- libavdevice/v4l2.c.orig
++++ libavdevice/v4l2.c
+@@ -107,10 +107,10 @@ struct video_data {
+     int (*open_f)(const char *file, int oflag, ...);
+     int (*close_f)(int fd);
+     int (*dup_f)(int fd);
+-#ifdef __GLIBC__
+-    int (*ioctl_f)(int fd, unsigned long int request, ...);
+-#else
++#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
+     int (*ioctl_f)(int fd, int request, ...);
++#else
++    int (*ioctl_f)(int fd, unsigned long int request, ...);
+ #endif
+     ssize_t (*read_f)(int fd, void *buffer, size_t n);
+     void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);