Tue Sep 1 12:21:03 2020 UTC ()
ImageMagick: Make HEIF support optional


(ryoon)
diff -r1.274 -r1.275 pkgsrc/graphics/ImageMagick/Makefile
diff -r1.20 -r1.21 pkgsrc/graphics/ImageMagick/options.mk
cvs diff -r1.274 -r1.275 pkgsrc/graphics/ImageMagick/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile 2020/08/31 18:09:36 1.274
+++ pkgsrc/graphics/ImageMagick/Makefile 2020/09/01 12:21:03 1.275
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.274 2020/08/31 18:09:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.275 2020/09/01 12:21:03 ryoon Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 1
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PKGNAME= ImageMagick-${DISTVERSION} 6PKGNAME= ImageMagick-${DISTVERSION}
7 7
8PKGREVISION= 1 8PKGREVISION= 1
9MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
10COMMENT= Package for display and interactive manipulation of images 10COMMENT= Package for display and interactive manipulation of images
11 11
12CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 12CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
13 13
14USE_LANGUAGES= c c++ c99 14USE_LANGUAGES= c c++ c99
@@ -84,21 +84,20 @@ SUBST_FILES.fix-pc+= MagickWand/MagickWa @@ -84,21 +84,20 @@ SUBST_FILES.fix-pc+= MagickWand/MagickWa
84SUBST_SED.fix-pc= -e 's,@PKG_CONFIG@,pkg-config,g' 84SUBST_SED.fix-pc= -e 's,@PKG_CONFIG@,pkg-config,g'
85 85
86# failed to convert strong functions and variables: Invalid type identifier 86# failed to convert strong functions and variables: Invalid type identifier
87CTF_FILES_SKIP+= lib/libMagickCore-7.Q16HDRI.so.* 87CTF_FILES_SKIP+= lib/libMagickCore-7.Q16HDRI.so.*
88CTF_FILES_SKIP+= lib/libMagickWand-7.Q16HDRI.so.* 88CTF_FILES_SKIP+= lib/libMagickWand-7.Q16HDRI.so.*
89 89
90.include "../../archivers/bzip2/buildlink3.mk" 90.include "../../archivers/bzip2/buildlink3.mk"
91.include "../../archivers/xz/buildlink3.mk" 91.include "../../archivers/xz/buildlink3.mk"
92.include "../../devel/libltdl/buildlink3.mk" 92.include "../../devel/libltdl/buildlink3.mk"
93.include "../../fonts/fontconfig/buildlink3.mk" 93.include "../../fonts/fontconfig/buildlink3.mk"
94.include "../../graphics/freetype2/buildlink3.mk" 94.include "../../graphics/freetype2/buildlink3.mk"
95.include "../../mk/jpeg.buildlink3.mk" 95.include "../../mk/jpeg.buildlink3.mk"
96.include "../../graphics/lcms2/buildlink3.mk" 96.include "../../graphics/lcms2/buildlink3.mk"
97.include "../../graphics/libheif/buildlink3.mk" 
98.include "../../graphics/libwebp/buildlink3.mk" 97.include "../../graphics/libwebp/buildlink3.mk"
99.include "../../graphics/png/buildlink3.mk" 98.include "../../graphics/png/buildlink3.mk"
100.include "../../graphics/tiff/buildlink3.mk" 99.include "../../graphics/tiff/buildlink3.mk"
101.include "../../math/fftw/buildlink3.mk" 100.include "../../math/fftw/buildlink3.mk"
102.include "../../print/ghostscript/buildlink3.mk" 101.include "../../print/ghostscript/buildlink3.mk"
103.include "../../textproc/libxml2/buildlink3.mk" 102.include "../../textproc/libxml2/buildlink3.mk"
104.include "../../mk/bsd.pkg.mk" 103.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/graphics/ImageMagick/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/options.mk 2019/11/02 22:37:53 1.20
+++ pkgsrc/graphics/ImageMagick/options.mk 2020/09/01 12:21:03 1.21
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.20 2019/11/02 22:37:53 rillig Exp $ 1# $NetBSD: options.mk,v 1.21 2020/09/01 12:21:03 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick 3PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick
4PKG_SUPPORTED_OPTIONS= x11 jp2 djvu openexr wmf liblqr 4PKG_SUPPORTED_OPTIONS= x11 jp2 djvu openexr wmf liblqr heif
5PKG_SUGGESTED_OPTIONS= x11 jp2 liblqr 5PKG_SUGGESTED_OPTIONS= x11 jp2 liblqr heif
6PKG_OPTIONS_LEGACY_OPTS+= jasper:jp2 6PKG_OPTIONS_LEGACY_OPTS+= jasper:jp2
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10.if !empty(PKG_OPTIONS:Mx11) 10.if !empty(PKG_OPTIONS:Mx11)
11.include "../../x11/libX11/buildlink3.mk" 11.include "../../x11/libX11/buildlink3.mk"
12.include "../../x11/libXext/buildlink3.mk" 12.include "../../x11/libXext/buildlink3.mk"
13.include "../../x11/libXt/buildlink3.mk" 13.include "../../x11/libXt/buildlink3.mk"
14.else 14.else
15CONFIGURE_ARGS+= --without-x 15CONFIGURE_ARGS+= --without-x
16.endif 16.endif
17 17
18.if !empty(PKG_OPTIONS:Mjp2) 18.if !empty(PKG_OPTIONS:Mjp2)
@@ -39,13 +39,20 @@ CONFIGURE_ARGS+= --without-djvu @@ -39,13 +39,20 @@ CONFIGURE_ARGS+= --without-djvu
39.if !empty(PKG_OPTIONS:Mopenexr) 39.if !empty(PKG_OPTIONS:Mopenexr)
40.include "../../graphics/openexr/buildlink3.mk" 40.include "../../graphics/openexr/buildlink3.mk"
41CONFIGURE_ARGS+= --with-openexr 41CONFIGURE_ARGS+= --with-openexr
42.else 42.else
43CONFIGURE_ARGS+= --without-openexr 43CONFIGURE_ARGS+= --without-openexr
44.endif 44.endif
45 45
46.if !empty(PKG_OPTIONS:Mwmf) 46.if !empty(PKG_OPTIONS:Mwmf)
47.include "../../graphics/libwmf/buildlink3.mk" 47.include "../../graphics/libwmf/buildlink3.mk"
48CONFIGURE_ARGS+= --with-wmf 48CONFIGURE_ARGS+= --with-wmf
49.else 49.else
50CONFIGURE_ARGS+= --without-wmf 50CONFIGURE_ARGS+= --without-wmf
51.endif 51.endif
 52
 53.if !empty(PKG_OPTIONS:Mheif)
 54.include "../../graphics/libheif/buildlink3.mk"
 55CONFIGURE_ARGS+= --with-heif
 56.else
 57CONFIGURE_ARGS+= --without-heif
 58.endif