Mon Jun 20 20:49:26 2022 UTC ()
graphics/ImageMagick: add workaround to fix build with ghostscript-gpl.


(dholland)
diff -r1.303 -r1.304 pkgsrc/graphics/ImageMagick/Makefile
diff -r1.277 -r1.278 pkgsrc/graphics/ImageMagick/distinfo
diff -r0 -r1.1 pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h
cvs diff -r1.303 -r1.304 pkgsrc/graphics/ImageMagick/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile 2022/05/03 08:27:11 1.303
+++ pkgsrc/graphics/ImageMagick/Makefile 2022/06/20 20:49:26 1.304
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.303 2022/05/03 08:27:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.304 2022/06/20 20:49:26 dholland Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ImageMagick-${DISTVERSION} 5PKGNAME= ImageMagick-${DISTVERSION}
6 6
7MAINTAINER= adam@NetBSD.org 7MAINTAINER= adam@NetBSD.org
8COMMENT= Package for display and non-interactive manipulation of images 8COMMENT= Package for display and non-interactive manipulation of images
9 9
10CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 10CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
11 11
12USE_LANGUAGES= c c++ c99 12USE_LANGUAGES= c c++ c99
13USE_TOOLS+= gmake pkg-config:run 13USE_TOOLS+= gmake pkg-config:run
14CONFIGURE_ARGS+= --disable-assert 14CONFIGURE_ARGS+= --disable-assert
@@ -75,26 +75,30 @@ SUBST_SED.fix-tools= -e 's,${TOOLS_DIR} @@ -75,26 +75,30 @@ SUBST_SED.fix-tools= -e 's,${TOOLS_DIR}
75 75
76SUBST_CLASSES+= fix-pc 76SUBST_CLASSES+= fix-pc
77SUBST_STAGE.fix-pc= pre-configure 77SUBST_STAGE.fix-pc= pre-configure
78SUBST_MESSAGE.fix-pc= Unwrapping pkg-config path in installed helper tools. 78SUBST_MESSAGE.fix-pc= Unwrapping pkg-config path in installed helper tools.
79SUBST_FILES.fix-pc+= Magick++/bin/Magick++-config.in 79SUBST_FILES.fix-pc+= Magick++/bin/Magick++-config.in
80SUBST_FILES.fix-pc+= MagickCore/MagickCore-config.in 80SUBST_FILES.fix-pc+= MagickCore/MagickCore-config.in
81SUBST_FILES.fix-pc+= MagickWand/MagickWand-config.in 81SUBST_FILES.fix-pc+= MagickWand/MagickWand-config.in
82SUBST_SED.fix-pc= -e 's,@PKG_CONFIG@,pkg-config,g' 82SUBST_SED.fix-pc= -e 's,@PKG_CONFIG@,pkg-config,g'
83 83
84# failed to convert strong functions and variables: Invalid type identifier 84# failed to convert strong functions and variables: Invalid type identifier
85CTF_FILES_SKIP+= lib/libMagickCore-7.Q16HDRI.so.* 85CTF_FILES_SKIP+= lib/libMagickCore-7.Q16HDRI.so.*
86CTF_FILES_SKIP+= lib/libMagickWand-7.Q16HDRI.so.* 86CTF_FILES_SKIP+= lib/libMagickWand-7.Q16HDRI.so.*
87 87
 88.include "../../print/ghostscript/buildlink3.mk"
 89.if !empty(PKG_BUILD_OPTIONS.ghostscript:Mghostscript-gpl)
 90CFLAGS+= -DPKGSRC_USE_OLD_GHOSTSCRIPT
 91.endif
 92
88.include "../../archivers/bzip2/buildlink3.mk" 93.include "../../archivers/bzip2/buildlink3.mk"
89.include "../../archivers/xz/buildlink3.mk" 94.include "../../archivers/xz/buildlink3.mk"
90.include "../../devel/libltdl/buildlink3.mk" 95.include "../../devel/libltdl/buildlink3.mk"
91.include "../../fonts/fontconfig/buildlink3.mk" 96.include "../../fonts/fontconfig/buildlink3.mk"
92.include "../../graphics/freetype2/buildlink3.mk" 97.include "../../graphics/freetype2/buildlink3.mk"
93.include "../../mk/jpeg.buildlink3.mk" 98.include "../../mk/jpeg.buildlink3.mk"
94.include "../../graphics/lcms2/buildlink3.mk" 99.include "../../graphics/lcms2/buildlink3.mk"
95.include "../../graphics/libwebp/buildlink3.mk" 100.include "../../graphics/libwebp/buildlink3.mk"
96.include "../../graphics/png/buildlink3.mk" 101.include "../../graphics/png/buildlink3.mk"
97.include "../../math/fftw/buildlink3.mk" 102.include "../../math/fftw/buildlink3.mk"
98.include "../../print/ghostscript/buildlink3.mk" 
99.include "../../textproc/libxml2/buildlink3.mk" 103.include "../../textproc/libxml2/buildlink3.mk"
100.include "../../mk/bsd.pkg.mk" 104.include "../../mk/bsd.pkg.mk"
cvs diff -r1.277 -r1.278 pkgsrc/graphics/ImageMagick/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/distinfo 2022/06/13 09:35:44 1.277
+++ pkgsrc/graphics/ImageMagick/distinfo 2022/06/20 20:49:26 1.278
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.277 2022/06/13 09:35:44 wiz Exp $ 1$NetBSD: distinfo,v 1.278 2022/06/20 20:49:26 dholland Exp $
2 2
3BLAKE2s (ImageMagick-7.1.0-37.tar.xz) = c03be05ebcb1c3cda0eee6963c745fd714a0d99a901fc4e9c10d7953d95936aa 3BLAKE2s (ImageMagick-7.1.0-37.tar.xz) = c03be05ebcb1c3cda0eee6963c745fd714a0d99a901fc4e9c10d7953d95936aa
4SHA512 (ImageMagick-7.1.0-37.tar.xz) = 43f116a3a6bb9794b8c8440c57a537eab29b0dac7b8ace574e3cc1e6d484054557c9e44235eb799b843ef761c6f22d29ef959f6de6b80a45a3898bee4d2f16da 4SHA512 (ImageMagick-7.1.0-37.tar.xz) = 43f116a3a6bb9794b8c8440c57a537eab29b0dac7b8ace574e3cc1e6d484054557c9e44235eb799b843ef761c6f22d29ef959f6de6b80a45a3898bee4d2f16da
5Size (ImageMagick-7.1.0-37.tar.xz) = 10345216 bytes 5Size (ImageMagick-7.1.0-37.tar.xz) = 10345216 bytes
6SHA1 (patch-config_policy.xml) = f8d130dcb1e81cd78a7856ca9b334f6ebf95c18f 6SHA1 (patch-config_policy.xml) = f8d130dcb1e81cd78a7856ca9b334f6ebf95c18f
 7SHA1 (patch-ghostscript-private.h) = 98d88220cf8814f2e4841c382de5e2e9e0ae9287
File Added: pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h
$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)