From b6df8be377eba0a25ea7c6523e2d525481855328 Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 1 Sep 2020 12:21:03 +0000 Subject: ImageMagick: Make HEIF support optional --- graphics/ImageMagick/Makefile | 3 +-- graphics/ImageMagick/options.mk | 13 ++++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'graphics') diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 78d31eea845..4c73d3d8f81 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -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.Q16HDRI.so.* .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" diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk index 19ae9296ece..e91b5ca3afd 100644 --- a/graphics/ImageMagick/options.mk +++ b/graphics/ImageMagick/options.mk @@ -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 -- cgit v1.2.3