CVS commit: pkgsrc/graphics/ImageMagick

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Sep  1 12:21:03 UTC 2020

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

Log Message:
ImageMagick: Make HEIF support optional


To generate a diff of this commit:
cvs rdiff -u -r1.274 -r1.275 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/ImageMagick/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/ImageMagick/Makefile
diff -u pkgsrc/graphics/ImageMagick/Makefile:1.274 pkgsrc/graphics/ImageMagick/Makefile:1.275
--- pkgsrc/graphics/ImageMagick/Makefile:1.274  Mon Aug 31 18:09:36 2020
+++ pkgsrc/graphics/ImageMagick/Makefile        Tue Sep  1 12:21:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.274 2020/08/31 18:09:36 wiz Exp $
+# $NetBSD: Makefile,v 1.275 2020/09/01 12:21:03 ryoon Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
@@ -94,7 +94,6 @@ CTF_FILES_SKIP+=      lib/libMagickWand-7.Q16
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
-.include "../../graphics/libheif/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"

Index: pkgsrc/graphics/ImageMagick/options.mk
diff -u pkgsrc/graphics/ImageMagick/options.mk:1.20 pkgsrc/graphics/ImageMagick/options.mk:1.21
--- pkgsrc/graphics/ImageMagick/options.mk:1.20 Sat Nov  2 22:37:53 2019
+++ pkgsrc/graphics/ImageMagick/options.mk      Tue Sep  1 12:21:03 2020
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.20 2019/11/02 22:37:53 rillig Exp $
+# $NetBSD: options.mk,v 1.21 2020/09/01 12:21:03 ryoon Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ImageMagick
-PKG_SUPPORTED_OPTIONS=         x11 jp2 djvu openexr wmf liblqr
-PKG_SUGGESTED_OPTIONS=         x11 jp2 liblqr
+PKG_SUPPORTED_OPTIONS=         x11 jp2 djvu openexr wmf liblqr heif
+PKG_SUGGESTED_OPTIONS=         x11 jp2 liblqr heif
 PKG_OPTIONS_LEGACY_OPTS+=      jasper:jp2
 
 .include "../../mk/bsd.options.mk"
@@ -49,3 +49,10 @@ CONFIGURE_ARGS+=     --with-wmf
 .else
 CONFIGURE_ARGS+=       --without-wmf
 .endif
+
+.if !empty(PKG_OPTIONS:Mheif)
+.include "../../graphics/libheif/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-heif
+.else
+CONFIGURE_ARGS+=       --without-heif
+.endif