CVS commit: pkgsrc/graphics/ImageMagick

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Jun 20 20:49:26 UTC 2022

Modified Files:
        pkgsrc/graphics/ImageMagick: Makefile distinfo
Added Files:
        pkgsrc/graphics/ImageMagick/patches: patch-ghostscript-private.h

Log Message:
graphics/ImageMagick: add workaround to fix build with ghostscript-gpl.


To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -u -r1.277 -r1.278 pkgsrc/graphics/ImageMagick/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h

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.303 pkgsrc/graphics/ImageMagick/Makefile:1.304
--- pkgsrc/graphics/ImageMagick/Makefile:1.303  Tue May  3 08:27:11 2022
+++ pkgsrc/graphics/ImageMagick/Makefile        Mon Jun 20 20:49:26 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.303 2022/05/03 08:27:11 wiz Exp $
+# $NetBSD: Makefile,v 1.304 2022/06/20 20:49:26 dholland Exp $
 
 .include "Makefile.common"
 
@@ -85,6 +85,11 @@ SUBST_SED.fix-pc=    -e 's,@PKG_CONFIG@,pkg
 CTF_FILES_SKIP+=       lib/libMagickCore-7.Q16HDRI.so.*
 CTF_FILES_SKIP+=       lib/libMagickWand-7.Q16HDRI.so.*
 
+.include "../../print/ghostscript/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.ghostscript:Mghostscript-gpl)
+CFLAGS+=               -DPKGSRC_USE_OLD_GHOSTSCRIPT
+.endif
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
@@ -95,6 +100,5 @@ CTF_FILES_SKIP+=     lib/libMagickWand-7.Q16
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
-.include "../../print/ghostscript/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/ImageMagick/distinfo
diff -u pkgsrc/graphics/ImageMagick/distinfo:1.277 pkgsrc/graphics/ImageMagick/distinfo:1.278
--- pkgsrc/graphics/ImageMagick/distinfo:1.277  Mon Jun 13 09:35:44 2022
+++ pkgsrc/graphics/ImageMagick/distinfo        Mon Jun 20 20:49:26 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.277 2022/06/13 09:35:44 wiz Exp $
+$NetBSD: distinfo,v 1.278 2022/06/20 20:49:26 dholland Exp $
 
 BLAKE2s (ImageMagick-7.1.0-37.tar.xz) = c03be05ebcb1c3cda0eee6963c745fd714a0d99a901fc4e9c10d7953d95936aa
 SHA512 (ImageMagick-7.1.0-37.tar.xz) = 43f116a3a6bb9794b8c8440c57a537eab29b0dac7b8ace574e3cc1e6d484054557c9e44235eb799b843ef761c6f22d29ef959f6de6b80a45a3898bee4d2f16da
 Size (ImageMagick-7.1.0-37.tar.xz) = 10345216 bytes
 SHA1 (patch-config_policy.xml) = f8d130dcb1e81cd78a7856ca9b334f6ebf95c18f
+SHA1 (patch-ghostscript-private.h) = 98d88220cf8814f2e4841c382de5e2e9e0ae9287

Added files:

Index: pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h
diff -u /dev/null pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h:1.1
--- /dev/null   Mon Jun 20 20:49:26 2022
+++ pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h     Mon Jun 20 20:49:26 2022
@@ -0,0 +1,22 @@
+$NetBSD: patch-ghostscript-private.h,v 1.1 2022/06/20 20:49:26 dholland Exp $
+
+Add a workaround to allow building with ghostscript-gpl.
+
+--- coders/ghostscript-private.h~      2022-06-05 10:26:38.000000000 +0000
++++ coders/ghostscript-private.h
+@@ -76,6 +76,15 @@ static inline MagickBooleanType ExecuteG
+   return(MagickFalse);
+ }
+ 
++#ifdef PKGSRC_USE_OLD_GHOSTSCRIPT
++static void dummy_set_arg_encoding(void *a, int b) {
++   /* nothing */
++   (void)a;
++   (void)b;
++}
++#define gsapi_set_arg_encoding dummy_set_arg_encoding
++#endif
++
+ static inline MagickBooleanType InvokeGhostscriptDelegate(
+   const MagickBooleanType verbose,const char *command,char *message,
+   ExceptionInfo *exception)