Update multimedia/libv4l 1.8.1 -> 1.10.0. OK?
Best regards, Ingo Index: Makefile =================================================================== RCS file: /cvs/ports/multimedia/libv4l/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile 23 Jan 2016 14:03:11 -0000 1.3 +++ Makefile 30 Jan 2016 11:07:01 -0000 @@ -4,10 +4,9 @@ SHARED_ONLY = Yes COMMENT = libv4l userspace library -VERSION = 1.8.1 +VERSION = 1.10.0 DISTNAME = v4l-utils-${VERSION} PKGNAME = libv4l-${VERSION} -REVISION = 1 SHARED_LIBS += v4l1 0.0 # 0.0 SHARED_LIBS += v4l2 0.0 # 0.0 Index: distinfo =================================================================== RCS file: /cvs/ports/multimedia/libv4l/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 7 Jan 2016 17:12:21 -0000 1.1.1.1 +++ distinfo 30 Jan 2016 11:07:01 -0000 @@ -1,2 +1,2 @@ -SHA256 (v4l-utils-1.8.1.tar.bz2) = L2IZsD8Z6gfBAOhgI41c2/y8/kQKFEd+dRN8wHNDGzM= -SIZE (v4l-utils-1.8.1.tar.bz2) = 1327602 +SHA256 (v4l-utils-1.10.0.tar.bz2) = eOrSfuWKcB18Y0IwPPRSC91KK4ingTvJmgs4kwfkM2s= +SIZE (v4l-utils-1.10.0.tar.bz2) = 1335798 Index: patches/patch-lib_libv4l2_v4l2convert_c =================================================================== RCS file: /cvs/ports/multimedia/libv4l/patches/patch-lib_libv4l2_v4l2convert_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-lib_libv4l2_v4l2convert_c --- patches/patch-lib_libv4l2_v4l2convert_c 7 Jan 2016 17:12:21 -0000 1.1.1.1 +++ patches/patch-lib_libv4l2_v4l2convert_c 30 Jan 2016 11:07:01 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-lib_libv4l2_v4l2convert_c,v 1.1.1.1 2016/01/07 17:12:21 feinerer Exp $ ---- lib/libv4l2/v4l2convert.c.orig Sun Nov 22 11:13:59 2015 -+++ lib/libv4l2/v4l2convert.c Sun Nov 22 11:14:30 2015 -@@ -37,7 +37,11 @@ +$OpenBSD$ +--- lib/libv4l2/v4l2convert.c.orig Sat Jan 30 11:53:05 2016 ++++ lib/libv4l2/v4l2convert.c Sat Jan 30 11:54:10 2016 +@@ -36,7 +36,11 @@ + #include <string.h> #include <sys/ioctl.h> #include <sys/mman.h> - #include "../libv4lconvert/libv4lsyscall-priv.h" +#if defined(__OpenBSD__) +#include <sys/videoio.h> +#else #include <linux/videodev2.h> +#endif #include <libv4l2.h> + #include "../libv4lconvert/libv4lsyscall-priv.h" - /* Check that open/read/mmap is not a define */ Index: patches/patch-lib_libv4lconvert_libv4lsyscall-priv_h =================================================================== RCS file: /cvs/ports/multimedia/libv4l/patches/patch-lib_libv4lconvert_libv4lsyscall-priv_h,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-lib_libv4lconvert_libv4lsyscall-priv_h --- patches/patch-lib_libv4lconvert_libv4lsyscall-priv_h 7 Jan 2016 17:12:21 -0000 1.1.1.1 +++ patches/patch-lib_libv4lconvert_libv4lsyscall-priv_h 30 Jan 2016 11:07:01 -0000 @@ -1,8 +1,8 @@ -$OpenBSD: patch-lib_libv4lconvert_libv4lsyscall-priv_h,v 1.1.1.1 2016/01/07 17:12:21 feinerer Exp $ ---- lib/libv4lconvert/libv4lsyscall-priv.h.orig Sun Sep 27 17:48:48 2015 -+++ lib/libv4lconvert/libv4lsyscall-priv.h Sun Sep 27 17:51:20 2015 -@@ -62,6 +62,15 @@ - typedef off_t __off_t; +$OpenBSD$ +--- lib/libv4lconvert/libv4lsyscall-priv.h.orig Sat Jan 30 11:56:05 2016 ++++ lib/libv4lconvert/libv4lsyscall-priv.h Sat Jan 30 12:00:34 2016 +@@ -63,6 +63,15 @@ + #define MMAP2_PAGE_SHIFT 0 #endif +#if defined(__OpenBSD__) @@ -14,13 +14,13 @@ $OpenBSD: patch-lib_libv4lconvert_libv4l +#define MMAP2_PAGE_SHIFT 0 +#endif + - #if defined(ANDROID) - typedef off_t __off_t; - #endif -@@ -100,6 +109,11 @@ typedef off_t __off_t; + #undef SYS_OPEN + #undef SYS_CLOSE + #undef SYS_IOCTL +@@ -97,6 +106,11 @@ #define SYS_MMAP(addr, len, prot, flags, fd, off) \ syscall(SYS_mmap, (void *)(addr), (size_t)(len), \ - (int)(prot), (int)(flags), (int)(fd), (__off_t)(off)) + (int)(prot), (int)(flags), (int)(fd), (off_t)(off)) +#elif defined(__OpenBSD__) +register_t __syscall(quad_t, ...); +#define SYS_MMAP(addr, len, prot, flags, fd, offset) \