CVS commit: pkgsrc/graphics/opencv

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Mar  1 15:36:01 UTC 2020

Modified Files:
        pkgsrc/graphics/opencv: Makefile buildlink3.mk options.mk

Log Message:
opencv: Restore optionality of jasper

bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/opencv/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/opencv/options.mk

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.88 pkgsrc/graphics/opencv/Makefile:1.89
--- pkgsrc/graphics/opencv/Makefile:1.88        Thu Feb 13 09:23:46 2020
+++ pkgsrc/graphics/opencv/Makefile     Sun Mar  1 15:36:01 2020
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.88 2020/02/13 09:23:46 adam Exp $
+# $NetBSD: Makefile,v 1.89 2020/03/01 15:36:01 nia Exp $
 
 .include "Makefile.common"
 
 DISTNAME=      opencv-${OPENCV_VERSION}
+PKGREVISION=   1
 
 MAINTAINER=    anthony.mallet%laas.fr@localhost
 COMMENT=       Library for computer vision problems
@@ -32,7 +33,6 @@ post-install:
 
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/graphics/opencv/buildlink3.mk
diff -u pkgsrc/graphics/opencv/buildlink3.mk:1.5 pkgsrc/graphics/opencv/buildlink3.mk:1.6
--- pkgsrc/graphics/opencv/buildlink3.mk:1.5    Thu Feb 13 09:23:46 2020
+++ pkgsrc/graphics/opencv/buildlink3.mk        Sun Mar  1 15:36:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/02/13 09:23:46 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2020/03/01 15:36:01 nia Exp $
 
 BUILDLINK_TREE+=       opencv
 
@@ -8,9 +8,12 @@ OPENCV_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.opencv+= opencv>=3.0.0
 BUILDLINK_PKGSRCDIR.opencv?=   ../../graphics/opencv
 
+.include "../../mk/pkg-build-options.mk"
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.opencv:Mjasper)
+.  include "../../graphics/jasper/buildlink3.mk"
+.endif
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/graphics/opencv/options.mk
diff -u pkgsrc/graphics/opencv/options.mk:1.10 pkgsrc/graphics/opencv/options.mk:1.11
--- pkgsrc/graphics/opencv/options.mk:1.10      Thu Feb 13 09:23:46 2020
+++ pkgsrc/graphics/opencv/options.mk   Sun Mar  1 15:36:01 2020
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.10 2020/02/13 09:23:46 adam Exp $
+# $NetBSD: options.mk,v 1.11 2020/03/01 15:36:01 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.opencv
-PKG_SUPPORTED_OPTIONS= ffmpeg
+PKG_SUPPORTED_OPTIONS= ffmpeg jasper
 
 .include "../../mk/bsd.options.mk"
 
@@ -14,5 +14,14 @@ CMAKE_ARGS+= -DFFMPEG_LIB_DIR=${PREFIX}/
 CMAKE_ARGS+=   -DWITH_FFMPEG=OFF
 .endif
 
+.if !empty(PKG_OPTIONS:Mjasper)
+CMAKE_ARGS+=   -DWITH_JASPER=ON
+# jasper uses SIZE_MAX and friends in its headers.
+CXXFLAGS+=     -D__STDC_LIMIT_MACROS
+.include "../../graphics/jasper/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DWITH_JASPER=OFF
+.endif
+
 # FIXME: should be option.mk'ed instead
 CMAKE_ARGS+=   -DBUILD_DOCS=OFF