image_optim_pack 0.8.0.20220418-x86-linux → 0.9.0-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e0aa7a816a27ad7c3204962f607f1c45fd71b0bfda4aa2d4d9a64e0dbc0a878
-  data.tar.gz: 588e59f6fdc3ccb93104d1b06f4ade76ec2f7b123c09b8edeebec0506fa637cd
+  metadata.gz: ae47980cba5b914b563d4dce511017f142c077700407b092dd7438b3207381d4
+  data.tar.gz: 5bb1afcf954bb61671e801040003cfd9cf93ad2b530cd3933c8cd0654fc845d9
 SHA512:
-  metadata.gz: a2c1507032407d5db7ff43ded333ec26e6fa21780258deeaeedcb2e06fcc7403f92c26f44add28a19f70619e62a2f0810ec98767cb8e44763722bc6e97681e5a
-  data.tar.gz: fa3935b6a7fda799684ad9309900f2f0982cc1b2066c78fc2a79115fdb66fae9aec0eb1b76459e3b676d938a79dedc60ec9dc3906579da6343cecb1493589695
+  metadata.gz: 628b55b81607067ef8303515fe13e845315ba4ec62e4bf6e3af545ac3a96e5bab4427e885b29537b3e5247a9fbb444ab1fdcf035f44c987fff86aac253f49e26
+  data.tar.gz: b82e53d5e7250a578c333ef3c7d3a6bd16c7b49a570fa28ef8fec75e55519f988f46cee2f5791eacd15777ba6a3fa1b33dbc1356f413d5d6ee61cbaabed0bf04

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v0.9.0 (2022-06-11)
+
+* Add [pngout](http://advsys.net/ken/utils.htm) (since January 2021 license allows redistrubition for freely distributed non-commercial projects) [#24](https://github.com/toy/image_optim_pack/issues/24) [@toy](https://github.com/toy)
+
 ## v0.8.0.20220418 (2022-04-18)
 
 * advancecomp 2.3 and jpegoptim 1.4.7 [@toy](https://github.com/toy)

data/Dockerfile

@@ -125,6 +125,14 @@ RUN ./extract pngcrush && \
     make && \
     install -c pngcrush /usr/local/bin
 
+FROM build as pngout
+ARG PNGOUT_LINUX_STATIC_VER
+ARG PNGOUT_LINUX_STATIC_SHA256
+COPY download/pngout_linux_static-$PNGOUT_LINUX_STATIC_VER.tar.gz download/
+RUN ./extract pngout_linux_static && \
+    cd build/pngout_linux_static && \
+    cp amd64/pngout-static /usr/local/bin/pngout
+
 FROM liblcms as pngquant
 ARG PNGQUANT_VER
 ARG PNGQUANT_SHA256
@@ -145,6 +153,9 @@ RUN ./extract pngquant && \
 FROM base as image_optim
 RUN apk add --no-cache libstdc++ ruby npm perl dumb-init
 
+COPY README.markdown /
+COPY acknowledgements /acknowledgements
+
 COPY --from=advancecomp /usr/local/bin/advpng          /usr/local/bin/
 COPY --from=gifsicle    /usr/local/bin/gifsicle        /usr/local/bin/
 COPY --from=jhead       /usr/local/bin/jhead           /usr/local/bin/
@@ -154,6 +165,7 @@ COPY --from=libjpeg     /usr/local/bin/jpegtran        /usr/local/bin/
 COPY --from=optipng     /usr/local/bin/optipng         /usr/local/bin/
 COPY --from=oxipng      /usr/local/bin/oxipng          /usr/local/bin/
 COPY --from=pngcrush    /usr/local/bin/pngcrush        /usr/local/bin/
+COPY --from=pngout      /usr/local/bin/pngout          /usr/local/bin/
 COPY --from=pngquant    /usr/local/bin/pngquant        /usr/local/bin/
 
 COPY --from=libjpeg     /usr/local/lib/libjpeg.so.9    /usr/local/lib/
@@ -163,5 +175,5 @@ COPY --from=liblcms     /usr/local/lib/liblcms2.so.2   /usr/local/lib/
 
 RUN npm -g install svgo
 RUN gem install --no-document image_optim
-ENTRYPOINT ["dumb-init", "image_optim", "--skip-missing-workers"]
+ENTRYPOINT ["dumb-init", "image_optim"]
 CMD ["--help"]

data/Makefile

@@ -15,6 +15,10 @@ LIBZ_VER := 1.2.11
 OPTIPNG_VER := 0.7.7
 OXIPNG_VER := 5.0.1
 PNGCRUSH_VER := 1.8.13
+PNGOUT_VER := 20200115
+PNGOUT_LINUX_VER := $(PNGOUT_VER)
+PNGOUT_LINUX_STATIC_VER := $(PNGOUT_VER)
+PNGOUT_DARWIN_VER := $(PNGOUT_VER)
 PNGQUANT_VER := 2.17.0
 
 # ====== CHECKSUMS ======
@@ -57,12 +61,13 @@ sha256sum := $(shell if command -v sha256sum >/dev/null 2>&1; then echo sha256su
 ARCHIVES :=
 
 # $1 - name of archive
+# $2 - extension to use (instead of default tar.gz)
 define archive
 ARCHIVES += $1
 $1_DIR := $(BUILD_DIR)/$(call downcase,$1)
-$1_TGZ := $(DL_DIR)/$(call downcase,$1)-$($1_VER).tar.gz
-$1_EXTRACTED := $$($1_DIR)/__$$(notdir $$($1_TGZ))__
-$$($1_EXTRACTED) : $$($1_TGZ)
+$1_ARC := $(DL_DIR)/$(call downcase,$1)-$($1_VER).$(or $2,tar.gz)
+$1_EXTRACTED := $$($1_DIR)/__$$(notdir $$($1_ARC))__
+$$($1_EXTRACTED) : $$($1_ARC)
 	mkdir -p $(BUILD_DIR)
 	rm -rf $$(@D)
 	echo "$$($1_SHA256)  $$<" | $(sha256sum) -c
@@ -73,10 +78,11 @@ endef
 
 # $1 - name of archive
 # $2 - url of archive with [VER] for replace with version
+# $3 - extension to use
 define archive-dl
-$(call archive,$1)
+$(call archive,$1,$3)
 # download archive from url
-$$($1_TGZ) :
+$$($1_ARC) :
 	mkdir -p $(DL_DIR)
 	test -w $(DL_DIR)
 	while ! mkdir $$@.lock 2> /dev/null; do sleep 1; done
@@ -98,25 +104,28 @@ $(eval $(call archive-dl,LIBZ,        https://prdownloads.sourceforge.net/libpng
 $(eval $(call archive-dl,OPTIPNG,     https://prdownloads.sourceforge.net/optipng/optipng-[VER].tar.gz?download))
 $(eval $(call archive-dl,OXIPNG,      https://github.com/shssoichiro/oxipng/archive/refs/tags/v[VER].tar.gz))
 $(eval $(call archive-dl,PNGCRUSH,    https://prdownloads.sourceforge.net/pmt/pngcrush-[VER]-nolib.tar.gz?download))
+$(eval $(call archive-dl,PNGOUT_LINUX,http://www.jonof.id.au/files/kenutils/pngout-[VER]-linux.tar.gz))
+$(eval $(call archive-dl,PNGOUT_LINUX_STATIC,http://www.jonof.id.au/files/kenutils/pngout-[VER]-linux-static.tar.gz))
+$(eval $(call archive-dl,PNGOUT_DARWIN,http://www.jonof.id.au/files/kenutils/pngout-[VER]-macos.zip,zip))
 $(eval $(call archive-dl,PNGQUANT,    https://pngquant.org/pngquant-[VER]-src.tar.gz))
 
-download : $(foreach archive,$(ARCHIVES),$($(archive)_TGZ))
+download : $(foreach archive,$(ARCHIVES),$($(archive)_ARC))
 .PHONY : download
 
 download-tidy-up :
-	rm -f $(filter-out $(foreach archive,$(ARCHIVES),$($(archive)_TGZ)),$(wildcard $(DL_DIR)/*.*))
+	rm -f $(filter-out $(foreach archive,$(ARCHIVES),$($(archive)_ARC)),$(wildcard $(DL_DIR)/*.*))
 .PHONY : download-tidy-up
 
 checksum : download
-	@$(sha256sum) $(foreach archive,$(ARCHIVES),$($(archive)_TGZ))
+	@$(sha256sum) $(foreach archive,$(ARCHIVES),$($(archive)_ARC))
 .PHONY : checksum
 
 checksum-verify : download
-	@printf '%s  %s\n' $(foreach archive,$(ARCHIVES),$($(archive)_SHA256) $($(archive)_TGZ)) | $(sha256sum) -c
+	@printf '%s  %s\n' $(foreach archive,$(ARCHIVES),$($(archive)_SHA256) $($(archive)_ARC)) | $(sha256sum) -c
 .PHONY : checksum-verify
 
 checksum-update : download
-	@printf '%s := %s\n' $(foreach archive,$(ARCHIVES),$(archive)_SHA256 $(shell $(sha256sum) $($(archive)_TGZ) | cut -d ' ' -f 1)) > checksums.mk
+	@printf '%s := %s\n' $(foreach archive,$(ARCHIVES),$(archive)_SHA256 $(shell $(sha256sum) $($(archive)_ARC) | cut -d ' ' -f 1)) > checksums.mk
 .PHONY : checksum-update
 
 # ====== PRODUCTS ======
@@ -130,7 +139,7 @@ define target-build
 $1_PATH := $(or $3,$(call downcase,$1))
 $1_BASENAME := $$(notdir $$($1_PATH))
 $1_DIR := $($(or $2,$1)_DIR)
-$1_TGZ := $($(or $2,$1)_TGZ)
+$1_ARC := $($(or $2,$1)_ARC)
 $1_EXTRACTED := $($(or $2,$1)_EXTRACTED)
 $1_TARGET := $$($1_DIR)/$$($1_PATH)
 $$($1_TARGET) : DIR := $$($1_DIR)
@@ -140,6 +149,7 @@ endef
 # $1 - product name
 # $2 - archive name ($1 if empty)
 # $3 - basename ($1 if empty)
+# $4 - don't strip the target
 define target
 $(call target-build,$1,$2,$3)
 PRODUCTS += $1
@@ -148,7 +158,7 @@ $1_DESTINATION := $$(OUTPUT_DIR)/$$($1_BASENAME)
 $$($1_DESTINATION) : $$($1_TARGET)
 	mkdir -p $(OUTPUT_DIR)
 	temppath=`mktemp "$(BUILD_DIR)"/tmp.XXXXXXXXXX` && \
-		strip $$< -Sx -o "$$$$temppath" && \
+		$(if $4,cp $$< "$$$$temppath",strip $$< -Sx -o "$$$$temppath") && \
 		chmod 755 "$$$$temppath" && \
 		mv "$$$$temppath" $$@
 # short name target
@@ -169,6 +179,11 @@ $(eval $(call target,LIBZ,,libz$(DLEXT)))
 $(eval $(call target,OPTIPNG,,src/optipng/optipng))
 $(eval $(call target,OXIPNG,,target/release/oxipng))
 $(eval $(call target,PNGCRUSH))
+ifdef IS_DARWIN
+$(eval $(call target,PNGOUT,PNGOUT_DARWIN,,NOSTRIP))
+else
+$(eval $(call target,PNGOUT,PNGOUT_LINUX,,NOSTRIP))
+endif
 $(eval $(call target,PNGQUANT))
 
 # ====== TARGETS ======
@@ -195,7 +210,7 @@ define check_exists
 endef
 
 define check_version
-	@$(OUTPUT_DIR)/$1 $2 | fgrep -q $3 || \
+	@$(OUTPUT_DIR)/$1 $2 | fgrep -q "$3" || \
 		{ printf "$1: $(ANSI_RED)Expected $3, got $$($(OUTPUT_DIR)/$1 $2)$(ANSI_RESET)\n"; exit 1; }
 endef
 
@@ -249,6 +264,7 @@ test :
 	$(call check_bin,optipng,--version,$(OPTIPNG_VER))
 	$(call check_bin,oxipng,--version,$(OXIPNG_VER))
 	$(call check_bin,pngcrush,-version 2>&1,$(PNGCRUSH_VER))
+	$(call check_bin,pngout,2>&1,$(shell perl -mTime::Piece -e 'print Time::Piece->strptime("$(PNGOUT_VER)", "%Y%m%d")->strftime("%b %e %Y")'))
 	$(call check_bin,pngquant,--help,$(PNGQUANT_VER))
 .PHONY : test
 
@@ -271,15 +287,19 @@ docker-build : download
 		$(foreach archive,$(ARCHIVES),--build-arg $(archive)_VER=$($(archive)_VER) --build-arg $(archive)_SHA256=$($(archive)_SHA256)) \
 		-t $(DOCKER_IMAGE):latest \
 		.
-.PHONY : docker-build
-
-docker-tag : docker-build
 	@docker tag \
 		$(DOCKER_IMAGE):latest \
 		$(DOCKER_IMAGE):$(DOCKER_TAG)
-.PHONY : docker-tag
+.PHONY : docker-build
 
-docker-push : docker-tag
+docker-test : docker-build
+	@docker run \
+		--rm \
+		$(DOCKER_IMAGE):latest \
+		--info
+.PHONY : docker-test
+
+docker-push : docker-test
 	@docker push $(DOCKER_IMAGE):latest
 	@docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
 .PHONY : docker-push
@@ -487,6 +507,13 @@ $(PNGCRUSH_TARGET) :
 		LDFLAGS="$(XORIGIN) $(LDFLAGS)"
 	$(call chrpath_origin,$@)
 
+## pngout
+$(PNGOUT_TARGET) :
+ifdef IS_LINUX
+	cd $(DIR) && ln -sf $(ARCH:x86_64=amd64)/pngout .
+endif
+	cd $(DIR) && touch pngout
+
 ## pngquant
 $(eval $(call depend,PNGQUANT,LIBLCMS LIBPNG LIBZ))
 $(PNGQUANT_TARGET) :

data/README.markdown

@@ -38,6 +38,9 @@ A test application with latest `image_optim` and `image_optim_pack` is available
 * [oxipng](https://github.com/shssoichiro/oxipng) by Joshua Holmer ([license](acknowledgements/oxipng.txt))
 * [pngcrush](https://pmt.sourceforge.io/pngcrush/) by Glenn Randers-Pehrson, portions by Greg Roelofs ([license](acknowledgements/pngcrush.txt))
 	* contains [cexcept](http://www.nicemice.net/cexcept/) interface by Adam M. Costello and Cosmin Truta ([license](acknowledgements/cexcept.txt))
+* [pngout](http://advsys.net/ken/utils.htm) by Ken Silverman ([license](acknowledgements/pngout.txt))
+	* Linux and BSD ports by Jonathon Fowler (http://www.jonof.id.au/pngout)
+	* Mac OS X port by Ken Silverman, with assistance by Jonathon Fowler
 * [pngquant](https://pngquant.org/) by Kornel Lesiński based on code by Greg Roelofs and Jef Poskanzer after an idea by Stefan Schneider ([license](acknowledgements/pngquant.txt))
 * [zlib](https://zlib.net/) by Jean-Loup Gailly and Mark Adler ([license](acknowledgements/zlib.txt))
 

data/acknowledgements/pngout.txt

@@ -0,0 +1,9 @@
+PNGOUT / KZIP license:
+
+I have gotten a lot of requests about bundling the command line executables, or releasing the source code to KZIP and PNGOUT. This is my license (updated 01/16/2021):
+
+* The command line versions of PNGOUT.EXE and KZIP.EXE are free for use, as are the Mac and Linux ports.
+* You may use PNGOUT- or KZIP-compressed content for non-commercial or commercial purposes.
+* Redistributing, repackaging, or reusing the PNGOUT or KZIP executable is permitted for non-commercial projects that are distributed freely.
+* For commercial requests (such as bundling with a commercial product), please write to my business partner, David Blake.
+* When bundling, my credit (both my name and website) must be clearly displayed in some reasonable fashion that can be seen by an average user.

data/checksums.mk

@@ -11,4 +11,7 @@ LIBZ_SHA256 := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 OPTIPNG_SHA256 := 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
 OXIPNG_SHA256 := aff72d2f627617f3f36d9796e65b83eb34f24d2c94f3a55612ade2df8ab8d946
 PNGCRUSH_SHA256 := fed0aaf5c098aa8c7f78c75365cd18d7341417326ecbdba547876b7b4f3df4be
+PNGOUT_LINUX_SHA256 := ac38bba6f0de29033de866538c3afa64341319b695bbe388efbc5fd9e830e928
+PNGOUT_LINUX_STATIC_SHA256 := 7a78ea475d65a00981bf418e5dfa3b34e42d6460fb992340802873bb14b08597
+PNGOUT_DARWIN_SHA256 := 3272fa947eeafc1ac0086e1f14935f9efa21d090a555e6892255fe5c88f6686e
 PNGQUANT_SHA256 := a27cf0e64db499ccb3ddae9b36036e881f78293e46ec27a9e7a86a3802fcda66

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.8.0.20220418'
+  s.version     = '0.9.0'
   s.summary     = %q{Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegtran, optipng, pngcrush, pngquant}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/script/livecheck

@@ -208,6 +208,9 @@ oxipng:
 pngcrush:
   url: https://sourceforge.net/projects/pmt/rss?path=/pngcrush
   regexp: /pngcrush/(\d+(?:\.\d+)*)/
+pngout:
+  url: http://www.jonof.id.au/kenutils.html
+  regexp: /files/kenutils/pngout-(\d{8})-linux.tar.gz
 pngquant:
   url: https://pngquant.org/releases.html
   regexp: <span itemprop='version'>(\d+(?:\.\d+)*)</span>

data/script/platform_downloads

@@ -36,9 +36,9 @@ version_time = begin
   end.sort
   time_pairs << [nil, Time.now]
 
-  time_pairs.each_cons(2).map do |(version_n, created_at), (_, next_created_at)|
+  time_pairs.each_cons(2).to_h do |(version_n, created_at), (_, next_created_at)|
     [version_n, next_created_at - created_at]
-  end.to_h
+  end
 end
 
 table = Terminal::Table.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.8.0.20220418
+  version: 0.9.0
 platform: x86-linux
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -131,6 +131,7 @@ files:
 - acknowledgements/optipng.txt
 - acknowledgements/oxipng.txt
 - acknowledgements/pngcrush.txt
+- acknowledgements/pngout.txt
 - acknowledgements/pngquant.txt
 - acknowledgements/smallfry.txt
 - acknowledgements/zlib.txt
@@ -170,6 +171,7 @@ files:
 - vendor/linux-i686/optipng
 - vendor/linux-i686/oxipng
 - vendor/linux-i686/pngcrush
+- vendor/linux-i686/pngout
 - vendor/linux-i686/pngquant
 homepage: https://github.com/toy/image_optim_pack
 licenses:
@@ -177,7 +179,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_optim_pack/issues
   changelog_uri: https://github.com/toy/image_optim_pack/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.8.0.20220418
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.9.0
   source_code_uri: https://github.com/toy/image_optim_pack
 post_install_message:
 rdoc_options: []