diff options
| author | nia <nia@pkgsrc.org> | 2019-07-16 15:36:02 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2019-07-16 15:36:02 +0000 |
| commit | ceb0fffd0aa9e8e44a7d669ae93730eab062be9c (patch) | |
| tree | 975373506217f3869ad0adc4db6b8ea0cfa6c39f /graphics/opencv | |
| parent | ea26c07ea51040b52ea20151212c6f7083eff86c (diff) | |
| download | pkgsrc-ceb0fffd0aa9e8e44a7d669ae93730eab062be9c.tar.gz | |
opencv: Disable jp2 support by default
Re-enable it with the 'jasper' option.
Part of the process of trying to minimize the potential impact of a
vulnerable jasper.
Bump PKGREVISION.
Diffstat (limited to 'graphics/opencv')
| -rw-r--r-- | graphics/opencv/Makefile | 5 | ||||
| -rw-r--r-- | graphics/opencv/Makefile.common | 5 | ||||
| -rw-r--r-- | graphics/opencv/options.mk | 13 |
3 files changed, 14 insertions, 9 deletions
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 4e7cc1e697a..dcf01537c11 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.83 2019/04/25 07:32:59 maya Exp $ +# $NetBSD: Makefile,v 1.84 2019/07/16 15:36:02 nia Exp $ -PKGREVISION= 2 +PKGREVISION= 3 .include "Makefile.common" DISTNAME= opencv-${OPENCV_VERSION} @@ -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" diff --git a/graphics/opencv/Makefile.common b/graphics/opencv/Makefile.common index e3de18eda10..1911d7a8dad 100644 --- a/graphics/opencv/Makefile.common +++ b/graphics/opencv/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2019/04/24 19:34:44 adam Exp $ +# $NetBSD: Makefile.common,v 1.2 2019/07/16 15:36:02 nia Exp $ # used by graphics/opencv/Makefile # used by graphics/opencv-contrib-face/Makefile @@ -32,9 +32,6 @@ CMAKE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} -# jasper uses SIZE_MAX and friends in its headers. -CXXFLAGS+= -D__STDC_LIMIT_MACROS - pre-configure: ${MKDIR} ${WRKSRC}/build diff --git a/graphics/opencv/options.mk b/graphics/opencv/options.mk index 33fccd27ff2..32cf584896f 100644 --- a/graphics/opencv/options.mk +++ b/graphics/opencv/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.7 2019/04/24 19:34:44 adam Exp $ +# $NetBSD: options.mk,v 1.8 2019/07/16 15:36:02 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/ffmpeg2 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 |