Date: Mon, 09 Mar 2026 16:39:42 +0000 From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 89d99c8a229c - main - multimedia/gstreamer1-plugins-v4l2: fix runtime error Message-ID: <69aef7ce.42bda.281fe5f1@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=89d99c8a229ceb7a88bd1acdb4add9744c04f06e commit 89d99c8a229ceb7a88bd1acdb4add9744c04f06e Author: Max Brazhnikov <makc@FreeBSD.org> AuthorDate: 2026-03-09 16:38:53 +0000 Commit: Max Brazhnikov <makc@FreeBSD.org> CommitDate: 2026-03-09 16:38:53 +0000 multimedia/gstreamer1-plugins-v4l2: fix runtime error Restore lost patch. PR: 236673 --- .../files/patch-sys_v4l2_gstv4l2object.c | 15 ++++++++++++--- multimedia/gstreamer1-plugins-v4l2/Makefile | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_gstv4l2object.c b/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_gstv4l2object.c index de96ece3b07e..213c9e381996 100644 --- a/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_gstv4l2object.c +++ b/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_gstv4l2object.c @@ -1,6 +1,6 @@ ---- sys/v4l2/gstv4l2object.c.orig 2026-01-27 17:02:33 UTC +--- sys/v4l2/gstv4l2object.c.orig 2026-02-26 01:44:06 UTC +++ sys/v4l2/gstv4l2object.c -@@ -573,7 +573,7 @@ v4l2_mmap_wrapper (gpointer start, gsize length, gint +@@ -574,7 +574,7 @@ v4l2_mmap_wrapper (gpointer start, gsize length, gint #endif /* SIZEOF_OFF_T < 8 */ @@ -9,7 +9,16 @@ /* v4l2_ioctl always takes request as unsigned long int, not ioctl_req_t */ static gint v4l2_ioctl_wrapper (gint fd, ioctl_req_t request, ...) -@@ -5385,7 +5385,9 @@ gst_v4l2_object_probe_caps (GstV4l2Object * v4l2object +@@ -3449,7 +3449,7 @@ gst_v4l2_object_is_dmabuf_supported (GstV4l2Object * v + + /* Expected to fail, but ENOTTY tells us that it is not implemented. */ + v4l2object->ioctl (v4l2object->video_fd, VIDIOC_EXPBUF, &expbuf); +- if (errno == ENOTTY) ++ if (errno == ENOTTY || errno == EINVAL) + ret = FALSE; + + return ret; +@@ -5393,7 +5393,9 @@ gst_v4l2_object_probe_caps (GstV4l2Object * v4l2object if (v4l2object->ioctl (v4l2object->video_fd, VIDIOC_CROPCAP, &cropcap) < 0) { switch (errno) { diff --git a/multimedia/gstreamer1-plugins-v4l2/Makefile b/multimedia/gstreamer1-plugins-v4l2/Makefile index 4408ad8be231..eb8845bad9fd 100644 --- a/multimedia/gstreamer1-plugins-v4l2/Makefile +++ b/multimedia/gstreamer1-plugins-v4l2/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= multimedia COMMENT= GStreamer Video 4 Linux 2 source pluginhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69aef7ce.42bda.281fe5f1>