image_optim_pack 0.12.1.20250921 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34df4928cfd4b7bc021ffba6f79174ef041fa60e2cd58bf6ca82c9c4de5aba66
-  data.tar.gz: 5db6010aaea09aae98d782339dde2494ea66ca4debc9c39e31083943515f80c6
+  metadata.gz: a93e8bdc2e268667748f37d395e447d0f06767746257e552b407763ea273a53f
+  data.tar.gz: d0bad7960a0e00acb00559880b077eaf641238b3bf9a6f5425f024f0ea71da78
 SHA512:
-  metadata.gz: 2a8d985d1b1807be63661e56d31828d82535e06e337fbf51b35d5f3952059c58dcb63591e889e72bb80c7d54055b5ffb20b981634402b7fc40b9a2086bc39ee8
-  data.tar.gz: ceec4746148581338fd0a6ee9601de568bbc399ec78e66552d5f17a770d6a8b922287692b6b975e7f597f82a0315b0210adc0b233847de41dbd7e73428945868
+  metadata.gz: 89afe382210b8ce53ab8cf96e2e405758764b045725c9d8a4c74fac924e3f9f21d8402dc5385b6a31653a94eed56b04329441c8195ae9692877f1af427ad2604
+  data.tar.gz: e7039cc7ed57f02632e31e4fe54bc0a3d58da3adcc0d29495e168deae9160dc88f7787e1156e1fb008e9cbcbbd241991bbcd26f9efa3dab8ed16dbf7444d300d

data/.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
         name: on-linux
         path: vendor/
   build-on-darwin-x86_64:
-    runs-on: macos-13
+    runs-on: macos-15-intel
     steps:
     - uses: actions/checkout@v5
     - run: uname -m

data/.github/workflows/check.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         os:
         - ubuntu-latest
-        - macos-13
+        - macos-15-intel
         - macos-14
         ruby:
         - '2.7'

data/CHANGELOG.markdown

@@ -2,6 +2,11 @@
 
 ## unreleased
 
