CVS commit: pkgsrc/graphics

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Dec 24 00:00:07 UTC 2016

Modified Files:
        pkgsrc/graphics/opencv: Makefile
        pkgsrc/graphics/opencv-contrib-face: Makefile

Log Message:
jasper fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/opencv-contrib-face/Makefile

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

Modified files:

Index: pkgsrc/graphics/opencv/Makefile
diff -u pkgsrc/graphics/opencv/Makefile:1.64 pkgsrc/graphics/opencv/Makefile:1.65
--- pkgsrc/graphics/opencv/Makefile:1.64        Wed Aug 17 00:06:42 2016
+++ pkgsrc/graphics/opencv/Makefile     Sat Dec 24 00:00:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2016/08/17 00:06:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.65 2016/12/24 00:00:06 markd Exp $
 
 DISTNAME=      opencv-3.1.0
 PKGREVISION=   2
@@ -42,6 +42,9 @@ CMAKE_ARGS+=          -DWITH_EIGEN=NO
 
 CONFIGURE_ENV+=                MACHINE_ARCH=${MACHINE_ARCH}
 
+# jasper uses SIZE_MAX and friends in its headers.
+CXXFLAGS+=             -D__STDC_LIMIT_MACROS
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"

Index: pkgsrc/graphics/opencv-contrib-face/Makefile
diff -u pkgsrc/graphics/opencv-contrib-face/Makefile:1.6 pkgsrc/graphics/opencv-contrib-face/Makefile:1.7
--- pkgsrc/graphics/opencv-contrib-face/Makefile:1.6    Tue Mar 29 10:08:08 2016
+++ pkgsrc/graphics/opencv-contrib-face/Makefile        Sat Dec 24 00:00:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/03/29 10:08:08 markd Exp $
+# $NetBSD: Makefile,v 1.7 2016/12/24 00:00:06 markd Exp $
 
 DISTNAME=      opencv_contrib-3.1.0
 PKGNAME=       ${DISTNAME:S/_contrib/-contrib-face/}
@@ -34,6 +34,9 @@ CMAKE_ARGS+=  -D BUILD_DOCS=OFF
 CXXFLAGS+=             -std=c++11
 .endif
 
+# jasper uses SIZE_MAX and friends in its headers.
+CXXFLAGS+=             -D__STDC_LIMIT_MACROS
+
 CMAKE_ARGS+=           -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
 CMAKE_ARGS.SunOS+=     -DENABLE_PRECOMPILED_HEADERS=NO
 CMAKE_ARGS+=           -DWITH_EIGEN=NO