CVS commit: pkgsrc/graphics/opencv

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 16 15:36:03 UTC 2019

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/opencv/Makefile.common
cvs rdiff -u -r1.7 -r1.8 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.83 pkgsrc/graphics/opencv/Makefile:1.84
--- pkgsrc/graphics/opencv/Makefile:1.83        Thu Apr 25 07:32:59 2019
+++ pkgsrc/graphics/opencv/Makefile     Tue Jul 16 15:36:02 2019
@@ -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"

Index: pkgsrc/graphics/opencv/Makefile.common
diff -u pkgsrc/graphics/opencv/Makefile.common:1.1 pkgsrc/graphics/opencv/Makefile.common:1.2
--- pkgsrc/graphics/opencv/Makefile.common:1.1  Wed Apr 24 19:34:44 2019
+++ pkgsrc/graphics/opencv/Makefile.common      Tue Jul 16 15:36:02 2019
@@ -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_
 
 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
 

Index: pkgsrc/graphics/opencv/options.mk
diff -u pkgsrc/graphics/opencv/options.mk:1.7 pkgsrc/graphics/opencv/options.mk:1.8
--- pkgsrc/graphics/opencv/options.mk:1.7       Wed Apr 24 19:34:44 2019
+++ pkgsrc/graphics/opencv/options.mk   Tue Jul 16 15:36:02 2019
@@ -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}/
 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