From: Klemens Nanni <kn@openbsd.org>
Subject: multimedia/libv4l: update to 1.24.1
To: ports@openbsd.org
Date: Fri,  2 Feb 2024 08:40:28 +0000

https://git.linuxtv.org/v4l-utils.git/tree/ChangeLog?h=stable-1.24

Last release using autoconf, fixing the build turned out trivial.
VLC still happily shows/records from my camera.

I also have a diff for 1.26.1 incl. the meson switch, but would do
that separately after 1.24.1 has been in for a while, just like the
1.22.1 update had now (no fallout/regressions so far).

Feedback? OK?


Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libv4l/Makefile,v
diff -u -p -r1.35 Makefile
--- Makefile	14 Jan 2024 17:28:45 -0000	1.35
+++ Makefile	2 Feb 2024 08:24:39 -0000
@@ -1,7 +1,7 @@
 COMMENT =		libv4l userspace library
 
-# 1.24 fails to build, 1.26 dropped auto* for meson
-VERSION =		1.22.1
+# 1.26 dropped auto* for meson
+VERSION =		1.24.1
 DISTNAME =		v4l-utils-${VERSION}
 PKGNAME =		libv4l-${VERSION}
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/libv4l/distinfo,v
diff -u -p -r1.20 distinfo
--- distinfo	14 Jan 2024 17:28:45 -0000	1.20
+++ distinfo	2 Feb 2024 08:13:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (v4l-utils-1.22.1.tar.bz2) = Zcb76DCkTKEFxEOwJxgsGyyQU6kdHnKthJ36s4i5TjE=
-SIZE (v4l-utils-1.22.1.tar.bz2) = 2086238
+SHA256 (v4l-utils-1.24.1.tar.bz2) = y7f+imMH9c5TOgXN7XC7k8O6BjlaubbQB+tTt12AX1s=
+SIZE (v4l-utils-1.24.1.tar.bz2) = 2238340
Index: patches/patch-lib_libv4lconvert_Makefile_in
===================================================================
RCS file: /cvs/ports/multimedia/libv4l/patches/patch-lib_libv4lconvert_Makefile_in,v
diff -u -p -r1.11 patch-lib_libv4lconvert_Makefile_in
--- patches/patch-lib_libv4lconvert_Makefile_in	14 Jan 2024 17:28:45 -0000	1.11
+++ patches/patch-lib_libv4lconvert_Makefile_in	2 Feb 2024 02:13:41 -0000
@@ -3,7 +3,7 @@ OpenBSD does not have an rt library.
 Index: lib/libv4lconvert/Makefile.in
 --- lib/libv4lconvert/Makefile.in.orig
 +++ lib/libv4lconvert/Makefile.in
-@@ -548,7 +548,7 @@ libv4lconvert_la_SOURCES = libv4lconvert.c tinyjpeg.c 
+@@ -551,7 +551,7 @@ libv4lconvert_la_SOURCES = libv4lconvert.c tinyjpeg.c 
  	libv4lconvert-priv.h libv4lsyscall-priv.h tinyjpeg.h \
  	tinyjpeg-internal.h $(am__append_1) $(am__append_2)
  libv4lconvert_la_CPPFLAGS = $(CFLAG_VISIBILITY) $(ENFORCE_LIBV4L_STATIC)
Index: patches/patch-lib_libv4lconvert_libv4lconvert_c
===================================================================
RCS file: patches/patch-lib_libv4lconvert_libv4lconvert_c
diff -N patches/patch-lib_libv4lconvert_libv4lconvert_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_libv4lconvert_libv4lconvert_c	2 Feb 2024 08:37:36 -0000
@@ -0,0 +1,31 @@
+Hide unsupported V4L2_PIX_FMT_SN9C20X_I420 format.
+
+Index: lib/libv4lconvert/libv4lconvert.c
+--- lib/libv4lconvert/libv4lconvert.c.orig
++++ lib/libv4lconvert/libv4lconvert.c
+@@ -138,7 +138,9 @@ static const struct v4lconvert_pixfmt supported_src_pi
+ 	{ V4L2_PIX_FMT_KONICA420,	12,	 6,	 3,	1 },
+ 	{ V4L2_PIX_FMT_SN9C20X_I420,	12,	 6,	 3,	1 },
+ 	{ V4L2_PIX_FMT_M420,		12,	 6,	 3,	1 },
++#if !defined(__OpenBSD__)
+ 	{ V4L2_PIX_FMT_NV12_16L16,	12,	 6,	 3,	1 },
++#endif
+ 	{ V4L2_PIX_FMT_NV12,		12,	 6,	 3,	1 },
+ 	{ V4L2_PIX_FMT_CPIA1,		 0,	 6,	 3,	1 },
+ 	/* JPEG and variants */
+@@ -915,6 +917,7 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert
+ 		break;
+ 	}
+ 
++#if !defined(__OpenBSD__)
+ 		/* Conexant cx2341x raw video macroblock format */
+ 	case V4L2_PIX_FMT_NV12_16L16:
+ 		switch (dest_pix_fmt) {
+@@ -932,6 +935,7 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert
+ 			break;
+ 		}
+ 		break;
++#endif
+ 
+ 		/* NV12 formats */
+ 	case V4L2_PIX_FMT_NV12: