CVS commit: pkgsrc/graphics/libraw

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

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

Modified Files:
        pkgsrc/graphics/libraw: Makefile buildlink3.mk
Added Files:
        pkgsrc/graphics/libraw: 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.29 -r1.30 pkgsrc/graphics/libraw/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/libraw/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/libraw/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/libraw/Makefile
diff -u pkgsrc/graphics/libraw/Makefile:1.29 pkgsrc/graphics/libraw/Makefile:1.30
--- pkgsrc/graphics/libraw/Makefile:1.29        Wed Jul 10 20:27:59 2019
+++ pkgsrc/graphics/libraw/Makefile     Tue Jul 16 15:45:03 2019
@@ -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 @@ CONFIGURE_ARGS+=     --disable-demosaic-pack
 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"

Index: pkgsrc/graphics/libraw/buildlink3.mk
diff -u pkgsrc/graphics/libraw/buildlink3.mk:1.7 pkgsrc/graphics/libraw/buildlink3.mk:1.8
--- pkgsrc/graphics/libraw/buildlink3.mk:1.7    Wed Jul 10 20:27:59 2019
+++ pkgsrc/graphics/libraw/buildlink3.mk        Tue Jul 16 15:45:03 2019
@@ -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_API_DEPENDS.libraw+= libraw>=0
 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

Added files:

Index: pkgsrc/graphics/libraw/options.mk
diff -u /dev/null pkgsrc/graphics/libraw/options.mk:1.1
--- /dev/null   Tue Jul 16 15:45:03 2019
+++ pkgsrc/graphics/libraw/options.mk   Tue Jul 16 15:45:03 2019
@@ -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