+## v0.12.2 (2025-10-05)
+
+* Rebuild pngquant ensuring proper linking of libraries [@toy](https://github.com/toy)
+* libz 1.3.1 [@toy](https://github.com/toy)
+
 ## v0.12.1.20250921 (2025-09-21)
 
 * jpegoptim 1.5.6 [@toy](https://github.com/toy)

data/Dockerfile

@@ -29,12 +29,12 @@ RUN ./extract libpng && \
     ./configure --with-zlib-prefix=/usr/local && \
     make install
 
-FROM libpng as liblcms
-ARG LIBLCMS_VER
-ARG LIBLCMS_SHA256
-COPY download/liblcms-$LIBLCMS_VER.tar.gz download/
-RUN ./extract liblcms && \
-    cd build/liblcms && \
+FROM libpng as liblcms2
+ARG LIBLCMS2_VER
+ARG LIBLCMS2_SHA256
+COPY download/liblcms2-$LIBLCMS2_VER.tar.gz download/
+RUN ./extract liblcms2 && \
+    cd build/liblcms2 && \
     ./configure && \
     make install
 
@@ -137,7 +137,7 @@ RUN ./extract pngout_linux_static && \
     cd build/pngout_linux_static && \
     cp amd64/pngout-static /usr/local/bin/pngout
 
-FROM liblcms as pngquant
+FROM liblcms2 as pngquant
 ARG PNGQUANT_VER
 ARG PNGQUANT_SHA256
 COPY download/pngquant-$PNGQUANT_VER.tar.gz download/
@@ -176,7 +176,7 @@ COPY --from=pngquant    /usr/local/bin/pngquant        /usr/local/bin/
 COPY --from=libjpeg     /usr/local/lib/libjpeg.so.9    /usr/local/lib/
 COPY --from=libpng      /usr/local/lib/libpng16.so.16  /usr/local/lib/
 COPY --from=libz        /usr/local/lib/libz.so.1       /usr/local/lib/
-COPY --from=liblcms     /usr/local/lib/liblcms2.so.2   /usr/local/lib/
+COPY --from=liblcms2    /usr/local/lib/liblcms2.so.2   /usr/local/lib/
 
 RUN npm -g install svgo
 RUN gem install --no-document image_optim

data/Dockerfile.debian

@@ -29,12 +29,12 @@ RUN ./extract libpng && \
     ./configure --with-zlib-prefix=/usr/local && \
     make install
 
-FROM libpng as liblcms
-ARG LIBLCMS_VER
-ARG LIBLCMS_SHA256
-COPY download/liblcms-$LIBLCMS_VER.tar.gz download/
-RUN ./extract liblcms && \
-    cd build/liblcms && \
+FROM libpng as liblcms2
+ARG LIBLCMS2_VER
+ARG LIBLCMS2_SHA256
+COPY download/liblcms2-$LIBLCMS2_VER.tar.gz download/
+RUN ./extract liblcms2 && \
+    cd build/liblcms2 && \
     ./configure && \
     make install
 
@@ -137,7 +137,7 @@ RUN ./extract pngout_linux_static && \
     cd build/pngout_linux_static && \
     cp amd64/pngout-static /usr/local/bin/pngout
 
-FROM liblcms as pngquant
+FROM liblcms2 as pngquant
 ARG PNGQUANT_VER
 ARG PNGQUANT_SHA256
 COPY download/pngquant-$PNGQUANT_VER.tar.gz download/
@@ -176,7 +176,7 @@ COPY --from=pngquant    /usr/local/bin/pngquant        /usr/local/bin/
 COPY --from=libjpeg     /usr/local/lib/libjpeg.so.9    /usr/local/lib/
 COPY --from=libpng      /usr/local/lib/libpng16.so.16  /usr/local/lib/
 COPY --from=libz        /usr/local/lib/libz.so.1       /usr/local/lib/
-COPY --from=liblcms     /usr/local/lib/liblcms2.so.2   /usr/local/lib/
+COPY --from=liblcms2    /usr/local/lib/liblcms2.so.2   /usr/local/lib/
 
 RUN npm -g install svgo
 RUN gem install --no-document image_optim

data/Makefile

@@ -1,5 +1,10 @@
 all :
 
+ORIGINAL_VARIABLES := $(.VARIABLES)
+print-variables :
+	$(foreach v, $(sort $(filter-out $(ORIGINAL_VARIABLES) ORIGINAL_VARIABLES,$(.VARIABLES))), $(info $(v) = $($(v))))
+.PHONY : print-variables
+
 # ====== VERSIONS ======
 
 ADVANCECOMP_VER := 2.6
@@ -8,10 +13,10 @@ JHEAD_VER := 3.04
 JPEGARCHIVE_VER := 2.2.0
 JPEGOPTIM_VER := 1.5.6
 LIBJPEG_VER := 9f
-LIBLCMS_VER := 2.17
+LIBLCMS2_VER := 2.17
 LIBMOZJPEG_VER := 4.1.5
 LIBPNG_VER := 1.6.50
-LIBZ_VER := 1.2.11
+LIBZ_VER := 1.3.1
 OPTIPNG_VER := 7.9.1
 OXIPNG_VER := 9.1.5
 PNGCRUSH_VER := 1.8.13
@@ -59,7 +64,15 @@ ANSI_RESET=\033[0m
 downcase = $(shell echo $1 | tr A-Z a-z)
 
 tar := $(shell if command -v bsdtar >/dev/null 2>&1; then echo bsdtar; else echo tar; fi)
-sha256sum := $(shell if command -v sha256sum >/dev/null 2>&1; then echo sha256sum; elif command -v shasum >/dev/null 2>&1; then echo shasum -a 256; else echo sha256; fi)
+sha256sum := $(shell \
+	empty_sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855; \
+	for cmd in sha256sum "shasum -a 256" gsha256sum sha256; do \
+		if echo "$$empty_sha256  /dev/null" | $$cmd -c >/dev/null 2>&1; then \
+			echo "$$cmd"; \
+			exit 0; \
+		fi; \
+	done; \
+	echo false)
 
 # ====== ARCHIVES ======
 
@@ -90,10 +103,10 @@ $(call archive,$1,$3)
 $$($1_ARC) :
 	mkdir -p $(DL_DIR)
 	test -w $(DL_DIR)
-	while ! mkdir $$@.lock 2> /dev/null; do sleep 1; done
-	wget -q -O $$@.tmp $(subst [VER],$($1_VER),$(strip $2))
-	mv $$@.tmp $$@
-	rm -r $$@.lock
+	tmpfile=`mktemp "$$@.XXXXXXXXXX"` && \
+		wget -q -O "$$$$tmpfile" --no-use-server-timestamps "$(subst [VER],$($1_VER),$(strip $2))" && \
+		chmod 644 "$$$$tmpfile" && \
+		mv "$$$$tmpfile" "$$@"
 endef
 
 $(eval $(call archive-dl,ADVANCECOMP, https://github.com/amadvance/advancecomp/releases/download/v[VER]/advancecomp-[VER].tar.gz))
@@ -102,10 +115,10 @@ $(eval $(call archive-dl,JHEAD,       https://www.sentex.ca/~mwandel/jhead/jhead
 $(eval $(call archive-dl,JPEGARCHIVE, https://github.com/danielgtaylor/jpeg-archive/archive/v[VER].tar.gz))
 $(eval $(call archive-dl,JPEGOPTIM,   https://github.com/tjko/jpegoptim/archive/v[VER].tar.gz))
 $(eval $(call archive-dl,LIBJPEG,     https://www.ijg.org/files/jpegsrc.v[VER].tar.gz))
-$(eval $(call archive-dl,LIBLCMS,     https://prdownloads.sourceforge.net/lcms/lcms2-[VER].tar.gz?download))
+$(eval $(call archive-dl,LIBLCMS2,    https://prdownloads.sourceforge.net/lcms/lcms2-[VER].tar.gz?download))
 $(eval $(call archive-dl,LIBMOZJPEG,  https://github.com/mozilla/mozjpeg/archive/v[VER].tar.gz))
 $(eval $(call archive-dl,LIBPNG,      https://prdownloads.sourceforge.net/libpng/libpng-[VER].tar.gz?download))
-$(eval $(call archive-dl,LIBZ,        https://prdownloads.sourceforge.net/libpng/zlib-[VER].tar.gz?download))
+$(eval $(call archive-dl,LIBZ,        https://github.com/madler/zlib/archive/v[VER].tar.gz))
 $(eval $(call archive-dl,OPTIPNG,     https://prdownloads.sourceforge.net/optipng/optipng-[VER].tar.gz?download))
 $(eval $(call archive-dl,OXIPNG,      https://github.com/oxipng/oxipng/archive/refs/tags/v[VER].tar.gz))
 $(eval $(call archive-dl,PNGCRUSH,    https://prdownloads.sourceforge.net/pmt/pngcrush-[VER]-nolib.tar.gz?download))
@@ -182,7 +195,7 @@ $(eval $(call target,JPEG-RECOMPRESS,JPEGARCHIVE))
 $(eval $(call target,JPEGOPTIM))
 $(eval $(call target,JPEGTRAN,LIBJPEG,.libs/jpegtran))
 $(eval $(call target,LIBJPEG,,libjpeg$(DLEXT)))
-$(eval $(call target,LIBLCMS,,liblcms2$(DLEXT)))
+$(eval $(call target,LIBLCMS2,,liblcms2$(DLEXT)))
 $(eval $(call target-build,LIBMOZJPEG,,libjpeg.a))
 $(eval $(call target,LIBPNG,,libpng$(DLEXT)))
 $(eval $(call target,LIBZ,,libz$(DLEXT)))
@@ -238,6 +251,7 @@ define check_output
 endef
 
 define check_shlib
+	@$(ldd) $(OUTPUT_DIR)/$1 | egrep "\s+.*/.*"
 	@! $(ldd) $(OUTPUT_DIR)/$1 | egrep -o "[^: 	]+/[^: 	]+" | egrep -v "^(@loader_path|/lib|/lib64|/usr|$(OUTPUT_DIR))/"
 endef
 
@@ -453,8 +467,8 @@ else
 endif
 	cd $(DIR) && ln -sf .libs/libjpeg$(DLEXT) .
 
-## liblcms
-$(LIBLCMS_TARGET) :
+## liblcms2
+$(LIBLCMS2_TARGET) :
 	cd $(DIR) && ./configure --host "$(HOST)"
 	cd $(DIR) && $(libtool_target_soname)
 ifdef IS_DARWIN
@@ -529,15 +543,15 @@ endif
 	cd $(DIR) && touch pngout
 
 ## pngquant
-$(eval $(call depend,PNGQUANT,LIBLCMS LIBPNG LIBZ))
-$(PNGQUANT_TARGET) : export OVERRIDE_BIN_DIR = $(LIBPNG_DIR)/override-bin
-$(PNGQUANT_TARGET) : export PATH := $(OVERRIDE_BIN_DIR):$(PATH)
+$(eval $(call depend,PNGQUANT,LIBLCMS2 LIBPNG LIBZ))
 $(PNGQUANT_TARGET) : export RUSTFLAGS = -C link-arg=$(XORIGIN)
 $(PNGQUANT_TARGET) :
-	# prevent build code of libpng-sys crate from using libpng-config
-	mkdir -p $(OVERRIDE_BIN_DIR) && \
-		cd $(OVERRIDE_BIN_DIR) && \
-		printf '%s\n' '#!/bin/sh' 'echo 1.5' > libpng-config && \
-		chmod +x libpng-config
-	cd $(DIR) && cargo build --release --frozen --offline --target=$(RUST_HOST)
+	printf "%s\n" \
+		$(foreach LIB,PNG Z LCMS2, \
+			"[target.$(RUST_HOST).$(call downcase,$(LIB))]" \
+			"rustc-link-lib = ['$(call downcase,$(LIB))']" \
+			"rustc-link-search = ['native=$(LIB$(LIB)_DIR)']" \
+			"include = '$(LIB$(LIB)_DIR)'" \
+		) > $(DIR)/override.toml
+	cd $(DIR) && cargo build --release --frozen --offline --target=$(RUST_HOST) --config override.toml
 	$(call chrpath_origin,$@)

data/checksums.mk

@@ -4,10 +4,10 @@ JHEAD_SHA256 := ef89bbcf4f6c25ed88088cf242a47a6aedfff4f08cc7dc205bf3e2c0f10a03c9
 JPEGARCHIVE_SHA256 := 3da16a5abbddd925dee0379aa51d9fe0cba33da0b5703be27c13a2dda3d7ed75
 JPEGOPTIM_SHA256 := 661a808dfffa933d78c6beb47a2937d572b9f03e94cbaaab3d4c0d72f410e9be
 LIBJPEG_SHA256 := 04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b
-LIBLCMS_SHA256 := d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074
+LIBLCMS2_SHA256 := d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074
 LIBMOZJPEG_SHA256 := 9fcbb7171f6ac383f5b391175d6fb3acde5e64c4c4727274eade84ed0998fcc1
 LIBPNG_SHA256 := 708f4398f996325819936d447f982e0db90b6b8212b7507e7672ea232210949a
-LIBZ_SHA256 := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+LIBZ_SHA256 := 17e88863f3600672ab49182f217281b6fc4d3c762bde361935e436a95214d05c
 OPTIPNG_SHA256 := c2579be58c2c66dae9d63154edcb3d427fef64cb00ec0aff079c9d156ec46f29
 OXIPNG_SHA256 := 8f99d5c67efa2a7550023bf610b90e65d421375c9ed7f37097f83ae5c05f85bd
 PNGCRUSH_SHA256 := fed0aaf5c098aa8c7f78c75365cd18d7341417326ecbdba547876b7b4f3df4be

data/image_optim_pack.gemspec

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

data/script/livecheck

@@ -38,7 +38,7 @@ CONFIG = {
     regexp: /jpegsrc.v(.*?).tar.gz/,
     info_url: 'https://jpegclub.org/reference/reference-sources/#:~:text=CHANGE%20LOG',
   },
-  liblcms: {
+  liblcms2: {
     url: 'https://sourceforge.net/projects/lcms/rss?path=/lcms',
     regexp: %r{/lcms/(\d+(?:\.\d+)*)/},
     info_url: 'https://www.littlecms.com/blog/',
@@ -51,12 +51,12 @@ CONFIG = {
   libpng: {
     url: 'https://sourceforge.net/projects/libpng/rss?path=/libpng16',
     regexp: %r{/libpng\d*/(\d+(?:\.\d+)*)/},
-    info_url: 'https://github.com/glennrp/libpng/blob/libpng16/CHANGES#:~:text=Send%20comments/corrections/commendations%20to%20png%2Dmng%2Dimplement%20at%20lists.sf.net.',
+    info_url: 'https://github.com/pnggroup/libpng/blob/libpng16/CHANGES#:~:text=Send%20comments/corrections/commendations%20to%20png%2Dmng%2Dimplement%20at%20lists.sf.net.',
   },
   libz: {
-    url: 'https://sourceforge.net/projects/libpng/rss?path=/zlib',
-    regexp: %r{/zlib/(\d+(?:\.\d+)*)/},
-    info_url: 'https://github.com/glennrp/zlib/blob/master/ChangeLog',
+    url: 'https://github.com/madler/zlib/releases.atom',
+    regexp: %r{<id>tag:github.com,2008:Repository/\d+/v(\d+(?:\.\d+)*)</id>},
+    info_url: 'https://www.zlib.net/ChangeLog.txt',
   },
   optipng: {
     url: 'https://optipng.sourceforge.net',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.12.1.20250921
+  version: 0.12.2
 platform: ruby
 authors:
 - Ivan Kuchin
@@ -203,7 +203,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.12.1.20250921
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.12.2
   source_code_uri: https://github.com/toy/image_optim_pack
 rdoc_options: []
 require_paths: