Add flashpix option support to ImageMagick and GraphicsMagick packages.

Defualt off for security and license reasons.

6 files changed, 33 insertions, 12 deletions

diff --git a/graphics/GraphicsMagick/PLIST b/graphics/GraphicsMagick/PLIST
index 58b1fe29812..6167d1771af 100644
--- a/graphics/GraphicsMagick/PLIST
+++ b/graphics/GraphicsMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2021/12/14 19:56:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.32 2022/09/29 09:21:10 nros Exp $
 bin/GraphicsMagick++-config
 bin/GraphicsMagick-config
 bin/GraphicsMagickWand-config
@@ -107,6 +107,7 @@ lib/${PKGNAME}/modules-Q8/coders/dpx.la
 lib/${PKGNAME}/modules-Q8/coders/ept.la
 lib/${PKGNAME}/modules-Q8/coders/fax.la
 lib/${PKGNAME}/modules-Q8/coders/fits.la
+${PLIST.fpx}lib/${PKGNAME}/modules-Q8/coders/fpx.la
 lib/${PKGNAME}/modules-Q8/coders/gif.la
 lib/${PKGNAME}/modules-Q8/coders/gradient.la
 lib/${PKGNAME}/modules-Q8/coders/gray.la
diff --git a/graphics/GraphicsMagick/options.mk b/graphics/GraphicsMagick/options.mk
index f9429106a0c..da6634b3ed0 100755
--- a/graphics/GraphicsMagick/options.mk
+++ b/graphics/GraphicsMagick/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.10 2020/05/15 13:13:40 rillig Exp $
+# $NetBSD: options.mk,v 1.11 2022/09/29 09:21:10 nros Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.GraphicsMagick
-PKG_SUPPORTED_OPTIONS=	x11 jasper ghostscript wmf
+PKG_SUPPORTED_OPTIONS=	x11 jasper ghostscript wmf fpx
 PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	jasper x11
+PLIST_VARS+=	fpx jasper x11
 
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libSM/buildlink3.mk"
@@ -37,3 +37,11 @@ CONFIGURE_ARGS+=	--with-wmf
 .else
 CONFIGURE_ARGS+=	--without-wmf
 .endif
+
+.if !empty(PKG_OPTIONS:Mfpx)
+.include "../../graphics/libfpx/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-fpx
+PLIST.fpx=		yes
+.else
+CONFIGURE_ARGS+=	--without-fpx
+.endif
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 267655d4d12..05da59faa66 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.256 2022/06/13 09:35:44 wiz Exp $
+# $NetBSD: Makefile.common,v 1.257 2022/09/29 09:21:11 nros Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 #
@@ -31,7 +31,6 @@ GNU_CONFIGURE=		yes
 # For things for which we do not specify an explicit dependency above, disable
 # so that we don't cause implicit "hidden" dependencies.
 CONFIGURE_ARGS+=	--without-dps
-CONFIGURE_ARGS+=	--without-fpx
 CONFIGURE_ARGS+=	--without-gvc
 CONFIGURE_ARGS+=	--without-jbig
 CONFIGURE_ARGS+=	--without-lqr
diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk
index 9a5fe271c1d..6de49efbbf9 100644
--- a/graphics/ImageMagick/options.mk
+++ b/graphics/ImageMagick/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.24 2022/05/03 08:27:11 wiz Exp $
+# $NetBSD: options.mk,v 1.25 2022/09/29 09:21:11 nros Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ImageMagick
-PKG_SUPPORTED_OPTIONS=		djvu doc heif jp2 liblqr openexr tiff wmf x11
+PKG_SUPPORTED_OPTIONS=		djvu doc fpx heif jp2 liblqr openexr tiff wmf x11
 PKG_SUGGESTED_OPTIONS=		doc heif jp2 liblqr tiff x11
 
 .include "../../mk/bsd.options.mk"
@@ -70,3 +70,10 @@ CONFIGURE_ARGS+=	--with-heic
 .else
 CONFIGURE_ARGS+=	--without-heic
 .endif
+
+.if !empty(PKG_OPTIONS:Mfpx)
+.include "../../graphics/libfpx/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-fpx
+.else
+CONFIGURE_ARGS+=	--without-fpx
+.endif
diff --git a/graphics/ImageMagick6/Makefile.common b/graphics/ImageMagick6/Makefile.common
index 04dd13158ce..90c6ac25ecf 100644
--- a/graphics/ImageMagick6/Makefile.common
+++ b/graphics/ImageMagick6/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2020/04/24 09:24:34 nia Exp $
+# $NetBSD: Makefile.common,v 1.15 2022/09/29 09:21:11 nros Exp $
 
 IM_MAJOR_VER=		6.9.11
 IM_MINOR_VER=		7
@@ -27,7 +27,6 @@ GNU_CONFIGURE=		yes
 # For things for which we do not specify an explicit dependency above, disable
 # so that we don't cause implicit "hidden" dependencies.
 CONFIGURE_ARGS+=	--without-dps
-CONFIGURE_ARGS+=	--without-fpx
 CONFIGURE_ARGS+=	--without-gvc
 CONFIGURE_ARGS+=	--without-jbig
 CONFIGURE_ARGS+=	--without-lqr
diff --git a/graphics/ImageMagick6/options.mk b/graphics/ImageMagick6/options.mk
index 6a18ae1a7d4..755dc31389d 100644
--- a/graphics/ImageMagick6/options.mk
+++ b/graphics/ImageMagick6/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2021/02/26 12:48:29 nia Exp $
+# $NetBSD: options.mk,v 1.5 2022/09/29 09:21:11 nros Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ImageMagick
-PKG_SUPPORTED_OPTIONS=		doc x11 jp2 djvu openexr wmf
+PKG_SUPPORTED_OPTIONS=		doc x11 jp2 djvu openexr wmf fpx
 PKG_SUGGESTED_OPTIONS=		doc x11 jp2
 PKG_OPTIONS_LEGACY_OPTS+=	jasper:jp2
 
@@ -50,3 +50,10 @@ CONFIGURE_ARGS+=	--with-wmf
 .else
 CONFIGURE_ARGS+=	--without-wmf
 .endif
+
+.if !empty(PKG_OPTIONS:Mfpx)
+.include "../../graphics/libfpx/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-fpx
+.else
+CONFIGURE_ARGS+=	--without-fpx
+.endif