Fixes to build on DragonFly, contains bug fixes for sizeof(mode_t) != sizeof(int)

8 files changed, 74 insertions, 28 deletions

diff --git a/graphics/libv4l/Makefile b/graphics/libv4l/Makefile
index 57425578655..7ed14b27288 100644
--- a/graphics/libv4l/Makefile
+++ b/graphics/libv4l/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/03/18 13:29:07 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/27 04:58:10 obache Exp $
 
 DISTNAME=	libv4l-0.4.3
 PKGREVISION=	2
@@ -15,7 +15,8 @@ USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" && !exists(/usr/include/sys/videoio.h)
+.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") \
+	&& !exists(/usr/include/sys/videoio.h)
 PLIST.needs_videoio=	yes
 INSTALLATION_DIRS+=	include/sys
 
diff --git a/graphics/libv4l/distinfo b/graphics/libv4l/distinfo
index 5df3ad065d6..257942d7ded 100644
--- a/graphics/libv4l/distinfo
+++ b/graphics/libv4l/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.5 2009/01/10 21:04:23 jmcneill Exp $
+$NetBSD: distinfo,v 1.6 2010/12/27 04:58:10 obache Exp $
 
 SHA1 (libv4l-0.4.3.tar.gz) = 2539aa6b04650b97c9fc7ba95721f1e362a73031
 RMD160 (libv4l-0.4.3.tar.gz) = 4f0435d955f15602ac093385607417fab71deb17
 Size (libv4l-0.4.3.tar.gz) = 83022 bytes
-SHA1 (patch-aa) = d3b528e877cce85ae8ac5478e6873daf3573d7ac
+SHA1 (patch-aa) = a4be4c6f09f0a16affba135b10794e01d7c2541b
 SHA1 (patch-ab) = 8528622d992e977d6e28388335db0a7c29ab272f
-SHA1 (patch-ac) = ba6d3502793f380a6f448c42c84a500147b041bb
-SHA1 (patch-ad) = 053ec7cea81c916d172df6f6f450fec23638d38f
-SHA1 (patch-ae) = d1cadfdf41f7b46311e828600352bfac6c3d6c22
+SHA1 (patch-ac) = e886846a68d20d9c3eed905f10143f5e9f9fa4a0
+SHA1 (patch-ad) = e5a3acfb8c2411bf76c4c43cbe09ba86a19afe84
+SHA1 (patch-ae) = afb8579ac122dc2f0958b3c3d711d3641cf3c0c0
 SHA1 (patch-af) = ce15db36e94b0e386f86b4a024a5eb6d972d0958
 SHA1 (patch-ah) = d32f2e6aa694d4f0d04e8afbf462b3e61a31bbcc
 SHA1 (patch-ai) = 8f22e4050d5e20981bfdd1fc51e572e42347c2b5
 SHA1 (patch-aj) = 2545189ac57f97ff181645132c25b32aa51f6a47
-SHA1 (patch-ak) = af991dbb997c8b4fa7cdbed3aab105aef3edfa1b
+SHA1 (patch-ak) = 3c5e709edde178619d4232c8bcd233bc6095ad52
 SHA1 (patch-al) = a6eae236be7e16e03047d09b58a6f6d8baafd193
-SHA1 (patch-am) = 6599640b9cd142af82167e3cf03920d8b18912bb
+SHA1 (patch-am) = 477c7b372b06b98ed945772f77313773b77512e5
diff --git a/graphics/libv4l/patches/patch-aa b/graphics/libv4l/patches/patch-aa
index fac295758de..71feccf30df 100644
--- a/graphics/libv4l/patches/patch-aa
+++ b/graphics/libv4l/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2008/09/08 19:10:20 jmcneill Exp $
+$NetBSD: patch-aa,v 1.3 2010/12/27 04:58:10 obache Exp $
 
 --- include/libv4lconvert.h.orig	2008-09-08 14:33:17.000000000 -0400
 +++ include/libv4lconvert.h	2008-09-08 14:34:03.000000000 -0400
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2008/09/08 19:10:20 jmcneill Exp $
  #include <linux/ioctl.h>
  /* end broken header workaround includes */
  #include <linux/videodev2.h>
-+#elif defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 +#include <sys/types.h>
 +#include <sys/ioctl.h>
 +#include <sys/videoio.h>
