CVS commit: pkgsrc/mbone/vic-devel

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 27 16:35:10 UTC 2025

Modified Files:
        pkgsrc/mbone/vic-devel: Makefile distinfo
        pkgsrc/mbone/vic-devel/patches: patch-grabber-v4l2.cpp

Log Message:
vic-devel: fix build

Work around
video/grabber-v4l2.cpp:164:9: error: '__u32' does not name a type


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mbone/vic-devel/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mbone/vic-devel/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/mbone/vic-devel/patches/patch-grabber-v4l2.cpp

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

Modified files:

Index: pkgsrc/mbone/vic-devel/Makefile
diff -u pkgsrc/mbone/vic-devel/Makefile:1.30 pkgsrc/mbone/vic-devel/Makefile:1.31
--- pkgsrc/mbone/vic-devel/Makefile:1.30        Sun Nov 12 13:22:41 2023
+++ pkgsrc/mbone/vic-devel/Makefile     Mon Jan 27 16:35:10 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2023/11/12 13:22:41 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2025/01/27 16:35:10 wiz Exp $
 
 DISTNAME=      vic-2.8ucl1.4.0beta-4337
 PKGNAME=       vic-devel-2.8.1.4.0beta.4337
@@ -41,6 +41,8 @@ CONFLICTS+=   vic-[0-9]*
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
+CHECK_PORTABILITY_SKIP+=       .svn/text-base/configure.svn-base
+
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mbone/common-mml/buildlink3.mk"

Index: pkgsrc/mbone/vic-devel/distinfo
diff -u pkgsrc/mbone/vic-devel/distinfo:1.9 pkgsrc/mbone/vic-devel/distinfo:1.10
--- pkgsrc/mbone/vic-devel/distinfo:1.9 Tue Oct 26 10:57:01 2021
+++ pkgsrc/mbone/vic-devel/distinfo     Mon Jan 27 16:35:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:57:01 nia Exp $
+$NetBSD: distinfo,v 1.10 2025/01/27 16:35:10 wiz Exp $
 
 BLAKE2s (vic-2.8ucl1.4.0_ov511.diff.gz) = 6ee05f47167e8496673cc9eb029ac124cc91d78d1d8b9ba49962259dbc23534d
 SHA512 (vic-2.8ucl1.4.0_ov511.diff.gz) = b2618dddb2b07ceec37fb8f11d05c7164bc089f9f720c6d697e2d3b83f086bf2f1efeb99bf79f3b9d164f472fe485b31780d687c9f4fc04a28ba2d22a109dfb5
@@ -11,7 +11,7 @@ SHA1 (patch-codec_tmndec_store.c) = 65b7
 SHA1 (patch-color-swscale.cpp) = 0796262c5db74cc354ce7f55ae246c489f5c9b33
 SHA1 (patch-configure) = bce8d7eacb17644689ba34bc2e5b776f9ce9665e
 SHA1 (patch-crypt-rijndael.cpp) = 5dfda8c17c91fa5f6b2df24d4e1ed93bc4ae5b87
-SHA1 (patch-grabber-v4l2.cpp) = b62fcfdfee0aa7f9515ce1d9ee65b9211873deb7
+SHA1 (patch-grabber-v4l2.cpp) = 5f8f45dbdc506525eb457a518df2cf9b44857587
 SHA1 (patch-main.cpp) = 671cda41595f1f5c001b089ee04b5c84f559330a
 SHA1 (patch-tcl_tcl2cpp_tcl2cpp.c) = 90d7f66a06dfdefebb058da6e688aecb965e3925
 SHA1 (patch-tkStripchart.c) = ab02270a2801684d6d915d268651262e068a9c5c

Index: pkgsrc/mbone/vic-devel/patches/patch-grabber-v4l2.cpp
diff -u pkgsrc/mbone/vic-devel/patches/patch-grabber-v4l2.cpp:1.2 pkgsrc/mbone/vic-devel/patches/patch-grabber-v4l2.cpp:1.3
--- pkgsrc/mbone/vic-devel/patches/patch-grabber-v4l2.cpp:1.2   Tue Jan 14 17:07:37 2014
+++ pkgsrc/mbone/vic-devel/patches/patch-grabber-v4l2.cpp       Mon Jan 27 16:35:10 2025
@@ -1,7 +1,7 @@
-$NetBSD: patch-grabber-v4l2.cpp,v 1.2 2014/01/14 17:07:37 prlw1 Exp $
+$NetBSD: patch-grabber-v4l2.cpp,v 1.3 2025/01/27 16:35:10 wiz Exp $
 
---- video/grabber-v4l2.cpp.orig        2008-12-13 22:12:50.000000000 +0000
-+++ video/grabber-v4l2.cpp     2008-12-13 22:14:26.000000000 +0000
+--- video/grabber-v4l2.cpp.orig        2008-12-10 19:23:08.000000000 +0000
++++ video/grabber-v4l2.cpp
 @@ -34,7 +34,9 @@
  #include <string.h>
  #include <signal.h>
@@ -25,3 +25,13 @@ $NetBSD: patch-grabber-v4l2.cpp,v 1.2 20
  }
  
  #ifdef HAVE_LIBV4L
+@@ -108,6 +114,9 @@ static const char *devlist[] = {
+ #define V4L2_CID_FOCUS_RELATIVE       (V4L2_CID_PRIVATE_BASE + 6)
+ #endif
+ 
++#undef __u32
++#define __u32 uint32_t
++
+ typedef struct tag_vimage
+ {
+         struct v4l2_buffer      vidbuf;