[pkgsrc/trunk]: pkgsrc/graphics Add flashpix option support to ImageMagick an...

[nros <nros%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/03bb883be642
branches:  trunk
changeset: 385965:03bb883be642
user:      nros <nros%pkgsrc.org@localhost>
date:      Thu Sep 29 09:21:10 2022 +0000

description:
Add flashpix option support to ImageMagick and GraphicsMagick packages.
Defualt off for security and license reasons.

diffstat:

 graphics/GraphicsMagick/PLIST         |   3 ++-
 graphics/GraphicsMagick/options.mk    |  14 +++++++++++---
 graphics/ImageMagick/Makefile.common  |   3 +--
 graphics/ImageMagick/options.mk       |  11 +++++++++--
 graphics/ImageMagick6/Makefile.common |   3 +--
 graphics/ImageMagick6/options.mk      |  11 +++++++++--
 6 files changed, 33 insertions(+), 12 deletions(-)

diffs (130 lines):

diff -r a9503875e622 -r 03bb883be642 graphics/GraphicsMagick/PLIST
--- a/graphics/GraphicsMagick/PLIST     Thu Sep 29 08:13:17 2022 +0000
+++ b/graphics/GraphicsMagick/PLIST     Thu Sep 29 09:21:10 2022 +0000
@@ -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/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 -r a9503875e622 -r 03bb883be642 graphics/GraphicsMagick/options.mk
--- a/graphics/GraphicsMagick/options.mk        Thu Sep 29 08:13:17 2022 +0000
+++ b/graphics/GraphicsMagick/options.mk        Thu Sep 29 09:21:10 2022 +0000
@@ -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 @@
 .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 -r a9503875e622 -r 03bb883be642 graphics/ImageMagick/Makefile.common
--- a/graphics/ImageMagick/Makefile.common      Thu Sep 29 08:13:17 2022 +0000
+++ b/graphics/ImageMagick/Makefile.common      Thu Sep 29 09:21:10 2022 +0000
@@ -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 @@
 # 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 -r a9503875e622 -r 03bb883be642 graphics/ImageMagick/options.mk
--- a/graphics/ImageMagick/options.mk   Thu Sep 29 08:13:17 2022 +0000
+++ b/graphics/ImageMagick/options.mk   Thu Sep 29 09:21:10 2022 +0000
@@ -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 @@
 .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 -r a9503875e622 -r 03bb883be642 graphics/ImageMagick6/Makefile.common
--- a/graphics/ImageMagick6/Makefile.common     Thu Sep 29 08:13:17 2022 +0000
+++ b/graphics/ImageMagick6/Makefile.common     Thu Sep 29 09:21:10 2022 +0000
@@ -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 @@
 # 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 -r a9503875e622 -r 03bb883be642 graphics/ImageMagick6/options.mk
--- a/graphics/ImageMagick6/options.mk  Thu Sep 29 08:13:17 2022 +0000
+++ b/graphics/ImageMagick6/options.mk  Thu Sep 29 09:21:10 2022 +0000
@@ -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 @@
 .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