diff options
| author | nia <nia@pkgsrc.org> | 2020-03-01 15:36:01 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-03-01 15:36:01 +0000 |
| commit | 0f31da6cb475761970bc4ead021eecfa9a5f422c (patch) | |
| tree | 0894b0c1cae54546ea1dda018845ca6a96337eb9 | |
| parent | de972395db8d6d1cd42666ba94f48180a3a34f74 (diff) | |
| download | pkgsrc-0f31da6cb475761970bc4ead021eecfa9a5f422c.tar.gz | |
opencv: Restore optionality of jasper
bump PKGREVISION
| -rw-r--r-- | graphics/opencv/Makefile | 4 | ||||
| -rw-r--r-- | graphics/opencv/buildlink3.mk | 7 | ||||
| -rw-r--r-- | graphics/opencv/options.mk | 13 |
3 files changed, 18 insertions, 6 deletions
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index bdf66f0a2ad..21cf6787f35 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -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 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" diff --git a/graphics/opencv/buildlink3.mk b/graphics/opencv/buildlink3.mk index d3f718fde26..53db92b176e 100644 --- a/graphics/opencv/buildlink3.mk +++ b/graphics/opencv/buildlink3.mk @@ -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" diff --git a/graphics/opencv/options.mk b/graphics/opencv/options.mk index 4ec00d3c2be..b9484131434 100644 --- a/graphics/opencv/options.mk +++ b/graphics/opencv/options.mk @@ -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}/lib/ffmpeg4 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 |