git: 296ebc603ab7 - main - graphics/GraphicsMagick: enable JXL by default after 7ea47cecaa27

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=296ebc603ab7d698ba5d85a3969b75aba0c83e6d

commit 296ebc603ab7d698ba5d85a3969b75aba0c83e6d
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-08-09 15:09:46 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-08-25 21:53:42 +0000

    graphics/GraphicsMagick: enable JXL by default after 7ea47cecaa27
    
    PR:             265741
    Approved by:    maintainer timeout (2 weeks)
---
 graphics/GraphicsMagick/Makefile              |  6 ++----
 graphics/GraphicsMagick/files/patch-configure | 13 +++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index ca005bdce131..a606be9f1177 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.3.38
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
@@ -25,8 +25,7 @@ USE_LDCONFIG=	yes
 WINDOWS_FONT_DIR?=	${LOCALBASE}/share/fonts/webfonts
 
 OPTIONS_DEFINE=	BZIP2 DOCS FPX FREETYPE HEIF JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP Q8BIT PNG SSE TEST TIFF UMEM WEBP WMF X11 XML ZLIB ZSTD
-OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG LCMS2 LZMA OPENMP PNG TIFF WEBP WMF X11 XML ZLIB
-JXL_DESC=	JPEG XL image format via libjxl (BROKEN now)
+OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP PNG TIFF WEBP WMF X11 XML ZLIB
 Q8BIT_DESC=	Use 8-bit pixels (speed) instead of 16-bit (quality)
 UMEM_DESC=	UMEM memory allocation library support
 TEST_DESC=	Run bundled self-tests after build
@@ -44,7 +43,6 @@ JBIG_CONFIGURE_WITH=	jbig
 JBIG_LIB_DEPENDS=	libjbig.so:graphics/jbigkit
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_USES=		jpeg
-JXL_BROKEN=		does not build: use of undeclared identifier 'JxlEncoderFrameSettings'
 JXL_CONFIGURE_WITH=	jxl
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 LCMS2_CONFIGURE_WITH=	lcms2
diff --git a/graphics/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure
index 92a9e3083493..01011aea16aa 100644
--- a/graphics/GraphicsMagick/files/patch-configure
+++ b/graphics/GraphicsMagick/files/patch-configure
@@ -69,6 +69,19 @@
  
    # Check for system-dependent libraries X programs must link with.
    # Do this before checking for the system-independent R6 libraries
+@@ -27336,10 +27281,8 @@ $as_echo "no -- some components failed test" >&6; }
+ $as_echo "no -- some components failed test" >&6; }
+         have_jxl='no (failed tests)'
+     else
+-        # JXL is a C++ Lib so requires linking with stdc++.
+-        # TODO: A better solution would be to tell automake to do any linking with
+-        # c++, but I can't figure out a way to get this working.
+-        LIB_JXL='-ljxl -ljxl_threads -lhwy -lbrotlidec -lbrotlienc -lstdc++'
++        # TODO: use pkg-config
++        LIB_JXL='-ljxl -ljxl_threads'
+         LIBS="$LIB_JXL $LIBS"
+ 
+ $as_echo "#define HasJXL 1" >>confdefs.h
 @@ -27703,7 +27649,7 @@ fi
  #