GraphicsMagick: Jasper is now optionally dependent on libheif
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.6795.1687876817.9958.graphicsmagick-commit@lists.sourceforge.net> |
changeset aa872e8de8be in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=aa872e8de8be summary: Jasper is now optionally dependent on libheif diffstat: ChangeLog | 5 +++++ Makefile.in | 5 +++-- coders/Makefile.am | 2 +- configure | 2 +- configure.ac | 4 ++-- www/Changelog.html | 7 +++++++ 6 files changed, 19 insertions(+), 6 deletions(-) diffs (93 lines): diff -r caf84c3d5eeb -r aa872e8de8be ChangeLog --- a/ChangeLog Tue Jun 27 09:33:42 2023 -0500 +++ b/ChangeLog Tue Jun 27 09:40:01 2023 -0500 @@ -1,3 +1,8 @@ +2023-06-27 Bob Friesenhahn <[email protected]> + + * configure.ac, coders/Makefile.am: Jasper is now optionally + dependent on libheif. + 2023-06-27 Przemysław Sobala <[email protected]> * magick/GraphicsMagick.pc.in (Libs.private): Fix pkg-config files diff -r caf84c3d5eeb -r aa872e8de8be Makefile.in --- a/Makefile.in Tue Jun 27 09:33:42 2023 -0500 +++ b/Makefile.in Tue Jun 27 09:40:01 2023 -0500 @@ -596,7 +596,8 @@ @HasJPEG_TRUE@@WITH_MODULES_TRUE@am_coders_jnx_la_rpath = -rpath \ @HasJPEG_TRUE@@WITH_MODULES_TRUE@ $(codersdir) coders_jp2_la_DEPENDENCIES = $(LIBMAGICK) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_coders_jp2_la_OBJECTS = coders/jp2_la-jp2.lo coders_jp2_la_OBJECTS = $(am_coders_jp2_la_OBJECTS) coders_jp2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -3331,7 +3332,7 @@ coders_jp2_la_SOURCES = coders/jp2.c coders_jp2_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_jp2_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_jp2_la_LIBADD = $(LIBMAGICK) $(LIB_JP2) $(LIB_JPEG) $(LIB_MATH) +coders_jp2_la_LIBADD = $(LIBMAGICK) $(LIB_JP2) $(LIB_HEIF) $(LIB_JPEG) $(LIB_MATH) # JXL coder module coders_jxl_la_SOURCES = coders/jxl.c diff -r caf84c3d5eeb -r aa872e8de8be coders/Makefile.am --- a/coders/Makefile.am Tue Jun 27 09:33:42 2023 -0500 +++ b/coders/Makefile.am Tue Jun 27 09:40:01 2023 -0500 @@ -488,7 +488,7 @@ coders_jp2_la_SOURCES = coders/jp2.c coders_jp2_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_jp2_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_jp2_la_LIBADD = $(LIBMAGICK) $(LIB_JP2) $(LIB_JPEG) $(LIB_MATH) +coders_jp2_la_LIBADD = $(LIBMAGICK) $(LIB_JP2) $(LIB_HEIF) $(LIB_JPEG) $(LIB_MATH) # JXL coder module coders_jxl_la_SOURCES = coders/jxl.c diff -r caf84c3d5eeb -r aa872e8de8be configure --- a/configure Tue Jun 27 09:33:42 2023 -0500 +++ b/configure Tue Jun 27 09:40:01 2023 -0500 @@ -30759,7 +30759,7 @@ then MAGICK_DEP_LIBS="$LIBS_USER $LIB_LCMS $LIB_TTF $LIB_GS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_BZLIB $LIB_ZLIB $LIB_LTDL $LIB_TRIO $LIB_GDI32 $LIB_MATH $LIB_THREAD $LIB_TCMALLOC $LIB_UMEM $LIB_MTMALLOC" else - MAGICK_DEP_LIBS="$LIBS_USER $LIB_JBIG $LIB_WEBP $LIB_HEIF $LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JP2 $LIB_JPEG $LIB_JXL $LIB_GS $LIB_PNG $LIB_FPX $LIB_WMF $LIB_DPS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_LZMA $LIB_BZLIB $LIB_XML $LIB_ZLIB $LIB_ZSTD $LIB_TRIO $LIB_GDI32 $LIB_MATH $LIB_THREAD $LIB_TCMALLOC $LIB_UMEM $LIB_MTMALLOC" + MAGICK_DEP_LIBS="$LIBS_USER $LIB_JBIG $LIB_WEBP $LIB_JP2 $LIB_HEIF $LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JPEG $LIB_JXL $LIB_GS $LIB_PNG $LIB_FPX $LIB_WMF $LIB_DPS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_LZMA $LIB_BZLIB $LIB_XML $LIB_ZLIB $LIB_ZSTD $LIB_TRIO $LIB_GDI32 $LIB_MATH $LIB_THREAD $LIB_TCMALLOC $LIB_UMEM $LIB_MTMALLOC" fi MAGICK_EXTRA_DEP_LIBS="$LIB_OMP" # Extra libraries typically added due to CFLAGS diff -r caf84c3d5eeb -r aa872e8de8be configure.ac --- a/configure.ac Tue Jun 27 09:33:42 2023 -0500 +++ b/configure.ac Tue Jun 27 09:40:01 2023 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2022 GraphicsMagick Group +# Copyright (C) 2003-2023 GraphicsMagick Group # Copyright (C) 2002 ImageMagick Studio # Copyright (C) 1998, 1999 E. I. du Pont de Nemours and Company # @@ -3852,7 +3852,7 @@ then MAGICK_DEP_LIBS="$LIBS_USER $LIB_LCMS $LIB_TTF $LIB_GS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_BZLIB $LIB_ZLIB $LIB_LTDL $LIB_TRIO $LIB_GDI32 $LIB_MATH $LIB_THREAD $LIB_TCMALLOC $LIB_UMEM $LIB_MTMALLOC" else - MAGICK_DEP_LIBS="$LIBS_USER $LIB_JBIG $LIB_WEBP $LIB_HEIF $LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JP2 $LIB_JPEG $LIB_JXL $LIB_GS $LIB_PNG $LIB_FPX $LIB_WMF $LIB_DPS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_LZMA $LIB_BZLIB $LIB_XML $LIB_ZLIB $LIB_ZSTD $LIB_TRIO $LIB_GDI32 $LIB_MATH $LIB_THREAD $LIB_TCMALLOC $LIB_UMEM $LIB_MTMALLOC" + MAGICK_DEP_LIBS="$LIBS_USER $LIB_JBIG $LIB_WEBP $LIB_JP2 $LIB_HEIF $LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JPEG $LIB_JXL $LIB_GS $LIB_PNG $LIB_FPX $LIB_WMF $LIB_DPS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_LZMA $LIB_BZLIB $LIB_XML $LIB_ZLIB $LIB_ZSTD $LIB_TRIO $LIB_GDI32 $LIB_MATH $LIB_THREAD $LIB_TCMALLOC $LIB_UMEM $LIB_MTMALLOC" fi MAGICK_EXTRA_DEP_LIBS="$LIB_OMP" # Extra libraries typically added due to CFLAGS AC_SUBST([MAGICK_DEP_LIBS]) diff -r caf84c3d5eeb -r aa872e8de8be www/Changelog.html --- a/www/Changelog.html Tue Jun 27 09:33:42 2023 -0500 +++ b/www/Changelog.html Tue Jun 27 09:40:01 2023 -0500 @@ -37,6 +37,13 @@ </div> <div class="document"> +<p>2023-06-27 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> +<blockquote> +<ul class="simple"> +<li><p>configure.ac, coders/Makefile.am: Jasper is now optionally +dependent on libheif.</p></li> +</ul> +</blockquote> <p>2023-06-27 Przemysław Sobala <<a class="reference external" href="mailto:przemyslaw.sobala%40gmail.com">przemyslaw<span>.</span>sobala<span>@</span>gmail<span>.</span>com</a>></p> <blockquote> <ul class="simple"> _______________________________________________ Graphicsmagick-commit mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit