From 5b6bf2bd654eb9190f203ae2c4b101646e69290b Mon Sep 17 00:00:00 2001 From: jperkin Date: Mon, 3 Dec 2018 16:22:15 +0000 Subject: [PATCH] ImageMagick: Add support for liblqr (enabled by default). Suggested in joyent/pkgsrc#159. Bump PKGREVISION. --- graphics/ImageMagick/Makefile | 3 ++- graphics/ImageMagick/options.mk | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 933fa1c53464..aa20eab30ee4 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.252 2018/12/02 10:20:20 wiz Exp $ +# $NetBSD: Makefile,v 1.253 2018/12/03 16:22:15 jperkin Exp $ .include "Makefile.common" PKGNAME= ImageMagick-${DISTVERSION} +PKGREVISION= 1 MAINTAINER= adam@NetBSD.org COMMENT= Package for display and interactive manipulation of images diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk index 4ee2cf7487c2..93c4906971e9 100644 --- a/graphics/ImageMagick/options.mk +++ b/graphics/ImageMagick/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.18 2017/10/30 14:44:05 fhajny Exp $ +# $NetBSD: options.mk,v 1.19 2018/12/03 16:22:15 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick -PKG_SUPPORTED_OPTIONS= x11 jp2 djvu openexr wmf -PKG_SUGGESTED_OPTIONS= x11 jp2 +PKG_SUPPORTED_OPTIONS= x11 jp2 djvu openexr wmf liblqr +PKG_SUGGESTED_OPTIONS= x11 jp2 liblqr PKG_OPTIONS_LEGACY_OPTS+= jasper:jp2 .include "../../mk/bsd.options.mk" @@ -22,6 +22,13 @@ CONFIGURE_ARGS+= --with-openjp2 CONFIGURE_ARGS+= --without-openjp2 .endif +.if !empty(PKG_OPTIONS:Mliblqr) +.include "../../graphics/liblqr/buildlink3.mk" +CONFIGURE_ARGS+= --with-lqr +.else +CONFIGURE_ARGS+= --without-lqr +.endif + .if !empty(PKG_OPTIONS:Mdjvu) .include "../../graphics/djvulibre-lib/buildlink3.mk" CONFIGURE_ARGS+= --with-djvu