CVS commit: pkgsrc/graphics/libv4l

["Richard PALO" <richard%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   richard
Date:           Fri Sep  9 21:07:23 UTC 2016

Modified Files:
        pkgsrc/graphics/libv4l: Makefile distinfo
        pkgsrc/graphics/libv4l/patches: patch-af

Log Message:
Add symlink back after fixing videodev.h to include/linux (thanks wiz@)
Also fix typo in SYS_open check and use _XOPEN_SOURCE=500 for SunOS
in order to get prototype for things like snprintf().


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/libv4l/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/libv4l/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/libv4l/patches/patch-af

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/Makefile
diff -u pkgsrc/graphics/libv4l/Makefile:1.12 pkgsrc/graphics/libv4l/Makefile:1.13
--- pkgsrc/graphics/libv4l/Makefile:1.12        Thu Sep  8 15:43:12 2016
+++ pkgsrc/graphics/libv4l/Makefile     Fri Sep  9 21:07:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/09/08 15:43:12 richard Exp $
+# $NetBSD: Makefile,v 1.13 2016/09/09 21:07:23 richard Exp $
 
 DISTNAME=      libv4l-0.4.3
 PKGREVISION=   3
@@ -32,11 +32,13 @@ post-install:
 pre-configure:
        ${MKDIR} ${BUILDLINK_DIR}/include/linux
        cp ${FILESDIR}/videodev.h ${BUILDLINK_DIR}/include/linux
+       ${LN} -sf ${BUILDLINK_DIR}/include/linux/videodev.h \
+               ${BUILDLINK_DIR}/include/
 .endif
 
 PLIST_VARS=    needs_videoio
 
-CPPFLAGS.SunOS+=       -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1
+CPPFLAGS.SunOS+=       -D_XOPEN_SOURCE=500
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/libv4l/distinfo
diff -u pkgsrc/graphics/libv4l/distinfo:1.15 pkgsrc/graphics/libv4l/distinfo:1.16
--- pkgsrc/graphics/libv4l/distinfo:1.15        Thu Sep  8 15:43:12 2016
+++ pkgsrc/graphics/libv4l/distinfo     Fri Sep  9 21:07:23 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2016/09/08 15:43:12 richard Exp $
+$NetBSD: distinfo,v 1.16 2016/09/09 21:07:23 richard Exp $
 
 SHA1 (libv4l-0.4.3.tar.gz) = 2539aa6b04650b97c9fc7ba95721f1e362a73031
 RMD160 (libv4l-0.4.3.tar.gz) = 4f0435d955f15602ac093385607417fab71deb17
@@ -9,7 +9,7 @@ SHA1 (patch-ab) = 5ade487d6d64d280f3fdae
 SHA1 (patch-ac) = 5457af836909f1c9f759c6a780daeb13968ec91f
 SHA1 (patch-ad) = 998090cf0748a9ecb51455de1fc5c0371795f226
 SHA1 (patch-ae) = 1bdefe4897c6edbe4049c52d963f1769bd916750
-SHA1 (patch-af) = 47c55033c1ce23ea725f5d377c71140289cfb9a3
+SHA1 (patch-af) = 755ea097776507f28e91050171f3ff9f879a5354
 SHA1 (patch-ah) = d32f2e6aa694d4f0d04e8afbf462b3e61a31bbcc
 SHA1 (patch-ai) = 8f22e4050d5e20981bfdd1fc51e572e42347c2b5
 SHA1 (patch-aj) = 521abdfba83a34716ce0909f75d784fe0b6ecc8a

Index: pkgsrc/graphics/libv4l/patches/patch-af
diff -u pkgsrc/graphics/libv4l/patches/patch-af:1.7 pkgsrc/graphics/libv4l/patches/patch-af:1.8
--- pkgsrc/graphics/libv4l/patches/patch-af:1.7 Thu Sep  8 15:43:12 2016
+++ pkgsrc/graphics/libv4l/patches/patch-af     Fri Sep  9 21:07:23 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.7 2016/09/08 15:43:12 richard Exp $
+$NetBSD: patch-af,v 1.8 2016/09/09 21:07:23 richard Exp $
 
 * XXXX
 * `mode_t' is promoted to `int' when passed through `...'.
@@ -54,7 +54,7 @@ $NetBSD: patch-af,v 1.7 2016/09/08 15:43
 -    mode = va_arg (ap, mode_t);
 +    mode = (sizeof (mode_t) < sizeof (int) ? (mode_t)va_arg (ap, int) : va_arg (ap, mode_t));
  
-+#ifdef SYS_OPEN
++#ifdef SYS_open
      fd = syscall(SYS_open, file, oflag, mode);
 -
 +#else
@@ -62,7 +62,7 @@ $NetBSD: patch-af,v 1.7 2016/09/08 15:43
 +#endif
      va_end(ap);
    } else
-+#ifdef SYS_OPEN
++#ifdef SYS_open
      fd = syscall(SYS_open, file, oflag);
 +#else
 +    fd = syscall(SYS_openat, AT_FDCWD, file, oflag);