diff --git a/graphics/libv4l/patches/patch-ac b/graphics/libv4l/patches/patch-ac
index b5a6492ca5f..9e2c86000af 100644
--- a/graphics/libv4l/patches/patch-ac
+++ b/graphics/libv4l/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2008/09/08 19:10:20 jmcneill Exp $
+$NetBSD: patch-ac,v 1.3 2010/12/27 04:58:10 obache Exp $
 
 --- include/libv4l2.h.orig	2008-09-08 14:42:22.000000000 -0400
 +++ include/libv4l2.h	2008-09-08 14:43:43.000000000 -0400
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.2 2008/09/08 19:10:20 jmcneill Exp $
  #include <stdio.h>
  #include <unistd.h>
  
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <sys/types.h>
 +typedef off_t __off64_t;
 +#endif
diff --git a/graphics/libv4l/patches/patch-ad b/graphics/libv4l/patches/patch-ad
index 62d5fb4ff38..42b62b98364 100644
--- a/graphics/libv4l/patches/patch-ad
+++ b/graphics/libv4l/patches/patch-ad
@@ -1,7 +1,10 @@
-$NetBSD: patch-ad,v 1.3 2008/09/13 17:59:27 jmcneill Exp $
+$NetBSD: patch-ad,v 1.4 2010/12/27 04:58:10 obache Exp $
 
---- libv4l2/libv4l2.c.orig	2008-09-03 06:23:46.000000000 -0400
-+++ libv4l2/libv4l2.c	2008-09-13 13:50:47.000000000 -0400
+* XXX
+* `mode_t' is promoted to `int' when passwd through `...'.
+
+--- libv4l2/libv4l2.c.orig	2008-09-03 10:23:46.000000000 +0000
++++ libv4l2/libv4l2.c
 @@ -59,7 +59,11 @@
  #include <stdarg.h>
  #include <stdio.h>
@@ -25,7 +28,7 @@ $NetBSD: patch-ad,v 1.3 2008/09/13 17:59:27 jmcneill Exp $
  /* Note these flags are stored together with the flags passed to v4l2_fd_open()
     in v4l2_dev_info's flags member, so care should be taken that the do not
     use the same bits! */
-@@ -154,7 +162,7 @@
+@@ -154,7 +162,7 @@ static int v4l2_map_buffers(int index)
        break;
      }
  
