[pkgsrc/trunk]: pkgsrc/graphics/opencv opencv: Restore optionality of jasper

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/39640b39f1c8
branches:  trunk
changeset: 412213:39640b39f1c8
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Mar 01 15:36:01 2020 +0000

description:
opencv: Restore optionality of jasper

bump PKGREVISION

diffstat:

 graphics/opencv/Makefile      |   4 ++--
 graphics/opencv/buildlink3.mk |   7 +++++--
 graphics/opencv/options.mk    |  13 +++++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diffs (73 lines):

diff -r c2fb76216fc9 -r 39640b39f1c8 graphics/opencv/Makefile
--- a/graphics/opencv/Makefile  Sun Mar 01 13:24:11 2020 +0000
+++ b/graphics/opencv/Makefile  Sun Mar 01 15:36:01 2020 +0000
@@ -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 @@
 
 .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"
diff -r c2fb76216fc9 -r 39640b39f1c8 graphics/opencv/buildlink3.mk
--- a/graphics/opencv/buildlink3.mk     Sun Mar 01 13:24:11 2020 +0000
+++ b/graphics/opencv/buildlink3.mk     Sun Mar 01 15:36:01 2020 +0000
@@ -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 @@
 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"
diff -r c2fb76216fc9 -r 39640b39f1c8 graphics/opencv/options.mk
--- a/graphics/opencv/options.mk        Sun Mar 01 13:24:11 2020 +0000
+++ b/graphics/opencv/options.mk        Sun Mar 01 15:36:01 2020 +0000
@@ -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+=   -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