diff options
| author | maya <maya@pkgsrc.org> | 2020-02-26 17:28:51 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2020-02-26 17:28:51 +0000 |
| commit | ac8e16227bcf0a35322f99a362b1d4172602b1e0 (patch) | |
| tree | b722932577f42f057bebb23bbda1944480e8746d | |
| parent | acdaf8b22e0ac50d18bee7c83bd43882c19958a3 (diff) | |
| download | pkgsrc-ac8e16227bcf0a35322f99a362b1d4172602b1e0.tar.gz | |
libv4l: fix build on linux > 4.19 where VIDIOC_RESERVED was removed in a
header.
| -rw-r--r-- | graphics/libv4l/distinfo | 4 | ||||
| -rw-r--r-- | graphics/libv4l/patches/patch-ae | 21 |
2 files changed, 19 insertions, 6 deletions
diff --git a/graphics/libv4l/distinfo b/graphics/libv4l/distinfo index 40df60db06b..a0bde4aab11 100644 --- a/graphics/libv4l/distinfo +++ b/graphics/libv4l/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2019/11/14 15:22:49 wiz Exp $ +$NetBSD: distinfo,v 1.18 2020/02/26 17:28:51 maya Exp $ SHA1 (libv4l-0.4.3.tar.gz) = 2539aa6b04650b97c9fc7ba95721f1e362a73031 RMD160 (libv4l-0.4.3.tar.gz) = 4f0435d955f15602ac093385607417fab71deb17 @@ -8,7 +8,7 @@ SHA1 (patch-aa) = 2e6e4d525be190a890c03ca3d00ba77f7e06d124 SHA1 (patch-ab) = 5ade487d6d64d280f3fdae8afad99fbd0b6e5eda SHA1 (patch-ac) = 5457af836909f1c9f759c6a780daeb13968ec91f SHA1 (patch-ad) = 998090cf0748a9ecb51455de1fc5c0371795f226 -SHA1 (patch-ae) = 1bdefe4897c6edbe4049c52d963f1769bd916750 +SHA1 (patch-ae) = ac2be9e54fd8bb5ecedb67c72b27d702abe75603 SHA1 (patch-af) = 755ea097776507f28e91050171f3ff9f879a5354 SHA1 (patch-ah) = c3f6a185fe8380b5c6b1f81cb62f0f4afef24449 SHA1 (patch-ai) = 8f22e4050d5e20981bfdd1fc51e572e42347c2b5 diff --git a/graphics/libv4l/patches/patch-ae b/graphics/libv4l/patches/patch-ae index 5df34ff5191..42cc10db791 100644 --- a/graphics/libv4l/patches/patch-ae +++ b/graphics/libv4l/patches/patch-ae @@ -1,7 +1,10 @@ -$NetBSD: patch-ae,v 1.4 2012/04/18 17:47:22 hans Exp $ +$NetBSD: patch-ae,v 1.5 2020/02/26 17:28:51 maya Exp $ ---- libv4l2/log.c.orig 2008-09-08 14:45:43.000000000 -0400 -+++ libv4l2/log.c 2008-09-08 14:47:53.000000000 -0400 +SunOS, BSDs support. +Tolerate VIDIOC_RESERVED removal in linux 4.19 + +--- libv4l2/log.c.orig 2008-08-26 12:36:41.000000000 +0000 ++++ libv4l2/log.c @@ -18,6 +18,7 @@ #include <stdio.h> @@ -39,7 +42,17 @@ $NetBSD: patch-ae,v 1.4 2012/04/18 17:47:22 hans Exp $ #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) FILE *v4l2_log_file = NULL; -@@ -84,11 +104,13 @@ static const char *v4l2_ioctls[] = { +@@ -35,7 +55,9 @@ FILE *v4l2_log_file = NULL; + static const char *v4l2_ioctls[] = { + /* start v4l2 ioctls */ + [_IOC_NR(VIDIOC_QUERYCAP)] = "VIDIOC_QUERYCAP", ++#ifdef VIDIOC_RESERVED + [_IOC_NR(VIDIOC_RESERVED)] = "VIDIOC_RESERVED", ++#endif + [_IOC_NR(VIDIOC_ENUM_FMT)] = "VIDIOC_ENUM_FMT", + [_IOC_NR(VIDIOC_G_FMT)] = "VIDIOC_G_FMT", + [_IOC_NR(VIDIOC_S_FMT)] = "VIDIOC_S_FMT", +@@ -84,11 +106,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", |