[pkgsrc/trunk]: pkgsrc/graphics/opencv opencv: Disable jp2 support by default

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ff610fd2943
branches:  trunk
changeset: 398329:0ff610fd2943
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jul 16 15:36:02 2019 +0000

description:
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:

 graphics/opencv/Makefile        |   5 ++---
 graphics/opencv/Makefile.common |   5 +----
 graphics/opencv/options.mk      |  13 +++++++++++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diffs (67 lines):

diff -r 3b3696d3f1fe -r 0ff610fd2943 graphics/opencv/Makefile
--- a/graphics/opencv/Makefile  Tue Jul 16 15:34:25 2019 +0000
+++ b/graphics/opencv/Makefile  Tue Jul 16 15:36:02 2019 +0000
@@ -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 @@
 
 .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 3b3696d3f1fe -r 0ff610fd2943 graphics/opencv/Makefile.common
--- a/graphics/opencv/Makefile.common   Tue Jul 16 15:34:25 2019 +0000
+++ b/graphics/opencv/Makefile.common   Tue Jul 16 15:36:02 2019 +0000
@@ -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 @@
 
 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 -r 3b3696d3f1fe -r 0ff610fd2943 graphics/opencv/options.mk
--- a/graphics/opencv/options.mk        Tue Jul 16 15:34:25 2019 +0000
+++ b/graphics/opencv/options.mk        Tue Jul 16 15:36:02 2019 +0000
@@ -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+=   -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