GraphicsMagick: Stop producing BZip, Gzip, Lzip, and Zstandard c...
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.7435.1677447169.7814.graphicsmagick-commit@lists.sourceforge.net> |
changeset 00fdd9d162ec in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=00fdd9d162ec summary: Stop producing BZip, Gzip, Lzip, and Zstandard compressed archives so the only tar option is XZ compressed. diffstat: ChangeLog | 6 +++--- Makefile.am | 19 ++++++++++--------- Makefile.in | 28 ++++++++++++++++++---------- www/Changelog.html | 5 +++-- 4 files changed, 34 insertions(+), 24 deletions(-) diffs (146 lines): diff -r ca9c374fc191 -r 00fdd9d162ec ChangeLog --- a/ChangeLog Sun Feb 26 13:43:22 2023 -0600 +++ b/ChangeLog Sun Feb 26 15:32:34 2023 -0600 @@ -1,11 +1,11 @@ 2023-02-26 Bob Friesenhahn <[email protected]> - * Makefile.am: Stop producing Zstandard compressed archives. + * Makefile.am: Stop producing BZip, Gzip, Lzip, and Zstandard + compressed archives so the only tar option is XZ compressed. See + if anyone complains. * www/download.rst: Add summary documentation regarding archive formats. - * Makefile.am: Stop producing BZip compressed archives. - 2023-02-12 Bob Friesenhahn <[email protected]> * coders/jpeg.c (ReadJPEGImage): Replace diff -r ca9c374fc191 -r 00fdd9d162ec Makefile.am --- a/Makefile.am Sun Feb 26 13:43:22 2023 -0600 +++ b/Makefile.am Sun Feb 26 15:32:34 2023 -0600 @@ -12,10 +12,11 @@ # Don't require all the GNU mandated files # Use XZ_OPT (a environment variable) to tune xz compression levels (e.g. XZ_OPT=-8e) -# nostdinc +# dist-bzip2 - Hook dist-bzip2 to dist. # no-dist-gzip - Do not hook dist-gzip to dist. -# dist-bzip2 - Hook dist-bzip2 to dist. -AUTOMAKE_OPTIONS = 1.12 subdir-objects no-define nostdinc color-tests parallel-tests dist-xz foreign dist-lzip +# dist-lzip - Hook dist-lzip to dist. +# dist-zstd - Hook dist-zstd to dist. +AUTOMAKE_OPTIONS = 1.12 subdir-objects no-define nostdinc color-tests parallel-tests dist-xz foreign no-dist-gzip topincludedir = @includedir@/GraphicsMagick @@ -382,13 +383,13 @@ endif # HAS_RPM # Add zstd compression to output files -DIST_TARGETS = dist-lzip dist-xz dist-gzip -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.lz $(distdir).tar.xz +#DIST_TARGETS = dist-lzip dist-xz dist-bzip2 dist-gzip dist-zstd +#DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.lz $(distdir).tar.xz $(distdir).tar.zst -# Rules to build a .tar.zst tarball -dist-zstd: distdir - tardir=$(distdir) && $(am__tar) | ZSTD_CLEVEL=$${ZSTD_CLEVEL-22} zstd --ultra -c >$(distdir).tar.zst - $(am__post_remove_distdir) +# Rules to build a .tar.zst tarball (zstd compression) +#dist-zstd: distdir +# tardir=$(distdir) && $(am__tar) | ZSTD_CLEVEL=$${ZSTD_CLEVEL-22} zstd --ultra -c >$(distdir).tar.zst +# $(am__post_remove_distdir) # # Build a validated snapshot release and move to the snapshots directory. diff -r ca9c374fc191 -r 00fdd9d162ec Makefile.in --- a/Makefile.in Sun Feb 26 13:43:22 2023 -0600 +++ b/Makefile.in Sun Feb 26 15:32:34 2023 -0600 @@ -2404,6 +2404,8 @@ else :; fi am__post_remove_distdir = $(am__remove_distdir) GZIP_ENV = --best +DIST_ARCHIVES = $(distdir).tar.xz +DIST_TARGETS = dist-xz # Exists only to be overridden by the user if desired. AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print @@ -2731,10 +2733,11 @@ # Don't require all the GNU mandated files # Use XZ_OPT (a environment variable) to tune xz compression levels (e.g. XZ_OPT=-8e) -# nostdinc +# dist-bzip2 - Hook dist-bzip2 to dist. # no-dist-gzip - Do not hook dist-gzip to dist. -# dist-bzip2 - Hook dist-bzip2 to dist. -AUTOMAKE_OPTIONS = 1.12 subdir-objects no-define nostdinc color-tests parallel-tests dist-xz foreign dist-lzip +# dist-lzip - Hook dist-lzip to dist. +# dist-zstd - Hook dist-zstd to dist. +AUTOMAKE_OPTIONS = 1.12 subdir-objects no-define nostdinc color-tests parallel-tests dist-xz foreign no-dist-gzip topincludedir = @includedir@/GraphicsMagick # CPPFLAGS required by all C/C++ code @@ -4922,8 +4925,13 @@ # Add zstd compression to output files -DIST_TARGETS = dist-lzip dist-xz dist-gzip -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.lz $(distdir).tar.xz +#DIST_TARGETS = dist-lzip dist-xz dist-bzip2 dist-gzip dist-zstd +#DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.lz $(distdir).tar.xz $(distdir).tar.zst + +# Rules to build a .tar.zst tarball (zstd compression) +#dist-zstd: distdir +# tardir=$(distdir) && $(am__tar) | ZSTD_CLEVEL=$${ZSTD_CLEVEL-22} zstd --ultra -c >$(distdir).tar.zst +# $(am__post_remove_distdir) # # Build a validated snapshot release and move to the snapshots directory. @@ -10059,6 +10067,7 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__post_remove_distdir) + dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__post_remove_distdir) @@ -10066,6 +10075,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -11458,11 +11471,6 @@ @HAS_RPM_TRUE@ @echo ============================================================== @HAS_RPM_TRUE@ @echo $(DIST_ARCHIVE_RPM) is ready for distribution. @HAS_RPM_TRUE@ @echo ============================================================== - -# Rules to build a .tar.zst tarball -dist-zstd: distdir - tardir=$(distdir) && $(am__tar) | ZSTD_CLEVEL=$${ZSTD_CLEVEL-22} zstd --ultra -c >$(distdir).tar.zst - $(am__post_remove_distdir) # FIXME: Can use gpg --enarmor to produce asc files from sig files @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@snapshot: distcheck @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(MAKE) $(DIST_ARCHIVE_SRPM) diff -r ca9c374fc191 -r 00fdd9d162ec www/Changelog.html --- a/www/Changelog.html Sun Feb 26 13:43:22 2023 -0600 +++ b/www/Changelog.html Sun Feb 26 15:32:34 2023 -0600 @@ -40,9 +40,10 @@ <p>2023-02-26 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>Makefile.am: Stop producing Zstandard compressed archives.</p></li> +<li><p>Makefile.am: Stop producing BZip, Gzip, Lzip, and Zstandard +compressed archives so the only tar option is XZ compressed. See +if anyone complains.</p></li> <li><p>www/download.rst: Add summary documentation regarding archive formats.</p></li> -<li><p>Makefile.am: Stop producing BZip compressed archives.</p></li> </ul> </blockquote> <p>2023-02-12 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>