@@ -34,7 +37,16 @@ $NetBSD: patch-ad,v 1.3 2008/09/13 17:59:27 jmcneill Exp $
        (size_t)buf.length, PROT_READ|PROT_WRITE, MAP_SHARED, devices[index].fd,
        (__off_t)(buf.m.offset >> MMAP2_PAGE_SHIFT));
      if (devices[index].frame_pointers[i] == MAP_FAILED) {
-@@ -871,7 +879,7 @@
+@@ -408,7 +416,7 @@ int v4l2_open (const char *file, int ofl
+     mode_t mode;
+ 
+     va_start (ap, oflag);
+-    mode = va_arg (ap, mode_t);
++    mode = (mode_t)va_arg (ap, int);
+ 
+     fd = syscall(SYS_open, file, oflag, mode);
+ 
+@@ -871,7 +879,7 @@ int v4l2_ioctl (int fd, unsigned long in
  	   but we need the buffer _now_ to write our converted data
  	   to it! */
  	if (devices[index].convert_mmap_buf == MAP_FAILED) {
@@ -43,7 +55,7 @@ $NetBSD: patch-ad,v 1.3 2008/09/13 17:59:27 jmcneill Exp $
  						   (size_t)(
  						     devices[index].no_frames *
  						     V4L2_FRAME_BUF_SIZE),
-@@ -995,7 +1003,7 @@
+@@ -995,7 +1003,7 @@ void *v4l2_mmap(void *start, size_t leng
        return MAP_FAILED;
      }
  
@@ -52,7 +64,7 @@ $NetBSD: patch-ad,v 1.3 2008/09/13 17:59:27 jmcneill Exp $
  			   (__off_t)(offset >> MMAP2_PAGE_SHIFT));
    }
  
-@@ -1012,7 +1020,7 @@
+@@ -1012,7 +1020,7 @@ void *v4l2_mmap(void *start, size_t leng
    }
  
    if (devices[index].convert_mmap_buf == MAP_FAILED) {
diff --git a/graphics/libv4l/patches/patch-ae b/graphics/libv4l/patches/patch-ae
index 3777f3d0693..4612fa4926c 100644
--- a/graphics/libv4l/patches/patch-ae
+++ b/graphics/libv4l/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2008/09/08 19:10:20 jmcneill Exp $
+$NetBSD: patch-ae,v 1.3 2010/12/27 04:58:10 obache Exp $
 
 --- libv4l2/log.c.orig	2008-09-08 14:45:43.000000000 -0400
 +++ libv4l2/log.c	2008-09-08 14:47:53.000000000 -0400
@@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.2 2008/09/08 19:10:20 jmcneill Exp $
  #include "libv4l2.h"
  #include "libv4l2-priv.h"
  
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#define _IOC_NR(x)	((x) & 0xff)
 +#define _IOC_TYPE	IOCGROUP
 +#endif
diff --git a/graphics/libv4l/patches/patch-ak b/graphics/libv4l/patches/patch-ak
index 4164421bf57..76483c5a6e0 100644
--- a/graphics/libv4l/patches/patch-ak
+++ b/graphics/libv4l/patches/patch-ak
@@ -1,7 +1,10 @@
-$NetBSD: patch-ak,v 1.1 2009/01/10 21:04:23 jmcneill Exp $
+$NetBSD: patch-ak,v 1.2 2010/12/27 04:58:10 obache Exp $
 
---- libv4l1/libv4l1.c.orig	2009-01-10 15:34:52.000000000 -0500
-+++ libv4l1/libv4l1.c	2009-01-10 15:35:47.000000000 -0500
+* XXX
+* 'mode_t' is promoted to `int' when passwd through `...'.
+
+--- libv4l1/libv4l1.c.orig	2008-08-06 08:46:06.000000000 +0000
++++ libv4l1/libv4l1.c
 @@ -44,12 +44,13 @@
  #include <stdarg.h>
  #include <stdio.h>
@@ -38,3 +41,12 @@ $NetBSD: patch-ak,v 1.1 2009/01/10 21:04:23 jmcneill Exp $
  #define V4L1_SUPPORTS_ENUMINPUT 0x01
  #define V4L1_SUPPORTS_ENUMSTD   0x02
  #define V4L1_PIX_FMT_TOUCHED    0x04
+@@ -267,7 +278,7 @@ int v4l1_open (const char *file, int ofl
+     mode_t mode;
+ 
+     va_start (ap, oflag);
+-    mode = va_arg (ap, mode_t);
++    mode = (mode_t)va_arg (ap, int);
+ 
+     fd = syscall(SYS_open, file, oflag, mode);
+ 
diff --git a/graphics/libv4l/patches/patch-am b/graphics/libv4l/patches/patch-am
index 78ddf2b4b8c..b7cd11b1d40 100644
--- a/graphics/libv4l/patches/patch-am
+++ b/graphics/libv4l/patches/patch-am
@@ -1,7 +1,10 @@
-$NetBSD: patch-am,v 1.1 2009/01/10 21:04:23 jmcneill Exp $
+$NetBSD: patch-am,v 1.2 2010/12/27 04:58:10 obache Exp $
 
---- libv4l1/v4l1compat.c.orig	2009-01-10 15:37:56.000000000 -0500
-+++ libv4l1/v4l1compat.c	2009-01-10 15:38:45.000000000 -0500
+* XXXX
+* `mode_t' is promoted to `int' when passed through `...'.
+
+--- libv4l1/v4l1compat.c.orig	2008-08-26 12:32:39.000000000 +0000
++++ libv4l1/v4l1compat.c
 @@ -40,6 +40,10 @@
  #define LIBV4L_PUBLIC
  #endif
@@ -13,3 +16,21 @@ $NetBSD: patch-am,v 1.1 2009/01/10 21:04:23 jmcneill Exp $
  LIBV4L_PUBLIC int open (const char *file, int oflag, ...)
  {
    int fd;
+@@ -50,7 +54,7 @@ LIBV4L_PUBLIC int open (const char *file
+     mode_t mode;
+ 
+     va_start (ap, oflag);
+-    mode = va_arg (ap, mode_t);
++    mode = (mode_t)va_arg (ap, int);
+ 
+     fd = v4l1_open(file, oflag, mode);
+ 
+@@ -71,7 +75,7 @@ LIBV4L_PUBLIC int open64 (const char *fi
+     mode_t mode;
+ 
+     va_start (ap, oflag);
+-    mode = va_arg (ap, mode_t);
++    mode = (mode_t)va_arg (ap, int);
+ 
+     fd = v4l1_open(file, oflag | O_LARGEFILE, mode);
+