Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id AE7A07A2A1 for ; Sat, 24 Dec 2016 00:01:18 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 1F7F7856A9; Sat, 24 Dec 2016 00:01:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A3E9E855FC for ; Sat, 24 Dec 2016 00:00:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id WWCaXJOzpTBu for ; Sat, 24 Dec 2016 00:00:07 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 220488556E for ; Sat, 24 Dec 2016 00:00:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 18996FBA6; Sat, 24 Dec 2016 00:00:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1482537607203840" MIME-Version: 1.0 Date: Sat, 24 Dec 2016 00:00:07 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/graphics To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20161224000007.18996FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1482537607203840 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1482537607203840 Content-Disposition: inline Content-Length: 1606 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_1482537607203840--