Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Apr 2024 12:53:06 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e710744f6c83 - main - graphics/GraphicsMagick: Update to 1.3.43
Message-ID:  <202404181253.43ICr61o069768@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

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

commit e710744f6c835f2b99cbfca56d523d46109e63b0
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-04-18 12:47:58 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-04-18 12:47:58 +0000

    graphics/GraphicsMagick: Update to 1.3.43
    
    Changes:        http://www.graphicsmagick.org/NEWS.html
---
 graphics/GraphicsMagick/Makefile                 |  5 +-
 graphics/GraphicsMagick/distinfo                 |  6 +--
 graphics/GraphicsMagick/files/patch-Makefile.in  | 11 ----
 graphics/GraphicsMagick/files/patch-coders_jxl.c | 63 ----------------------
 graphics/GraphicsMagick/files/patch-configure    | 28 +++-------
 graphics/GraphicsMagick/files/patch-jpeg-turbo   | 67 ------------------------
 graphics/GraphicsMagick/pkg-plist                | 11 ++--
 7 files changed, 20 insertions(+), 171 deletions(-)

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index be2ef664e5cf..98b9b182def1 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.3.40
-PORTREVISION=	5
+PORTVERSION=	1.3.43
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
@@ -11,7 +10,7 @@ WWW=		http://www.graphicsmagick.org/
 
 LICENSE=	MIT
 
-USES=		cpe libtool localbase pathfix pkgconfig tar:zst
+USES=		cpe libtool localbase pathfix pkgconfig tar:xz
 
 CONFIGURE_ARGS=	--enable-shared --enable-static \
 		--with-windows-font-dir=${WINDOWS_FONT_DIR} \
