CVS commit: pkgsrc/graphics/gegl

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 16 15:34:25 UTC 2019

Modified Files:
        pkgsrc/graphics/gegl: Makefile options.mk

Log Message:
gegl: 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.72 -r1.73 pkgsrc/graphics/gegl/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gegl/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/gegl/Makefile
diff -u pkgsrc/graphics/gegl/Makefile:1.72 pkgsrc/graphics/gegl/Makefile:1.73
--- pkgsrc/graphics/gegl/Makefile:1.72  Tue Jun 18 14:26:59 2019
+++ pkgsrc/graphics/gegl/Makefile       Tue Jul 16 15:34:25 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2019/06/18 14:26:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.73 2019/07/16 15:34:25 nia Exp $
 
 DISTNAME=      gegl-0.4.16
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  http://download.gimp.org/pub/gegl/0.4/
 EXTRACT_SUFX=  .tar.bz2
@@ -37,7 +38,6 @@ post-install:
 BUILDLINK_API_DEPENDS.babl+=   babl>=0.1.52
 .include "../../graphics/babl/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/graphics/gegl/options.mk
diff -u pkgsrc/graphics/gegl/options.mk:1.1 pkgsrc/graphics/gegl/options.mk:1.2
--- pkgsrc/graphics/gegl/options.mk:1.1 Tue Feb  3 06:21:40 2009
+++ pkgsrc/graphics/gegl/options.mk     Tue Jul 16 15:34:25 2019
@@ -1,14 +1,21 @@
-# $NetBSD: options.mk,v 1.1 2009/02/03 06:21:40 adam Exp $
+# $NetBSD: options.mk,v 1.2 2019/07/16 15:34:25 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gegl
-PKG_SUPPORTED_OPTIONS= svg
+PKG_SUPPORTED_OPTIONS= svg jasper
 PKG_SUGGESTED_OPTIONS= svg
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=   svg
-
 .if !empty(PKG_OPTIONS:Msvg)
 .include "../../graphics/librsvg/buildlink3.mk"
 PLIST.svg=     yes
 .endif
+
+PLIST_VARS+=   jasper
+.if !empty(PKG_OPTIONS:Mjasper)
+.include "../../graphics/jasper/buildlink3.mk"
+PLIST.jasper=  yes
+.else
+CONFIGURE_ARGS+=       --without-jasper
+.endif