Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/graphics/opencv/Makefile,v retrieving revision 1.88 diff -u -p -r1.88 Makefile --- Makefile 13 Feb 2020 09:23:46 -0000 1.88 +++ Makefile 16 Feb 2020 16:36:55 -0000 @@ -32,7 +32,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: buildlink3.mk =================================================================== RCS file: /cvsroot/pkgsrc/graphics/opencv/buildlink3.mk,v retrieving revision 1.5 diff -u -p -r1.5 buildlink3.mk --- buildlink3.mk 13 Feb 2020 09:23:46 -0000 1.5 +++ buildlink3.mk 16 Feb 2020 16:36:55 -0000 @@ -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: options.mk =================================================================== RCS file: /cvsroot/pkgsrc/graphics/opencv/options.mk,v retrieving revision 1.10 diff -u -p -r1.10 options.mk --- options.mk 13 Feb 2020 09:23:46 -0000 1.10 +++ options.mk 16 Feb 2020 16:36:55 -0000 @@ -1,7 +1,7 @@ # $NetBSD: options.mk,v 1.10 2020/02/13 09:23:46 adam 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