CVS commit: pkgsrc/graphics/libv4l

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Feb 26 17:28:51 UTC 2020

Modified Files:
        pkgsrc/graphics/libv4l: distinfo
        pkgsrc/graphics/libv4l/patches: patch-ae

Log Message:
libv4l: fix build on linux > 4.19 where VIDIOC_RESERVED was removed in a
header.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/libv4l/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/libv4l/patches/patch-ae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/libv4l/distinfo
diff -u pkgsrc/graphics/libv4l/distinfo:1.17 pkgsrc/graphics/libv4l/distinfo:1.18
--- pkgsrc/graphics/libv4l/distinfo:1.17        Thu Nov 14 15:22:49 2019
+++ pkgsrc/graphics/libv4l/distinfo     Wed Feb 26 17:28:51 2020
@@ -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) = 2e6e4d525be190a890c03c
 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

Index: pkgsrc/graphics/libv4l/patches/patch-ae
diff -u pkgsrc/graphics/libv4l/patches/patch-ae:1.4 pkgsrc/graphics/libv4l/patches/patch-ae:1.5
--- pkgsrc/graphics/libv4l/patches/patch-ae:1.4 Wed Apr 18 17:47:22 2012
+++ pkgsrc/graphics/libv4l/patches/patch-ae     Wed Feb 26 17:28:51 2020
@@ -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
  #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",