GraphicsMagick: Add OpenMP runtime as dependency. If JXL enable...
GraphicsMagick Commits <[email protected]> Tue, 21 Nov 2023 17:30:09 -0600
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.5241.1700609423.7794.graphicsmagick-commit@lists.sourceforge.net> |
changeset 1c41908b4bc3 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=1c41908b4bc3 summary: Add OpenMP runtime as dependency. If JXL enabled, then link using C++ compiler. diffstat: ChangeLog | 19 ++ Makefile.in | 139 ++++++++++++++------ VisualMagick/installer/inc/version.isx | 4 +- coders/Makefile.am | 8 +- coders/acppfile.cpp | 10 + config/config.guess | 57 ++++++- config/config.sub | 217 ++++++++++++++++++++------------ configure | 133 +++++++++++-------- configure.ac | 32 +++- fuzzing/oss-fuzz-build.sh | 47 ++++-- magick/GraphicsMagick.pc.in | 2 +- magick/Makefile.am | 4 +- magick/version.h | 4 +- www/Changelog.html | 20 +++ 14 files changed, 465 insertions(+), 231 deletions(-) diffs (truncated from 1526 to 500 lines): diff -r 45cce7492a0d -r 1c41908b4bc3 ChangeLog --- a/ChangeLog Fri Nov 17 18:59:21 2023 -0600 +++ b/ChangeLog Tue Nov 21 17:30:04 2023 -0600 @@ -1,3 +1,22 @@ +2023-11-21 Bob Friesenhahn <[email protected]> + + * magick/GraphicsMagick.pc.in: Add OpenMP runtime library as a + private dependency. + + * coders/Makefile.am: If JXL is enabled, then link the JXL module + with C++ (if modules are enabled), or the GraphicsMagick library + with C++ (if modules are not enabled). + + * configure.ac: Fix detection of if OpenMP is enabled. Add the + OpenMP runtime as an explicit library dependency. + + * coders/acppfile.cpp: An example useless C++ file. + +2023-11-20 Bob Friesenhahn <[email protected]> + + * coders/Makefile.am: When linking JXL or FlashPIX, use the C++ + linker. + 2023-11-17 Bob Friesenhahn <[email protected]> * configure.ac: libbrotlidec and liblbrotlienc depend on diff -r 45cce7492a0d -r 1c41908b4bc3 Makefile.in --- a/Makefile.in Fri Nov 17 18:59:21 2023 -0600 +++ b/Makefile.in Tue Nov 21 17:30:04 2023 -0600 @@ -492,11 +492,13 @@ $@ @WITH_MODULES_TRUE@am_coders_fits_la_rpath = -rpath $(codersdir) coders_fpx_la_DEPENDENCIES = $(LIBMAGICK) $(am__DEPENDENCIES_1) -am_coders_fpx_la_OBJECTS = coders/fpx_la-fpx.lo +am_coders_fpx_la_OBJECTS = coders/fpx_la-fpx.lo \ + coders/fpx_la-acppfile.lo coders_fpx_la_OBJECTS = $(am_coders_fpx_la_OBJECTS) -coders_fpx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(coders_fpx_la_LDFLAGS) $(LDFLAGS) -o $@ +coders_fpx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(coders_fpx_la_LDFLAGS) $(LDFLAGS) \ + -o $@ @HasFPX_TRUE@@WITH_MODULES_TRUE@am_coders_fpx_la_rpath = -rpath \ @HasFPX_TRUE@@WITH_MODULES_TRUE@ $(codersdir) coders_gif_la_DEPENDENCIES = $(LIBMAGICK) @@ -615,11 +617,13 @@ @HasJPEG_TRUE@@WITH_MODULES_TRUE@am_coders_jpeg_la_rpath = -rpath \ @HasJPEG_TRUE@@WITH_MODULES_TRUE@ $(codersdir) coders_jxl_la_DEPENDENCIES = $(LIBMAGICK) $(am__DEPENDENCIES_1) -am_coders_jxl_la_OBJECTS = coders/jxl_la-jxl.lo +am_coders_jxl_la_OBJECTS = coders/jxl_la-jxl.lo \ + coders/jxl_la-acppfile.lo coders_jxl_la_OBJECTS = $(am_coders_jxl_la_OBJECTS) -coders_jxl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(coders_jxl_la_LDFLAGS) $(LDFLAGS) -o $@ +coders_jxl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(coders_jxl_la_LDFLAGS) $(LDFLAGS) \ + -o $@ @HasJXL_TRUE@@WITH_MODULES_TRUE@am_coders_jxl_la_rpath = -rpath \ @HasJXL_TRUE@@WITH_MODULES_TRUE@ $(codersdir) coders_label_la_DEPENDENCIES = $(LIBMAGICK) @@ -1156,9 +1160,10 @@ $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_filters_analyze_la_rpath = -rpath $(filtersdir) @WITH_MODULES_FALSE@magick_libGraphicsMagick_la_DEPENDENCIES = \ +@WITH_MODULES_FALSE@ $(am__DEPENDENCIES_1) \ @WITH_MODULES_FALSE@ $(am__DEPENDENCIES_1) @WITH_MODULES_TRUE@magick_libGraphicsMagick_la_DEPENDENCIES = \ -@WITH_MODULES_TRUE@ $(am__DEPENDENCIES_1) +@WITH_MODULES_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__magick_libGraphicsMagick_la_SOURCES_DIST = \ magick/alpha_composite.h magick/analyze.c magick/analyze.h \ magick/annotate.c magick/api.h magick/attribute.c \ @@ -1216,28 +1221,29 @@ coders/psd.c coders/cals.c coders/caption.c coders/cineon.c \ coders/cmyk.c coders/cut.c coders/dcm.c coders/dcraw.c \ coders/dib.c coders/dps.c coders/dpx.c coders/fax.c \ - coders/fits.c coders/fpx.c coders/clipboard.c coders/emf.c \ - coders/gif.c coders/gradient.c coders/gray.c coders/heif.c \ - coders/histogram.c coders/hrz.c coders/html.c coders/icon.c \ - coders/identity.c coders/info.c coders/jbig.c coders/jp2.c \ - coders/jnx.c coders/jpeg.c coders/jxl.c coders/label.c \ - coders/locale.c coders/logo.c coders/mac.c coders/map.c \ - coders/mat.c coders/matte.c coders/meta.c coders/miff.c \ - coders/mono.c coders/mpc.c coders/mpeg.c coders/mpr.c \ - coders/msl.c coders/mtv.c coders/mvg.c coders/null.c \ - coders/otb.c coders/palm.c coders/pcd.c coders/pcl.c \ - coders/pcx.c coders/pdb.c coders/pdf.c coders/pict.c \ - coders/pix.c coders/plasma.c coders/png.c coders/pnm.c \ - coders/preview.c coders/ps.c coders/ps2.c coders/ps3.c \ - coders/pwp.c coders/rgb.c coders/rla.c coders/rle.c \ - coders/sct.c coders/sfw.c coders/sgi.c coders/stegano.c \ - coders/sun.c coders/svg.c coders/tga.c coders/ept.c \ - coders/tiff.c coders/tile.c coders/tim.c coders/topol.c \ - coders/ttf.c coders/txt.c coders/uil.c coders/url.c \ - coders/uyvy.c coders/vicar.c coders/vid.c coders/viff.c \ - coders/wbmp.c coders/webp.c coders/wmf.c coders/wpg.c \ - coders/x.c coders/xwd.c coders/xbm.c coders/xc.c coders/xcf.c \ - coders/xpm.c coders/yuv.c filters/analyze.c + coders/fits.c coders/fpx.c coders/acppfile.cpp \ + coders/clipboard.c coders/emf.c coders/gif.c coders/gradient.c \ + coders/gray.c coders/heif.c coders/histogram.c coders/hrz.c \ + coders/html.c coders/icon.c coders/identity.c coders/info.c \ + coders/jbig.c coders/jp2.c coders/jnx.c coders/jpeg.c \ + coders/jxl.c coders/label.c coders/locale.c coders/logo.c \ + coders/mac.c coders/map.c coders/mat.c coders/matte.c \ + coders/meta.c coders/miff.c coders/mono.c coders/mpc.c \ + coders/mpeg.c coders/mpr.c coders/msl.c coders/mtv.c \ + coders/mvg.c coders/null.c coders/otb.c coders/palm.c \ + coders/pcd.c coders/pcl.c coders/pcx.c coders/pdb.c \ + coders/pdf.c coders/pict.c coders/pix.c coders/plasma.c \ + coders/png.c coders/pnm.c coders/preview.c coders/ps.c \ + coders/ps2.c coders/ps3.c coders/pwp.c coders/rgb.c \ + coders/rla.c coders/rle.c coders/sct.c coders/sfw.c \ + coders/sgi.c coders/stegano.c coders/sun.c coders/svg.c \ + coders/tga.c coders/ept.c coders/tiff.c coders/tile.c \ + coders/tim.c coders/topol.c coders/ttf.c coders/txt.c \ + coders/uil.c coders/url.c coders/uyvy.c coders/vicar.c \ + coders/vid.c coders/viff.c coders/wbmp.c coders/webp.c \ + coders/wmf.c coders/wpg.c coders/x.c coders/xwd.c coders/xbm.c \ + coders/xc.c coders/xcf.c coders/xpm.c coders/yuv.c \ + filters/analyze.c @HasX11_TRUE@am__objects_1 = magick/libGraphicsMagick_la-animate.lo \ @HasX11_TRUE@ magick/libGraphicsMagick_la-display.lo \ @HasX11_TRUE@ magick/libGraphicsMagick_la-PreRvIcccm.lo \ @@ -1324,7 +1330,8 @@ @HasDPS_TRUE@am__objects_5 = \ @HasDPS_TRUE@ coders/magick_libGraphicsMagick_la-dps.lo @HasFPX_TRUE@am__objects_6 = \ -@HasFPX_TRUE@ coders/magick_libGraphicsMagick_la-fpx.lo +@HasFPX_TRUE@ coders/magick_libGraphicsMagick_la-fpx.lo \ +@HasFPX_TRUE@ coders/magick_libGraphicsMagick_la-acppfile.lo @HasWINGDI32_TRUE@am__objects_7 = coders/magick_libGraphicsMagick_la-clipboard.lo \ @HasWINGDI32_TRUE@ coders/magick_libGraphicsMagick_la-emf.lo @HasHEIF_TRUE@am__objects_8 = \ @@ -1337,7 +1344,8 @@ @HasJPEG_TRUE@ coders/magick_libGraphicsMagick_la-jnx.lo \ @HasJPEG_TRUE@ coders/magick_libGraphicsMagick_la-jpeg.lo @HasJXL_TRUE@am__objects_12 = \ -@HasJXL_TRUE@ coders/magick_libGraphicsMagick_la-jxl.lo +@HasJXL_TRUE@ coders/magick_libGraphicsMagick_la-jxl.lo \ +@HasJXL_TRUE@ coders/magick_libGraphicsMagick_la-acppfile.lo @HasPNG_TRUE@am__objects_13 = \ @HasPNG_TRUE@ coders/magick_libGraphicsMagick_la-png.lo @HasTIFF_TRUE@am__objects_14 = \ @@ -1442,10 +1450,10 @@ @WITH_MODULES_TRUE@ $(am__objects_2) $(am__objects_3) magick_libGraphicsMagick_la_OBJECTS = \ $(am_magick_libGraphicsMagick_la_OBJECTS) -magick_libGraphicsMagick_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(magick_libGraphicsMagick_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +magick_libGraphicsMagick_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(magick_libGraphicsMagick_la_LDFLAGS) $(LDFLAGS) -o $@ wand_libGraphicsMagickWand_la_DEPENDENCIES = $(LIBMAGICK) \ $(am__DEPENDENCIES_1) am__objects_19 = wand/libGraphicsMagickWand_la-drawing_wand.lo \ @@ -1659,6 +1667,7 @@ coders/$(DEPDIR)/emf_la-emf.Plo coders/$(DEPDIR)/ept.Plo \ coders/$(DEPDIR)/fax_la-fax.Plo \ coders/$(DEPDIR)/fits_la-fits.Plo \ + coders/$(DEPDIR)/fpx_la-acppfile.Plo \ coders/$(DEPDIR)/fpx_la-fpx.Plo \ coders/$(DEPDIR)/gif_la-gif.Plo \ coders/$(DEPDIR)/gradient_la-gradient.Plo \ @@ -1674,11 +1683,13 @@ coders/$(DEPDIR)/jnx_la-jnx.Plo \ coders/$(DEPDIR)/jp2_la-jp2.Plo \ coders/$(DEPDIR)/jpeg_la-jpeg.Plo \ + coders/$(DEPDIR)/jxl_la-acppfile.Plo \ coders/$(DEPDIR)/jxl_la-jxl.Plo \ coders/$(DEPDIR)/label_la-label.Plo \ coders/$(DEPDIR)/locale_la-locale.Plo \ coders/$(DEPDIR)/logo_la-logo.Plo \ coders/$(DEPDIR)/mac_la-mac.Plo \ + coders/$(DEPDIR)/magick_libGraphicsMagick_la-acppfile.Plo \ coders/$(DEPDIR)/magick_libGraphicsMagick_la-art.Plo \ coders/$(DEPDIR)/magick_libGraphicsMagick_la-avs.Plo \ coders/$(DEPDIR)/magick_libGraphicsMagick_la-bmp.Plo \ @@ -2903,7 +2914,7 @@ @HasDPS_TRUE@MAGICK_DPS_MODULES = coders/dps.la @HasDPS_TRUE@MAGICK_DPS_SRCS = coders/dps.c @HasFPX_TRUE@MAGICK_FPX_MODULES = coders/fpx.la -@HasFPX_TRUE@MAGICK_FPX_SRCS = coders/fpx.c +@HasFPX_TRUE@MAGICK_FPX_SRCS = coders/fpx.c coders/acppfile.cpp @HasWINGDI32_TRUE@MAGICK_GDI32_MODULES = coders/clipboard.la coders/emf.la @HasWINGDI32_TRUE@MAGICK_GDI32_SRCS = coders/clipboard.c coders/emf.c @HasHEIF_TRUE@MAGICK_HEIF_MODULES = coders/heif.la @@ -2915,7 +2926,7 @@ @HasJP2_TRUE@MAGICK_JP2_MODULES = coders/jp2.la @HasJP2_TRUE@MAGICK_JP2_SRCS = coders/jp2.c @HasJXL_TRUE@MAGICK_JXL_MODULES = coders/jxl.la -@HasJXL_TRUE@MAGICK_JXL_SRCS = coders/jxl.c +@HasJXL_TRUE@MAGICK_JXL_SRCS = coders/jxl.c coders/acppfile.cpp @HasPNG_TRUE@MAGICK_PNG_MODULES = coders/png.la @HasPNG_TRUE@MAGICK_PNG_SRCS = coders/png.c @HasTIFF_TRUE@MAGICK_TIFF_MODULES = coders/ept.la coders/tiff.la @@ -3249,7 +3260,7 @@ coders_fits_la_LIBADD = $(LIBMAGICK) $(LIB_MATH) # FPX coder module -coders_fpx_la_SOURCES = coders/fpx.c +coders_fpx_la_SOURCES = coders/fpx.c coders/acppfile.cpp coders_fpx_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_fpx_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_fpx_la_LIBADD = $(LIBMAGICK) $(LIB_FPX) @@ -3339,7 +3350,7 @@ coders_jp2_la_LIBADD = $(LIBMAGICK) $(LIB_JP2) $(LIB_HEIF) $(LIB_JPEG) $(LIB_MATH) # JXL coder module -coders_jxl_la_SOURCES = coders/jxl.c +coders_jxl_la_SOURCES = coders/jxl.c coders/acppfile.cpp coders_jxl_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_jxl_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_jxl_la_LIBADD = $(LIBMAGICK) $(LIB_JXL) @@ -3769,8 +3780,8 @@ LIBMAGICK = magick/libGraphicsMagick.la @WITH_MODULES_FALSE@magick_libGraphicsMagick_la_SOURCES = $(MAGICK_BASE_SRCS) $(MAGICK_PLATFORM_SRCS) $(MAGICK_CODER_SRCS) $(MAGICK_FILTER_SRCS) @WITH_MODULES_TRUE@magick_libGraphicsMagick_la_SOURCES = $(MAGICK_BASE_SRCS) $(MAGICK_PLATFORM_SRCS) -@WITH_MODULES_FALSE@magick_libGraphicsMagick_la_LIBADD = $(MAGICK_DEP_LIBS) -@WITH_MODULES_TRUE@magick_libGraphicsMagick_la_LIBADD = $(MAGICK_DEP_LIBS) +@WITH_MODULES_FALSE@magick_libGraphicsMagick_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_EXTRA_DEP_LIBS) +@WITH_MODULES_TRUE@magick_libGraphicsMagick_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_EXTRA_DEP_LIBS) magick_libGraphicsMagick_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBRARY_EXTRA_CPPFLAGS) magick_libGraphicsMagick_la_LDFLAGS = \ -no-undefined -export-symbols-regex ".*" \ @@ -5404,9 +5415,11 @@ $(AM_V_CCLD)$(coders_fits_la_LINK) $(am_coders_fits_la_rpath) $(coders_fits_la_OBJECTS) $(coders_fits_la_LIBADD) $(LIBS) coders/fpx_la-fpx.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) +coders/fpx_la-acppfile.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) coders/fpx.la: $(coders_fpx_la_OBJECTS) $(coders_fpx_la_DEPENDENCIES) $(EXTRA_coders_fpx_la_DEPENDENCIES) coders/$(am__dirstamp) - $(AM_V_CCLD)$(coders_fpx_la_LINK) $(am_coders_fpx_la_rpath) $(coders_fpx_la_OBJECTS) $(coders_fpx_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(coders_fpx_la_LINK) $(am_coders_fpx_la_rpath) $(coders_fpx_la_OBJECTS) $(coders_fpx_la_LIBADD) $(LIBS) coders/gif_la-gif.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) @@ -5479,9 +5492,11 @@ $(AM_V_CCLD)$(coders_jpeg_la_LINK) $(am_coders_jpeg_la_rpath) $(coders_jpeg_la_OBJECTS) $(coders_jpeg_la_LIBADD) $(LIBS) coders/jxl_la-jxl.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) +coders/jxl_la-acppfile.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) coders/jxl.la: $(coders_jxl_la_OBJECTS) $(coders_jxl_la_DEPENDENCIES) $(EXTRA_coders_jxl_la_DEPENDENCIES) coders/$(am__dirstamp) - $(AM_V_CCLD)$(coders_jxl_la_LINK) $(am_coders_jxl_la_rpath) $(coders_jxl_la_OBJECTS) $(coders_jxl_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(coders_jxl_la_LINK) $(am_coders_jxl_la_rpath) $(coders_jxl_la_OBJECTS) $(coders_jxl_la_LIBADD) $(LIBS) coders/label_la-label.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) @@ -6037,6 +6052,8 @@ coders/$(DEPDIR)/$(am__dirstamp) coders/magick_libGraphicsMagick_la-fpx.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) +coders/magick_libGraphicsMagick_la-acppfile.lo: \ + coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/magick_libGraphicsMagick_la-clipboard.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/magick_libGraphicsMagick_la-emf.lo: coders/$(am__dirstamp) \ @@ -6211,7 +6228,7 @@ filters/$(am__dirstamp) filters/$(DEPDIR)/$(am__dirstamp) magick/libGraphicsMagick.la: $(magick_libGraphicsMagick_la_OBJECTS) $(magick_libGraphicsMagick_la_DEPENDENCIES) $(EXTRA_magick_libGraphicsMagick_la_DEPENDENCIES) magick/$(am__dirstamp) - $(AM_V_CCLD)$(magick_libGraphicsMagick_la_LINK) -rpath $(libdir) $(magick_libGraphicsMagick_la_OBJECTS) $(magick_libGraphicsMagick_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(magick_libGraphicsMagick_la_LINK) -rpath $(libdir) $(magick_libGraphicsMagick_la_OBJECTS) $(magick_libGraphicsMagick_la_LIBADD) $(LIBS) wand/$(am__dirstamp): @$(MKDIR_P) wand @: > wand/$(am__dirstamp) @@ -6559,6 +6576,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/ept.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/fax_la-fax.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/fits_la-fits.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/fpx_la-acppfile.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/fpx_la-fpx.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/gif_la-gif.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/gradient_la-gradient.Plo@am__quote@ # am--include-marker @@ -6574,11 +6592,13 @@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/jnx_la-jnx.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/jp2_la-jp2.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/jpeg_la-jpeg.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/jxl_la-acppfile.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/jxl_la-jxl.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/label_la-label.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/locale_la-locale.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/logo_la-logo.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/mac_la-mac.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libGraphicsMagick_la-acppfile.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libGraphicsMagick_la-art.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libGraphicsMagick_la-avs.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libGraphicsMagick_la-bmp.Plo@am__quote@ # am--include-marker @@ -9165,6 +9185,27 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Magick___lib_libGraphicsMagick___la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Magick++/lib/libGraphicsMagick___la-TypeMetric.lo `test -f 'Magick++/lib/TypeMetric.cpp' || echo '$(srcdir)/'`Magick++/lib/TypeMetric.cpp +coders/fpx_la-acppfile.lo: coders/acppfile.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_fpx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT coders/fpx_la-acppfile.lo -MD -MP -MF coders/$(DEPDIR)/fpx_la-acppfile.Tpo -c -o coders/fpx_la-acppfile.lo `test -f 'coders/acppfile.cpp' || echo '$(srcdir)/'`coders/acppfile.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/fpx_la-acppfile.Tpo coders/$(DEPDIR)/fpx_la-acppfile.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='coders/acppfile.cpp' object='coders/fpx_la-acppfile.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_fpx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o coders/fpx_la-acppfile.lo `test -f 'coders/acppfile.cpp' || echo '$(srcdir)/'`coders/acppfile.cpp + +coders/jxl_la-acppfile.lo: coders/acppfile.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_jxl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT coders/jxl_la-acppfile.lo -MD -MP -MF coders/$(DEPDIR)/jxl_la-acppfile.Tpo -c -o coders/jxl_la-acppfile.lo `test -f 'coders/acppfile.cpp' || echo '$(srcdir)/'`coders/acppfile.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/jxl_la-acppfile.Tpo coders/$(DEPDIR)/jxl_la-acppfile.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='coders/acppfile.cpp' object='coders/jxl_la-acppfile.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_jxl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o coders/jxl_la-acppfile.lo `test -f 'coders/acppfile.cpp' || echo '$(srcdir)/'`coders/acppfile.cpp + +coders/magick_libGraphicsMagick_la-acppfile.lo: coders/acppfile.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libGraphicsMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT coders/magick_libGraphicsMagick_la-acppfile.lo -MD -MP -MF coders/$(DEPDIR)/magick_libGraphicsMagick_la-acppfile.Tpo -c -o coders/magick_libGraphicsMagick_la-acppfile.lo `test -f 'coders/acppfile.cpp' || echo '$(srcdir)/'`coders/acppfile.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libGraphicsMagick_la-acppfile.Tpo coders/$(DEPDIR)/magick_libGraphicsMagick_la-acppfile.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='coders/acppfile.cpp' object='coders/magick_libGraphicsMagick_la-acppfile.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libGraphicsMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o coders/magick_libGraphicsMagick_la-acppfile.lo `test -f 'coders/acppfile.cpp' || echo '$(srcdir)/'`coders/acppfile.cpp + Magick++/demo/analyze-analyze.o: Magick++/demo/analyze.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Magick___demo_analyze_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Magick++/demo/analyze-analyze.o -MD -MP -MF Magick++/demo/$(DEPDIR)/analyze-analyze.Tpo -c -o Magick++/demo/analyze-analyze.o `test -f 'Magick++/demo/analyze.cpp' || echo '$(srcdir)/'`Magick++/demo/analyze.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Magick++/demo/$(DEPDIR)/analyze-analyze.Tpo Magick++/demo/$(DEPDIR)/analyze-analyze.Po @@ -10332,6 +10373,7 @@ -rm -f coders/$(DEPDIR)/ept.Plo -rm -f coders/$(DEPDIR)/fax_la-fax.Plo -rm -f coders/$(DEPDIR)/fits_la-fits.Plo + -rm -f coders/$(DEPDIR)/fpx_la-acppfile.Plo -rm -f coders/$(DEPDIR)/fpx_la-fpx.Plo -rm -f coders/$(DEPDIR)/gif_la-gif.Plo -rm -f coders/$(DEPDIR)/gradient_la-gradient.Plo @@ -10347,11 +10389,13 @@ -rm -f coders/$(DEPDIR)/jnx_la-jnx.Plo -rm -f coders/$(DEPDIR)/jp2_la-jp2.Plo -rm -f coders/$(DEPDIR)/jpeg_la-jpeg.Plo + -rm -f coders/$(DEPDIR)/jxl_la-acppfile.Plo -rm -f coders/$(DEPDIR)/jxl_la-jxl.Plo -rm -f coders/$(DEPDIR)/label_la-label.Plo -rm -f coders/$(DEPDIR)/locale_la-locale.Plo -rm -f coders/$(DEPDIR)/logo_la-logo.Plo -rm -f coders/$(DEPDIR)/mac_la-mac.Plo + -rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-acppfile.Plo -rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-art.Plo -rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-avs.Plo -rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-bmp.Plo @@ -10724,6 +10768,7 @@ -rm -f coders/$(DEPDIR)/ept.Plo -rm -f coders/$(DEPDIR)/fax_la-fax.Plo -rm -f coders/$(DEPDIR)/fits_la-fits.Plo + -rm -f coders/$(DEPDIR)/fpx_la-acppfile.Plo -rm -f coders/$(DEPDIR)/fpx_la-fpx.Plo -rm -f coders/$(DEPDIR)/gif_la-gif.Plo -rm -f coders/$(DEPDIR)/gradient_la-gradient.Plo @@ -10739,11 +10784,13 @@ -rm -f coders/$(DEPDIR)/jnx_la-jnx.Plo -rm -f coders/$(DEPDIR)/jp2_la-jp2.Plo -rm -f coders/$(DEPDIR)/jpeg_la-jpeg.Plo + -rm -f coders/$(DEPDIR)/jxl_la-acppfile.Plo -rm -f coders/$(DEPDIR)/jxl_la-jxl.Plo -rm -f coders/$(DEPDIR)/label_la-label.Plo -rm -f coders/$(DEPDIR)/locale_la-locale.Plo -rm -f coders/$(DEPDIR)/logo_la-logo.Plo -rm -f coders/$(DEPDIR)/mac_la-mac.Plo + -rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-acppfile.Plo -rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-art.Plo -rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-avs.Plo -rm -f coders/$(DEPDIR)/magick_libGraphicsMagick_la-bmp.Plo diff -r 45cce7492a0d -r 1c41908b4bc3 VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Fri Nov 17 18:59:21 2023 -0600 +++ b/VisualMagick/installer/inc/version.isx Tue Nov 21 17:30:04 2023 -0600 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020231117" -#define public MagickPackageReleaseDate "snapshot-20231117" +#define public MagickPackageVersionAddendum ".020231121" +#define public MagickPackageReleaseDate "snapshot-20231121" diff -r 45cce7492a0d -r 1c41908b4bc3 coders/Makefile.am --- a/coders/Makefile.am Fri Nov 17 18:59:21 2023 -0600 +++ b/coders/Makefile.am Tue Nov 21 17:30:04 2023 -0600 @@ -18,7 +18,7 @@ if HasFPX MAGICK_FPX_MODULES = coders/fpx.la -MAGICK_FPX_SRCS = coders/fpx.c +MAGICK_FPX_SRCS = coders/fpx.c coders/acppfile.cpp endif if HasWINGDI32 @@ -48,7 +48,7 @@ if HasJXL MAGICK_JXL_MODULES = coders/jxl.la -MAGICK_JXL_SRCS = coders/jxl.c +MAGICK_JXL_SRCS = coders/jxl.c coders/acppfile.cpp endif if HasPNG @@ -401,7 +401,7 @@ coders_fits_la_LIBADD = $(LIBMAGICK) $(LIB_MATH) # FPX coder module -coders_fpx_la_SOURCES = coders/fpx.c +coders_fpx_la_SOURCES = coders/fpx.c coders/acppfile.cpp coders_fpx_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_fpx_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_fpx_la_LIBADD = $(LIBMAGICK) $(LIB_FPX) @@ -491,7 +491,7 @@ coders_jp2_la_LIBADD = $(LIBMAGICK) $(LIB_JP2) $(LIB_HEIF) $(LIB_JPEG) $(LIB_MATH) # JXL coder module -coders_jxl_la_SOURCES = coders/jxl.c +coders_jxl_la_SOURCES = coders/jxl.c coders/acppfile.cpp coders_jxl_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_jxl_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_jxl_la_LIBADD = $(LIBMAGICK) $(LIB_JXL) diff -r 45cce7492a0d -r 1c41908b4bc3 coders/acppfile.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/coders/acppfile.cpp Tue Nov 21 17:30:04 2023 -0600 @@ -0,0 +1,10 @@ +/* +% Copyright (C) 2023 GraphicsMagick Group +% +% This program is covered by multiple licenses, which are described in +% Copyright.txt. You should have received a copy of Copyright.txt with this +% package; otherwise see http://www.graphicsmagick.org/www/Copyright.html. +% +*/ + +// This file is an example of how simple C++ can be! diff -r 45cce7492a0d -r 1c41908b4bc3 config/config.guess --- a/config/config.guess Fri Nov 17 18:59:21 2023 -0600 +++ b/config/config.guess Tue Nov 21 17:30:04 2023 -0600 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-09-17' +timestamp='2023-08-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ usage="\ Usage: $0 [OPTION] -Output the configuration name of the system \`$me' is run on. +Output the configuration name of the system '$me' is run on. Options: -h, --help print this help, then exit @@ -60,13 +60,13 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -102,8 +102,8 @@ # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. # Portable tmp directory creation inspired by the Autoconf team. @@ -155,6 +155,9 @@ set_cc_for_build cat <<-EOF > "$dummy.c" + #if defined(__ANDROID__) + LIBC=android + #else #include <features.h> #if defined(__UCLIBC__) LIBC=uclibc @@ -169,6 +172,7 @@ LIBC=musl #endif