diff --git a/graphics/GraphicsMagick/distinfo b/graphics/GraphicsMagick/distinfo
index 523e765c0fe9..15c2dffdc3f1 100644
--- a/graphics/GraphicsMagick/distinfo
+++ b/graphics/GraphicsMagick/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674589502
-SHA256 (GraphicsMagick-1.3.40.tar.zst) = 1c86bc8cdcfb7daa6d34940e1bccf82c201a27ecdcc65e8bb1089a4da6f2cfcc
-SIZE (GraphicsMagick-1.3.40.tar.zst) = 5559254
+TIMESTAMP = 1713033310
+SHA256 (GraphicsMagick-1.3.43.tar.xz) = 2b88580732cd7e409d9e22c6116238bef4ae06fcda11451bf33d259f9cbf399f
+SIZE (GraphicsMagick-1.3.43.tar.xz) = 5657460
diff --git a/graphics/GraphicsMagick/files/patch-Makefile.in b/graphics/GraphicsMagick/files/patch-Makefile.in
deleted file mode 100644
index 6478ffc15838..000000000000
--- a/graphics/GraphicsMagick/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2015-02-28 20:53:46 UTC
-+++ Makefile.in
-@@ -2221,7 +2221,7 @@ MagickFilterModulesPath = @MagickFilterM
- MagickLibConfigPath = @MagickLibConfigPath@
- MagickLibPath = @MagickLibPath@
- MagickShareConfigPath = @MagickShareConfigPath@
--MagickSharePath = @MagickSharePath@
-+MagickSharePath = ${DATADIR}
- MogrifyDelegate = @MogrifyDelegate@
- NM = @NM@
- NMEDIT = @NMEDIT@
diff --git a/graphics/GraphicsMagick/files/patch-coders_jxl.c b/graphics/GraphicsMagick/files/patch-coders_jxl.c
deleted file mode 100644
index 4cd9d9155818..000000000000
--- a/graphics/GraphicsMagick/files/patch-coders_jxl.c
+++ /dev/null
@@ -1,63 +0,0 @@
-https://sourceforge.net/p/graphicsmagick/code/ci/43bc74dd0c13/
-
---- coders/jxl.c.orig	2023-01-14 15:40:53 UTC
-+++ coders/jxl.c
-@@ -631,8 +631,12 @@ static Image *ReadJXLImage(const ImageInfo *image_info
-             JxlColorEncoding
-               color_encoding;
- 
--            status=JxlDecoderGetColorAsEncodedProfile(jxl_decoder,&pixel_format,
--                                                      JXL_COLOR_PROFILE_TARGET_DATA,&color_encoding);
-+            status=JxlDecoderGetColorAsEncodedProfile(jxl_decoder,
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-+                                                      &pixel_format,
-+#endif /* if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) */
-+                                                      JXL_COLOR_PROFILE_TARGET_DATA,
-+                                                      &color_encoding);
-             if (status == JXL_DEC_ERROR)
-               {
-                 status=JXL_DEC_SUCCESS;
-@@ -733,8 +737,12 @@ static Image *ReadJXLImage(const ImageInfo *image_info
-               size_t
-                 profile_size;
- 
--              if (JxlDecoderGetICCProfileSize(jxl_decoder,&pixel_format,
--                                              JXL_COLOR_PROFILE_TARGET_ORIGINAL,&profile_size)
-+              if (JxlDecoderGetICCProfileSize(jxl_decoder,
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-+                                              &pixel_format,
-+#endif /* if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) */
-+                                              JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-+                                              &profile_size)
-                   == JXL_DEC_SUCCESS)
-                 {
-                   unsigned char
-@@ -743,10 +751,14 @@ static Image *ReadJXLImage(const ImageInfo *image_info
-                   if ((profile=MagickAllocateResourceLimitedMemory(unsigned char *,profile_size))
-                       != NULL)
-                     {
--                      if (JxlDecoderGetColorAsICCProfile(jxl_decoder,&pixel_format,
-+                      if (JxlDecoderGetColorAsICCProfile(jxl_decoder,
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-+                                                         &pixel_format,
-+#endif /* if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) */
-                                                          JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                                          profile,
--                                                         profile_size) == JXL_DEC_SUCCESS)
-+                                                         profile_size)
-+                          == JXL_DEC_SUCCESS)
-                         {
-                           (void) SetImageProfile(image,"ICM",profile,profile_size);
-                         }
-@@ -1268,8 +1280,11 @@ static unsigned int WriteJXLImage(const ImageInfo *ima
-       /* TODO better error codes */
-       if (jxl_status == JXL_ENC_ERROR)
-         ThrowJXLWriterException(CoderError,NoDataReturned,image);
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-+      /* JXL_ENC_NOT_SUPPORTED was removed for 0.9.0, although API docs still mention it. */
-       else if (jxl_status == JXL_ENC_NOT_SUPPORTED)
-         ThrowJXLWriterException(CoderError,UnsupportedBitsPerSample,image);
-+#endif /* if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) */
-       else
-         ThrowJXLWriterException(CoderFatalError,Default,image);
-     }
diff --git a/graphics/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure
index 01011aea16aa..7c7286726db9 100644
--- a/graphics/GraphicsMagick/files/patch-configure
+++ b/graphics/GraphicsMagick/files/patch-configure
@@ -1,14 +1,14 @@
---- configure.orig	2015-02-28 20:53:46 UTC
+--- configure.orig	2024-03-22 13:04:33 UTC
 +++ configure
-@@ -13277,7 +13277,6 @@ fi
+@@ -13400,7 +13400,6 @@ fi
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-     freebsd* | dragonfly*)
+     freebsd* | dragonfly* | midnightbsd*)
        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 -      hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
        ;;
-@@ -24497,60 +24496,6 @@ else
+@@ -25496,61 +25495,6 @@ else
      X_CFLAGS="$X_CFLAGS -I$x_includes"
    fi
  
@@ -66,23 +66,11 @@
 -    ac_c_werror_flag=$ac_xsave_c_werror_flag
 -    LIBS=$ac_xsave_LIBS
 -  fi
- 
+-
    # 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
+   # (-lICE), since we may need -lsocket or whatever for X linking.
+@@ -30112,7 +30056,7 @@ done
  #
  
  # Subdirectory under lib to place GraphicsMagick lib files
@@ -91,7 +79,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define MagickLibSubdir "$MagickLibSubdir"
-@@ -27807,7 +27753,7 @@ _ACEOF
+@@ -30216,7 +30160,7 @@ _ACEOF
  
  #
  # Path to GraphicsMagick share files
diff --git a/graphics/GraphicsMagick/files/patch-jpeg-turbo b/graphics/GraphicsMagick/files/patch-jpeg-turbo
deleted file mode 100644
index 69b35df5e469..000000000000
--- a/graphics/GraphicsMagick/files/patch-jpeg-turbo
+++ /dev/null
@@ -1,67 +0,0 @@
---- coders/jpeg.c.orig	2022-12-26 16:56:04 UTC
-+++ coders/jpeg.c
-@@ -1,5 +1,5 @@
- /*
--% Copyright (C) 2003-2022 GraphicsMagick Group
-+% Copyright (C) 2003-2023 GraphicsMagick Group
- % Copyright (C) 2002 ImageMagick Studio
- % Copyright 1991-1999 E. I. du Pont de Nemours and Company
- %
-@@ -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 ?
-@@ -1693,7 +1695,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_inf
-         }
-     }
- 
--  jpeg_pixels=MagickAllocateResourceLimitedArray(JSAMPLE *,
-+  jpeg_pixels=MagickAllocateResourceLimitedClearedArray(JSAMPLE *,
-                                   jpeg_info.output_components,
-                                   MagickArraySize(image->columns,
-                                                   sizeof(JSAMPLE)));
-@@ -1702,9 +1704,6 @@ static Image *ReadJPEGImage(const ImageInfo *image_inf
-       jpeg_destroy_decompress(&jpeg_info);
-       ThrowJPEGReaderException(ResourceLimitError,MemoryAllocationFailed,image);
-     }
--  (void) memset(jpeg_pixels,0,MagickArraySize(jpeg_info.output_components,
--                                              MagickArraySize(image->columns,
--                                                              sizeof(JSAMPLE))));
- 
-   /*
-     Extended longjmp-based error handler (with jpeg_pixels)
-@@ -2791,7 +2790,8 @@ static MagickPassFail WriteJPEGImage(const ImageInfo *
-     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-       "Image resolution: %ld,%ld",(long) image->x_resolution,
-       (long) image->y_resolution);
--  if ((image->x_resolution != 0) && (image->y_resolution != 0))
-+  if ((image->x_resolution >= 0) && (image->x_resolution < (double) SHRT_MAX) &&
-+      (image->y_resolution >= 0) && (image->y_resolution < (double) SHRT_MAX))
-     {
-       /*
-         Set image resolution.
-@@ -2896,7 +2896,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);
diff --git a/graphics/GraphicsMagick/pkg-plist b/graphics/GraphicsMagick/pkg-plist
index 018b7f1ba46d..b487915a3b54 100644
--- a/graphics/GraphicsMagick/pkg-plist
+++ b/graphics/GraphicsMagick/pkg-plist
@@ -95,15 +95,15 @@ lib/GraphicsMagick/config/type.mgk
 lib/libGraphicsMagick++.a
 lib/libGraphicsMagick++.so
 lib/libGraphicsMagick++.so.12
-lib/libGraphicsMagick++.so.12.7.0
+lib/libGraphicsMagick++.so.12.8.0
 lib/libGraphicsMagick.a
 lib/libGraphicsMagick.so
 lib/libGraphicsMagick.so.3
-lib/libGraphicsMagick.so.3.24.2
+lib/libGraphicsMagick.so.3.25.0
 lib/libGraphicsMagickWand.a
 lib/libGraphicsMagickWand.so
 lib/libGraphicsMagickWand.so.2
-lib/libGraphicsMagickWand.so.2.9.8
+lib/libGraphicsMagickWand.so.2.10.0
 libdata/pkgconfig/GraphicsMagick++.pc
 libdata/pkgconfig/GraphicsMagick.pc
 libdata/pkgconfig/GraphicsMagickWand.pc
@@ -131,6 +131,8 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2018
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2019
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2020
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2021
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2022
 %%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2001.html
@@ -155,7 +157,8 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2020.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2021.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2022.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2023.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Changes.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/www/FAQ.html



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404181253.43ICr61o069768>