diff options
Diffstat (limited to 'graphics/libv4l/patches/patch-ae')
| -rw-r--r-- | graphics/libv4l/patches/patch-ae | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/graphics/libv4l/patches/patch-ae b/graphics/libv4l/patches/patch-ae index 4612fa4926c..5df34ff5191 100644 --- a/graphics/libv4l/patches/patch-ae +++ b/graphics/libv4l/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.3 2010/12/27 04:58:10 obache Exp $ +$NetBSD: patch-ae,v 1.4 2012/04/18 17:47:22 hans Exp $ --- libv4l2/log.c.orig 2008-09-08 14:45:43.000000000 -0400 +++ libv4l2/log.c 2008-09-08 14:47:53.000000000 -0400 @@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.3 2010/12/27 04:58:10 obache Exp $ #include <linux/ioctl.h> /* These headers are not needed by us, but by linux/videodev2.h, which is broken on some systems and doesn't include them itself :( */ -@@ -25,9 +26,20 @@ +@@ -25,9 +26,28 @@ #include <asm/types.h> /* end broken header workaround includes */ #include <linux/videodev2.h> @@ -18,12 +18,20 @@ $NetBSD: patch-ae,v 1.3 2010/12/27 04:58:10 obache Exp $ +#include <sys/types.h> +#include <sys/ioctl.h> +#include <sys/time.h> ++#ifdef __sun ++#include <sys/videodev2.h> ++#else +#include <sys/videoio.h> +#endif ++#endif #include "libv4l2.h" #include "libv4l2-priv.h" -+#if defined(__NetBSD__) || defined(__DragonFly__) ++#if defined(__sun) ++#define IOCGROUP(x) (((x) >> 8) & 0xff) ++#endif ++ ++#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__sun) +#define _IOC_NR(x) ((x) & 0xff) +#define _IOC_TYPE IOCGROUP +#endif @@ -31,7 +39,7 @@ $NetBSD: patch-ae,v 1.3 2010/12/27 04:58:10 obache Exp $ #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) FILE *v4l2_log_file = NULL; -@@ -84,11 +96,13 @@ +@@ -84,11 +104,13 @@ static const char *v4l2_ioctls[] = { [_IOC_NR(VIDIOC_ENUMAUDOUT)] = "VIDIOC_ENUMAUDOUT", [_IOC_NR(VIDIOC_G_PRIORITY)] = "VIDIOC_G_PRIORITY", [_IOC_NR(VIDIOC_S_PRIORITY)] = "VIDIOC_S_PRIORITY", |