CVS commit: pkgsrc/graphics/ImageMagick

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 11 19:45:13 UTC 2024

Modified Files:
        pkgsrc/graphics/ImageMagick: Makefile buildlink3.mk options.mk

Log Message:
ImageMagick: add default-on raqm option

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/graphics/ImageMagick/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/ImageMagick/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ImageMagick/Makefile
diff -u pkgsrc/graphics/ImageMagick/Makefile:1.338 pkgsrc/graphics/ImageMagick/Makefile:1.339
--- pkgsrc/graphics/ImageMagick/Makefile:1.338  Wed May 29 16:32:49 2024
+++ pkgsrc/graphics/ImageMagick/Makefile        Thu Jul 11 19:45:12 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.338 2024/05/29 16:32:49 adam Exp $
+# $NetBSD: Makefile,v 1.339 2024/07/11 19:45:12 wiz Exp $
 
-PKGREVISION= 3
+PKGREVISION= 4
 .include "Makefile.common"
 
 PKGNAME=       ImageMagick-${DISTVERSION}

Index: pkgsrc/graphics/ImageMagick/buildlink3.mk
diff -u pkgsrc/graphics/ImageMagick/buildlink3.mk:1.111 pkgsrc/graphics/ImageMagick/buildlink3.mk:1.112
--- pkgsrc/graphics/ImageMagick/buildlink3.mk:1.111     Thu May 16 06:15:00 2024
+++ pkgsrc/graphics/ImageMagick/buildlink3.mk   Thu Jul 11 19:45:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.111 2024/05/16 06:15:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.112 2024/07/11 19:45:12 wiz Exp $
 
 BUILDLINK_TREE+=       ImageMagick
 
@@ -34,6 +34,9 @@ pkgbase := ImageMagick
 .if ${PKG_BUILD_OPTIONS.ImageMagick:Mopenexr}
 .include "../../graphics/openexr/buildlink3.mk"
 .endif
+.if ${PKG_BUILD_OPTIONS.ImageMagick:Mraqm}
+.include "../../graphics/raqm/buildlink3.mk"
+.endif
 .if ${PKG_BUILD_OPTIONS.ImageMagick:Mtiff}
 .include "../../graphics/tiff/buildlink3.mk"
 .endif

Index: pkgsrc/graphics/ImageMagick/options.mk
diff -u pkgsrc/graphics/ImageMagick/options.mk:1.27 pkgsrc/graphics/ImageMagick/options.mk:1.28
--- pkgsrc/graphics/ImageMagick/options.mk:1.27 Wed Nov 15 12:08:52 2023
+++ pkgsrc/graphics/ImageMagick/options.mk      Thu Jul 11 19:45:12 2024
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.27 2023/11/15 12:08:52 wiz Exp $
+# $NetBSD: options.mk,v 1.28 2024/07/11 19:45:12 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ImageMagick
 PKG_SUPPORTED_OPTIONS=         djvu doc fontconfig fpx ghostscript heif jp2
-PKG_SUPPORTED_OPTIONS+=                liblqr openexr tiff wmf x11
+PKG_SUPPORTED_OPTIONS+=                liblqr openexr raqm tiff wmf x11
 PKG_OPTIONS_REQUIRED_GROUPS=   policy
 PKG_OPTIONS_GROUP.policy=      imagemagick-policy-limited imagemagick-policy-open imagemagick-policy-secure imagemagick-policy-websafe
-PKG_SUGGESTED_OPTIONS=         doc fontconfig ghostscript heif jp2 liblqr tiff x11 imagemagick-policy-open
+PKG_SUGGESTED_OPTIONS=         doc fontconfig ghostscript heif jp2 liblqr raqm tiff x11 imagemagick-policy-open
 
 .include "../../mk/bsd.options.mk"
 
@@ -70,6 +70,13 @@ CONFIGURE_ARGS+=     --with-openexr
 CONFIGURE_ARGS+=       --without-openexr
 .endif
 
+.if !empty(PKG_OPTIONS:Mraqm)
+.include "../../graphics/raqm/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-raqm
+.else
+CONFIGURE_ARGS+=       --without-raqm
+.endif
+
 .if !empty(PKG_OPTIONS:Mtiff)
 .include "../../graphics/tiff/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-tiff