image_optim_pack 0.12.2.20260327 → 0.13.1

data/Makefile

@@ -15,7 +15,7 @@ JPEGOPTIM_VER := 1.5.6
 LIBJPEG_VER := 9f
 LIBLCMS2_VER := 2.17
 LIBMOZJPEG_VER := 4.1.5
-LIBPNG_VER := 1.6.56
+LIBPNG_VER := 1.6.57
 LIBZ_VER := 1.3.2
 OPTIPNG_VER := 7.9.1
 OXIPNG_VER := 10.1.0
@@ -41,15 +41,19 @@ IS_LINUX := $(findstring linux,$(OS))
 IS_BSD := $(findstring bsd,$(OS))
 IS_FREEBSD := $(findstring freebsd,$(OS))
 IS_OPENBSD := $(findstring openbsd,$(OS))
+
+IS_LINUX_MUSL := $(findstring linux-musl,$(shell gcc -dumpmachine))
+
 DLEXT := $(if $(IS_DARWIN),.dylib,.so)
 HOST := $(ARCH:arm64=arm)-$(if $(IS_DARWIN),apple,pc)-$(OS)
-RUST_HOST := $(ARCH:arm64=aarch64)-$(if $(IS_DARWIN),apple-darwin,unknown-linux-gnu)
+LIBC_SUFFIX := $(if $(IS_DARWIN),,$(if $(IS_LINUX_MUSL),-musl,-gnu))
+RUST_HOST := $(ARCH:arm64=aarch64)-$(if $(IS_DARWIN),apple-darwin,unknown-linux$(LIBC_SUFFIX))
 
 DL_DIR := $(CURDIR)/download
 BUILD_ROOT_DIR := $(CURDIR)/build
-BUILD_DIR := $(BUILD_ROOT_DIR)/$(OS)-$(ARCH)
+BUILD_DIR := $(BUILD_ROOT_DIR)/$(OS)-$(ARCH)$(LIBC_SUFFIX)
 OUTPUT_ROOT_DIR := $(CURDIR)/vendor
-OUTPUT_DIR := $(OUTPUT_ROOT_DIR)/$(OS)-$(ARCH)
+OUTPUT_DIR := $(OUTPUT_ROOT_DIR)/$(OS)-$(ARCH)$(LIBC_SUFFIX)
 PATCHES_DIR := $(CURDIR)/patches
 
 export CARGO_HOME := $(DL_DIR)/cargo
@@ -97,7 +101,6 @@ endef
 # $1 - name of archive
 # $2 - url of archive with [VER] for replace with version
 # $3 - extension to use
-# $4 - extra arguments to wget
 define archive-dl
 $(call archive,$1,$3)
 # download archive from url
@@ -105,7 +108,7 @@ $$($1_ARC) :
 	mkdir -p $(DL_DIR)
 	test -w $(DL_DIR)
 	tmpfile=`mktemp "$$@.XXXXXXXXXX"` && \
-		wget -O "$$$$tmpfile" --no-use-server-timestamps $4 "$(subst [VER],$($1_VER),$(strip $2))" && \
+		wget -O "$$$$tmpfile" --no-use-server-timestamps "$(subst [VER],$($1_VER),$(strip $2))" && \
 		chmod 644 "$$$$tmpfile" && \
 		mv "$$$$tmpfile" "$$@"
 endef
