From: Brad Smith <brad@comstyle.com>
Subject: UPDATE: GraphicsMagick 1.3.42 - unbreak with libjxl
To: ports@openbsd.org
Date: Tue, 27 Feb 2024 19:13:24 -0500

Here is an update to GraphicsMagick 1.3.42.

The libjxl update broke building GraphicsMagick. This adds support
for the libjxl 0.9 API.


Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/GraphicsMagick/Makefile,v
retrieving revision 1.73
diff -u -p -u -p -r1.73 Makefile
--- Makefile	26 Sep 2023 11:39:01 -0000	1.73
+++ Makefile	28 Feb 2024 00:07:02 -0000
@@ -1,12 +1,11 @@
 COMMENT=	image processing tools with stable ABI
 
-DISTNAME=	GraphicsMagick-1.3.40
+DISTNAME=	GraphicsMagick-1.3.42
 CATEGORIES=	graphics devel
 SITES=		${SITE_SOURCEFORGE:=graphicsmagick/}
 EXTRACT_SUFX=	.tar.xz
-REVISION=	0
 
-SHARED_LIBS=	GraphicsMagick		9.3 \
+SHARED_LIBS=	GraphicsMagick		9.4 \
 		GraphicsMagick++	6.1 \
 		GraphicsMagickWand	4.0
 
@@ -17,11 +16,11 @@ MAINTAINER=	Brad Smith <brad@comstyle.co
 # http://www.graphicsmagick.org/www/Copyright.html
 PERMIT_PACKAGE=		Yes
 
-WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xau Xdmcp Xext aom bz2 c
-WANTLIB += dav1d de265 freetype heif iconv jasper jbig jpeg lcms2
-WANTLIB += ltdl lzma m png tiff webp webpmux wmflite-0.2 x265 xcb
-WANTLIB += brotlicommon brotlidec brotlienc hwy jxl jxl_threads
-WANTLIB += xml2 z zstd sharpyuv
+WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xau Xdmcp Xext aom brotlicommon
+WANTLIB += brotlidec brotlienc bz2 c de265 freetype heif hwy iconv
+WANTLIB += jasper jbig jpeg jxl jxl_cms jxl_threads lcms2 ltdl
+WANTLIB += lzma m png sharpyuv tiff webp webpmux wmflite-0.2 x265
+WANTLIB += xcb xml2 z zstd
 
 WANTLIB += perl # uses perl ABI
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/GraphicsMagick/distinfo,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 distinfo
--- distinfo	9 Apr 2023 06:02:45 -0000	1.33
+++ distinfo	28 Feb 2024 00:07:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (GraphicsMagick-1.3.40.tar.xz) = l9wanU6Jx3slo7JFBef/FlO4j5v+MfGJzhCAS476d0Y=
-SIZE (GraphicsMagick-1.3.40.tar.xz) = 5507792
+SHA256 (GraphicsMagick-1.3.42.tar.xz) = SE/M/Ssvr2wrqRUUaezlByvLkbpO1z517T2ORsdZ1Vc=
+SIZE (GraphicsMagick-1.3.42.tar.xz) = 5553692
Index: patches/patch-coders_jpeg_c
===================================================================
RCS file: patches/patch-coders_jpeg_c
diff -N patches/patch-coders_jpeg_c
--- patches/patch-coders_jpeg_c	12 Nov 2023 10:36:49 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-https://sourceforge.net/p/graphicsmagick/code/ci/166bc6d3500ddeb243c7c1b25ca0d9eade8e3b55/
-
-Index: coders/jpeg.c
---- coders/jpeg.c.orig
-+++ coders/jpeg.c
-@@ -954,7 +954,7 @@ EstimateJPEGQuality(const struct jpeg_decompress_struc
-     i;
- 
-   save_quality=0;
--#ifdef D_LOSSLESS_SUPPORTED
-+#if !defined(LIBJPEG_TURBO_VERSION_NUMBER) && defined(D_LOSSLESS_SUPPORTED)
-   if (image->compression==LosslessJPEGCompression)
-     {
-       save_quality=100;
-@@ -1461,7 +1461,9 @@ static Image *ReadJPEGImage(const ImageInfo *image_inf
-     }
- #endif
- #if (JPEG_LIB_VERSION >= 61) && defined(D_PROGRESSIVE_SUPPORTED)
--#ifdef D_LOSSLESS_SUPPORTED
-+#if !defined(LIBJPEG_TURBO_VERSION_NUMBER) && defined(D_LOSSLESS_SUPPORTED)
-+  /* This code is based on a patch to IJG JPEG 6b, or somesuch.  Standard
-+     library does not have a 'process' member. */
-   image->interlace=
-     jpeg_info.process == JPROC_PROGRESSIVE ? LineInterlace : NoInterlace;
-   image->compression=jpeg_info.process == JPROC_LOSSLESS ?
-@@ -2896,7 +2898,7 @@ static MagickPassFail WriteJPEGImage(const ImageInfo *
-   if ((image->compression == LosslessJPEGCompression) ||
-       (quality > 100))
-     {
--#if defined(C_LOSSLESS_SUPPORTED)
-+#if !defined(LIBJPEG_TURBO_VERSION_NUMBER) && defined(C_LOSSLESS_SUPPORTED)
-       if (quality < 100)
-         ThrowException(&image->exception,CoderWarning,
-                        LosslessToLossyJPEGConversion,(char *) NULL);
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/GraphicsMagick/patches/patch-configure,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-configure
--- patches/patch-configure	9 Apr 2023 06:02:45 -0000	1.22
+++ patches/patch-configure	28 Feb 2024 00:07:02 -0000
@@ -1,7 +1,7 @@
 Index: configure
 --- configure.orig
 +++ configure
-@@ -28557,7 +28557,7 @@ done
+@@ -28663,7 +28663,7 @@ done
  #
  
  # Subdirectory under lib to place GraphicsMagick lib files
@@ -10,7 +10,7 @@ Index: configure
  
  cat >>confdefs.h <<_ACEOF
  #define MagickLibSubdir "$MagickLibSubdir"
-@@ -28661,7 +28661,7 @@ _ACEOF
+@@ -28767,7 +28767,7 @@ _ACEOF
  
  #
  # Path to GraphicsMagick share files