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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c079b4c3c43f
branches:  trunk
changeset: 336513:c079b4c3c43f
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jul 16 15:45:03 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/libraw/Makefile      |   8 +++-----
 graphics/libraw/buildlink3.mk |   7 +++++--
 graphics/libraw/options.mk    |  15 +++++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)

diffs (65 lines):

diff -r 8138b12e2c53 -r c079b4c3c43f graphics/libraw/Makefile
--- a/graphics/libraw/Makefile  Tue Jul 16 15:39:35 2019 +0000
+++ b/graphics/libraw/Makefile  Tue Jul 16 15:45:03 2019 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2019/07/10 20:27:59 nia Exp $
+# $NetBSD: Makefile,v 1.30 2019/07/16 15:45:03 nia Exp $
 
 DISTNAME=      LibRaw-0.19.3
 PKGNAME=       ${DISTNAME:tl}
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  https://www.libraw.org/data/
 
@@ -21,10 +22,7 @@
 PKGCONFIG_OVERRIDE+=   libraw.pc.in
 PKGCONFIG_OVERRIDE+=   libraw_r.pc.in
 
-# jasper uses SIZE_MAX and friends in its headers.
-CPPFLAGS+=     -D__STDC_LIMIT_MACROS
-
-.include "../../graphics/jasper/buildlink3.mk"
+.include "options.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8138b12e2c53 -r c079b4c3c43f graphics/libraw/buildlink3.mk
--- a/graphics/libraw/buildlink3.mk     Tue Jul 16 15:39:35 2019 +0000
+++ b/graphics/libraw/buildlink3.mk     Tue Jul 16 15:45:03 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2019/07/10 20:27:59 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2019/07/16 15:45:03 nia Exp $
 
 BUILDLINK_TREE+=       libraw
 
@@ -9,7 +9,10 @@
 BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.19.3
 BUILDLINK_PKGSRCDIR.libraw?=   ../../graphics/libraw
 
-.include "../../graphics/jasper/buildlink3.mk"
+.include "../../mk/pkg-build-options.mk"
+.if !empty(PKG_BUILD_OPTIONS.libraw:Mjasper)
+.  include "../../graphics/jasper/buildlink3.mk"
+.endif
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .endif # LIBRAW_BUILDLINK3_MK
diff -r 8138b12e2c53 -r c079b4c3c43f graphics/libraw/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libraw/options.mk        Tue Jul 16 15:45:03 2019 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2019/07/16 15:45:03 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.libraw
+PKG_SUPPORTED_OPTIONS=         jasper
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mjasper)
+CONFIGURE_ARGS+=       --enable-jasper
+# jasper uses SIZE_MAX and friends in its headers.
+CPPFLAGS+=             -D__STDC_LIMIT_MACROS
+.include "../../graphics/jasper/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-jasper
+.endif