@@ -123,9 +126,9 @@ $(eval $(call archive-dl,LIBZ,        https://github.com/madler/zlib/archive/v[V
 $(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/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,https://www.jonof.id.au/files/kenutils/pngout-[VER]-linux.tar.gz,,--retry-on-http-error=415))
-$(eval $(call archive-dl,PNGOUT_LINUX_STATIC,https://www.jonof.id.au/files/kenutils/pngout-[VER]-linux-static.tar.gz,,--retry-on-http-error=415))
-$(eval $(call archive-dl,PNGOUT_DARWIN,https://www.jonof.id.au/files/kenutils/pngout-[VER]-mac.zip,zip,--retry-on-http-error=415))
+$(eval $(call archive-dl,PNGOUT_LINUX,https://www.jonof.id.au/files/kenutils/pngout-[VER]-linux.tar.gz))
+$(eval $(call archive-dl,PNGOUT_LINUX_STATIC,https://www.jonof.id.au/files/kenutils/pngout-[VER]-linux-static.tar.gz))
+$(eval $(call archive-dl,PNGOUT_DARWIN,https://www.jonof.id.au/files/kenutils/pngout-[VER]-mac.zip,zip))
 $(eval $(call archive-dl,PNGQUANT,    https://crates.io/api/v1/crates/pngquant/[VER]/download))
 
 download : $(foreach archive,$(ARCHIVES),$($(archive)_ARC))
@@ -205,6 +208,8 @@ $(eval $(call target,OXIPNG,,target/$(RUST_HOST)/release/oxipng))
 $(eval $(call target,PNGCRUSH))
 ifdef IS_DARWIN
 $(eval $(call target,PNGOUT,PNGOUT_DARWIN,,NOSTRIP))
+else ifdef IS_LINUX_MUSL
+$(eval $(call target,PNGOUT,PNGOUT_LINUX_STATIC,,NOSTRIP))
 else
 $(eval $(call target,PNGOUT,PNGOUT_LINUX,,NOSTRIP))
 endif
@@ -213,11 +218,7 @@ $(eval $(call target,PNGQUANT,,target/$(RUST_HOST)/release/pngquant))
 # ====== TARGETS ======
 
 all : build
-ifeq ($(ARCH),$(HOST_ARCH))
 	@$(MAKE) test
-else
-	@echo Skipping tests when compiling for different architecture
-endif
 .PHONY : all
 
 build : $(call downcase,$(PRODUCTS))
@@ -232,11 +233,17 @@ endif
 ldd-version :; $(ldd) --version
 .PHONY : ldd-version
 
-define check_exists
-	@test -f $(OUTPUT_DIR)/$1 || \
+define check_file_presence
+	@test -e $(OUTPUT_DIR)/$1 || \
 		{ printf "%s: $(ANSI_RED)not found$(ANSI_RESET)\n" "$1"; exit 1; }
+	@test -f $(OUTPUT_DIR)/$1 || \
+		{ printf "%s: $(ANSI_RED)not a regular file$(ANSI_RESET)\n" "$1"; exit 1; }
+	@test -s $(OUTPUT_DIR)/$1 || \
+		{ printf "%s: $(ANSI_RED)has size zero$(ANSI_RESET)\n" "$1"; exit 1; }
 endef
 
+CHECK_VERSION := $(if $(findstring $(HOST_ARCH)/$(ARCH),x86_64/arm64),,check)
+
 define check_version
 	@$(OUTPUT_DIR)/$1 $2 | fgrep -q "$3" || \
 		{ printf "%s: $(ANSI_RED)Expected %s, got %s$(ANSI_RESET)\n" "$1" "$3" "$$($(OUTPUT_DIR)/$1 $2)"; exit 1; }
@@ -248,26 +255,30 @@ define check_arch
 endef
 
 define check_output
-	@printf "%s: $(ANSI_GREEN)%s$(ANSI_RESET) / $(ANSI_MAGENTA)%s$(ANSI_RESET)\n" "$1" "$3" "$(ARCH_STRING)"
+	@printf "%s: $(ANSI_GREEN)%s$(ANSI_RESET) / $(ANSI_MAGENTA)%s$(ANSI_RESET)\n" "$1" "$2" "$(ARCH_STRING)"
 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))/"
+	@if file $(OUTPUT_DIR)/$1 | fgrep -q 'statically linked'; then \
+		printf '\tstatically Linked\n'; \
+	else \
+		$(ldd) $(OUTPUT_DIR)/$1 | egrep "\s+.*/.*" && \
+			! $(ldd) $(OUTPUT_DIR)/$1 | egrep -o $$'[^: \t]+/[^: \t]+' | egrep -v "^(@loader_path|/lib|/lib64|/usr|$(OUTPUT_DIR))/"; \
+	fi
 endef
 
 define check_lib
-	$(call check_exists,$1)
+	$(call check_file_presence,$1)
 	$(call check_arch,$1)
-	$(call check_output,$1,,-)
+	$(call check_output,$1,-)
 	$(call check_shlib,$1)
 endef
 
 define check_bin
-	$(call check_exists,$1)
-	$(call check_version,$1,$2,$3)
+	$(call check_file_presence,$1)
+	$(if $(CHECK_VERSION),$(call check_version,$1,$2,$3))
 	$(call check_arch,$1)
-	$(call check_output,$1,,$3)
+	$(call check_output,$1,$(if $(CHECK_VERSION),$3,[can't run $(ARCH) on $(HOST_ARCH)]))
 	$(call check_shlib,$1)
 endef
 
@@ -275,9 +286,10 @@ ifdef IS_DARWIN
 test : ARCH_STRING := $(ARCH)
 else ifeq (amd64,$(ARCH:x86_64=amd64))
 test : ARCH_STRING := x86-64
+else
+test : ARCH_STRING := $(ARCH)
 endif
 test :
-	$(if $(ARCH_STRING),,@echo Detecting 'ARCH $(ARCH) for OS $(OS) undefined'; false)
 	$(call check_bin,advpng,--version 2>&1,$(ADVANCECOMP_VER))
 	$(call check_bin,gifsicle,--version,$(GIFSICLE_VER))
 	$(call check_bin,jhead,-V,$(JHEAD_VER))
@@ -400,7 +412,6 @@ export CXX := g++
 endif
 
 GCC_FLAGS := -O3
-STATIC_LIBGCC := $(shell if $(CC) -v 2>&1 | fgrep -q gcc; then echo -static-libgcc; fi)
 
 export CFLAGS = $(GCC_FLAGS)
 export CXXFLAGS = $(GCC_FLAGS)
@@ -519,6 +530,9 @@ $(OPTIPNG_TARGET) :
 	$(call chrpath_origin,$@)
 
 ## oxipng
+ifdef IS_LINUX_MUSL
+$(PNGQUANT_TARGET) : export RUSTFLAGS = -C target-feature=-crt-static
+endif
 $(OXIPNG_TARGET) :
 	cd $(DIR) && cargo build --release --frozen --offline --target=$(RUST_HOST)
 
@@ -539,13 +553,13 @@ $(PNGCRUSH_TARGET) :
 ## pngout
 $(PNGOUT_TARGET) :
 ifdef IS_LINUX
-	cd $(DIR) && ln -sf $(ARCH:x86_64=amd64)/pngout .
+	cd $(DIR) && ln -sf $(ARCH:x86_64=amd64)/pngout$(if $(IS_LINUX_MUSL),-static) pngout
 endif
 	cd $(DIR) && touch pngout
 
 ## pngquant
 $(eval $(call depend,PNGQUANT,LIBLCMS2 LIBPNG LIBZ))
-$(PNGQUANT_TARGET) : export RUSTFLAGS = -C link-arg=$(XORIGIN)
+$(PNGQUANT_TARGET) : export RUSTFLAGS = -C link-arg=$(XORIGIN) $(if $(IS_LINUX_MUSL),-C target-feature=-crt-static)
 $(PNGQUANT_TARGET) :
 	printf "%s\n" \
 		$(foreach LIB,PNG Z LCMS2, \

data/checksums.mk

@@ -6,7 +6,7 @@ JPEGOPTIM_SHA256 := 661a808dfffa933d78c6beb47a2937d572b9f03e94cbaaab3d4c0d72f410
 LIBJPEG_SHA256 := 04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b
 LIBLCMS2_SHA256 := d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074
 LIBMOZJPEG_SHA256 := 9fcbb7171f6ac383f5b391175d6fb3acde5e64c4c4727274eade84ed0998fcc1
-LIBPNG_SHA256 := 8f91e941a07fb1069ebb3855278f82a849e6af14ca05821e14ec3d5348697ea5
+LIBPNG_SHA256 := 01fdab044cdc575c74a9ef62a4042fbe24fea8bedfe8aa5c89f4467b781bbb60
 LIBZ_SHA256 := b99a0b86c0ba9360ec7e78c4f1e43b1cbdf1e6936c8fa0f6835c0cd694a495a1
 OPTIPNG_SHA256 := c2579be58c2c66dae9d63154edcb3d427fef64cb00ec0aff079c9d156ec46f29
 OXIPNG_SHA256 := 6c5e1d021a844ba730193943ab63ad99e7d9f1089c36f3db59014517ea99cf99

data/image_optim_pack-linux-aarch64-gnu.gemspec

@@ -0,0 +1,3 @@
+# encoding: UTF-8
+
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-linux-aarch64-musl.gemspec

@@ -0,0 +1,3 @@
+# encoding: UTF-8
+
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-linux-aarch64.gemspec

@@ -0,0 +1,3 @@
+# encoding: UTF-8
+
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-linux-x86_64-gnu.gemspec

@@ -0,0 +1,3 @@
+# encoding: UTF-8
+
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-linux-x86_64-musl.gemspec

@@ -0,0 +1,3 @@
+# encoding: UTF-8
+
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.12.2.20260327'
+  s.version     = '0.13.1'
   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']
@@ -17,38 +17,46 @@ Gem::Specification.new do |s|
     'source_code_uri'   => "https://github.com/toy/#{s.name}",
   }
 
-  s.files         = `git ls-files`.split("\n")
-  if defined?(gemspec_path)
-    gem_os, gem_cpu = File.basename(gemspec_path, File.extname(gemspec_path)).split('-').drop(1)
+  s.files = Dir[*%w[
+    .dockerignore
+    .gitignore
+    .rubocop.yml
+    checksums.mk
+    Gemfile
+    LICENSE.txt
+    Makefile
+    *.markdown
+    Dockerfile*
+    *.gemspec
+    {.github,acknowledgements,lib,patches,script,spec,vendor}/**/*
+  ]].reject(&File.method(:directory?))
 
-    s.platform = Gem::Platform.new([gem_cpu, gem_os])
+  if defined?(gemspec_path)
+    platform_parts = File.basename(gemspec_path, File.extname(gemspec_path)).split('-').drop(1)
+    s.platform = Gem::Platform.new(platform_parts.values_at(1, 0, 2))
 
-    cpu_aliases = {
-      'x86_64' => %w[x86_64 amd64],
-    }[gem_cpu] || [gem_cpu]
+    all_vendor_dirs = s.files.filter_map do |path|
+      parts = path.split('/')
+      parts[1] if parts[0] == 'vendor'
+    end.uniq
 
-    possible_vendor_dirs = cpu_aliases.map do |cpu_alias|
-      "#{gem_os}-#{cpu_alias}"
+    vendor_dirs = all_vendor_dirs.select do |vendor_dir|
+      s.platform =~ Gem::Platform.new(vendor_dir.split('-').values_at(1, 0, 2))
     end
 
-    existing_vendor_dirs = possible_vendor_dirs.select do |vendor_dir|
-      File.directory?(File.join('vendor', vendor_dir))
-    end
+    expected_vendor_dirs = s.platform.os == 'linux' && !s.platform.version ? 2 : 1
 
-    vendor_dir = if existing_vendor_dirs.length == 1
-      existing_vendor_dirs.first
-    else
-      message = existing_vendor_dirs.empty? ? 'no vendor dir' : 'multiple vendor dirs'
-      fail "#{message} found for os #{gem_os} and cpu #{gem_cpu} out of: #{possible_vendor_dirs.join(', ')}"
+    unless vendor_dirs.length == expected_vendor_dirs
+      fail "expected #{expected_vendor_dirs}, got #{vendor_dirs.length} (#{vendor_dirs.join(', ')}) for #{s.platform}"
     end
 
     s.files.reject! do |path|
       parts = path.split('/')
-      parts[0] == 'vendor' && parts[1] != vendor_dir
+      parts[0] == 'vendor' && !vendor_dirs.include?(parts[1])
     end
   end
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+
+  s.test_files    = Dir['spec/**/*.*']
   s.require_paths = %w[lib]
 
   s.add_dependency 'image_optim', '~> 0.19'

data/lib/image_optim/pack.rb

@@ -15,13 +15,16 @@ class ImageOptim
       # Intended os
       attr_reader :os
 
-      # Inteded architecture
+      # Intended architecture
       attr_reader :arch
 
+      # Intended version
+      attr_reader :version
+
       # Receive path, use last part for arch and last but one part for os
       def initialize(path)
         @path = FSPath(path)
-        @os, @arch = @path.basename.to_s.split('-', 2)
+        @os, @arch, @version = @path.basename.to_s.split('-', 3)
       end
 
       # Return path converted to string
@@ -78,6 +81,15 @@ class ImageOptim
       'unknown'
     end
 
+    # extracted from ldd output
+    VERSION = if OS == 'linux'
+      begin
+        `ldd /bin/sh`[/musl|gnu/]
+      rescue Errno::ENOENT
+        'unknown'
+      end
+    end
+
     # Path to vendor at root of image_optim_pack
     VENDOR_PATH = FSPath('../../../vendor').expand_path(__FILE__)
 
@@ -96,10 +108,15 @@ class ImageOptim
 
     private
 
-      # Order by match of os and architecture
+      # Order by match of os, arch and version
       def ordered_by_os_arch_match
-        PATHS.sort_by do |path|
-          [path.os == OS ? 0 : 1, path.arch == ARCH ? 0 : 1]
+        PATHS.sort_by.with_index do |path, i|
+          [
+            path.os == OS ? 0 : 1,
+            path.arch == ARCH ? 0 : 1,
+            path.version == VERSION ? 0 : 1,
+            i,
+          ]
         end
       end
 

data/script/platform_downloads

@@ -5,13 +5,17 @@ require 'gems'
 require 'ostruct'
 require 'terminal-table'
 
+def platform_parts(platform)
+  platform.split('-', 3).values_at(1, 0, 2).compact
+end
+
 versions = Gems.versions('image_optim_pack').map do |attributes|
   attributes['number'] = Gem::Version.new(attributes['number'])
   OpenStruct.new(attributes) # rubocop:disable Style/OpenStructUse
 end
 
 platforms = versions.map(&:platform).uniq.sort_by do |platform|
-  platform.sub('amd64', 'x86_64').split('-').reverse
+  platform_parts(platform)
 end
 
 version_time = begin
@@ -28,7 +32,7 @@ end
 table = Terminal::Table.new
 
 table.headings = ['version', 'days', 'base dls'] + platforms.map do |platform|
-  platform.split('-').reverse.join("\n")
+  platform_parts(platform).join("\n")
 end + ['total']
 
 versions.group_by(&:number).each do |version_n, platform_versions|

data/script/run

@@ -62,6 +62,7 @@ fi
 container_build() {
   vm=$1
   image=$2
+  platform=$3
 
   passes-filter "$vm" || return 0
   header "$vm"
@@ -74,7 +75,15 @@ container_build() {
 
     if [[ -n "$used_image" && "$used_image" != "$image" ]]; then
       echo "Container is using $used_image instead of $image, recreating"
-      "$container_tool" rm "$container_name"
+      "$container_tool" rm --force "$container_name"
+    fi
+
+    used_image_id=$("$container_tool" inspect --format '{{.Image}}' "$container_name" 2>/dev/null || true)
+    used_platform=$("$container_tool" inspect --format '{{.Os}}/{{.Architecture}}' "$used_image_id" 2>/dev/null || true)
+
+    if [[ -n "$used_platform" && "$used_platform" != "$platform" ]]; then
+      echo "Container is using image platform $used_platform instead of $platform, recreating"
+      "$container_tool" rm --force "$container_name"
     fi
 
     status=$("$container_tool" inspect --format '{{.State.Status}}' "$container_name" 2>/dev/null || true)
@@ -84,7 +93,8 @@ container_build() {
 
       "$container_tool" \
         container create \
-        --name="$container_name" \
+        --platform "$platform" \
+        --name "$container_name" \
         --stop-signal SIGHUP \
         -it \
         -v "${mount//_path_/}:ro" \
@@ -95,9 +105,16 @@ container_build() {
 
       "$container_tool" container start "$container_name"
 
-      "$container_tool" exec -it "$container_name" bash -exc "
-        apt-get update
-        apt-get -y install make gcc g++ chrpath perl pkg-config autoconf automake libtool nasm cmake patch
+      "$container_tool" exec -it "$container_name" sh -exc "
+        if command -v apt-get; then
+          apt-get update
+          apt-get -y install make gcc g++ chrpath perl pkg-config autoconf automake libtool nasm cmake patch
+        elif command -v apk; then
+          apk add --no-cache bash make gcc g++ chrpath perl pkgconf autoconf automake libtool nasm cmake patch file
+        else
+          echo 'unsupported package manager' >&2
+          exit 1
+        fi
       "
     fi
 
@@ -113,8 +130,16 @@ container_build() {
           exit 0
         fi
 
-        apt-get update
-        apt-get -y dist-upgrade
+        if command -v apt-get; then
+          apt-get update
+          apt-get -y dist-upgrade
+        elif command -v apk; then
+          apk upgrade --no-cache
+        else
+          echo 'unsupported package manager' >&2
+          exit 1
+        fi
+
         rustup update
 
         touch \"\$UPDATED_FILE\"
@@ -136,5 +161,7 @@ container_build() {
   [[ -n "$NO_HALT" ]] || "$container_tool" container stop "$container_name"
 }
 
-export DOCKER_CLI_HINTS='do people really like SPAM?'
-container_build linux-x86_64 rust:slim-bullseye
+container_build linux-x86_64-gnu rust:slim-bullseye linux/amd64
+container_build linux-x86_64-musl rust:alpine linux/amd64
+container_build linux-aarch64-gnu rust:slim-bookworm linux/arm64
+container_build linux-aarch64-musl rust:alpine linux/arm64

data/spec/image_optim/pack_spec.rb

@@ -39,13 +39,19 @@ describe ImageOptim::Pack do
 
     describe :os do
       it 'returns last but one part of path' do
-        expect(Path.new('path/futureos-K-qbit').os).to eq('futureos')
+        expect(Path.new('path/futureos-K_qbit-foo-bar')).to have_attributes(os: 'futureos')
       end
     end
 
     describe :arch do
       it 'returns last but one part of path' do
-        expect(Path.new('path/futureos-K-qbit').arch).to eq('K-qbit')
+        expect(Path.new('path/futureos-K_qbit-foo-bar')).to have_attributes(arch: 'K_qbit')
+      end
+    end
+
+    describe :version do
+      it 'returns last but one part of path' do
+        expect(Path.new('path/futureos-K_qbit-foo-bar')).to have_attributes(version: 'foo-bar')
       end
     end