image_optim_pack 0.8.0.20220131 → 0.8.0.20220418

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ee74f56e5f6ebc0a7a0f0c91dd84829868bde9b095ce3c8baa5ad8e956581e
-  data.tar.gz: b801ad92d69aa39ae20e4499483cf80a0851d906c07e7009c67332c7f406e7ee
+  metadata.gz: f74ad2edae9f66fb59f57323d6c7b2080451f2ee87cf79cc02976b8eea2482ae
+  data.tar.gz: 5907e66255dc0b6ce1360d2ed694dd948e69066499b3b5287e9c87f45175ca86
 SHA512:
-  metadata.gz: 72583137f4bf0b13731ab31cb6525617ae74d8f27a244eca15ec3ca28cb832e5bf14103d89a59e54708dfce32328243f7301f6d2eb5537d776542d6d5b1136bb
-  data.tar.gz: 70463b1471db64757ae024b7120269c626ea73d64e56910841f8556b7c9fd6df525d7b50b2049634014adaefbfb3b2e225c5e3751452c451d489fb4a6880925d
+  metadata.gz: 1e1f3de2553d0736e68dfd0e603d73d49023f58c7750f60b7f619216576a8f48849d5171a305cdcf6c83367129928b03edbd66dae7d71ceb7d81f0ca4f170066
+  data.tar.gz: 613b15a5c0204c7a42413e2a4b2aae0aacb10fab146b85865d1edfe1e3bcb23d0735af00fe605bc3266b1c7001670139c2e2d7188302474141d1f7f2b0ced0aa

data/.github/workflows/docker-build.yml

@@ -0,0 +1,16 @@
+name: docker-build
+on:
+  push:
+    tags:
+    - '*'
+jobs:
+  docker-build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - run: make docker-push

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v0.8.0.20220418 (2022-04-18)
+
+* advancecomp 2.3 and jpegoptim 1.4.7 [@toy](https://github.com/toy)
+
 ## v0.8.0.20220131 (2022-01-31)
 
 * liblcms 2.13 [@toy](https://github.com/toy)

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.12 as base
+FROM alpine as base
 ENV LD_LIBRARY_PATH=/usr/local/lib
 WORKDIR /tmp
 
@@ -85,7 +85,7 @@ ARG JPEGARCHIVE_SHA256
 COPY download/jpegarchive-$JPEGARCHIVE_VER.tar.gz download/
 RUN ./extract jpegarchive && \
     cd build/jpegarchive && \
-    make install
+    CFLAGS=-fcommon make install
 
 FROM libjpeg as jpegoptim
 ARG JPEGOPTIM_VER
@@ -105,7 +105,7 @@ RUN ./extract optipng && \
     ./configure && \
     make install
 
-FROM rust:1.55-alpine3.13 as oxipng
+FROM rust:1-alpine as oxipng
 RUN apk add --no-cache build-base
 COPY script/extract ./
 ARG OXIPNG_VER

data/Makefile

@@ -2,11 +2,11 @@ all :
 
 # ====== VERSIONS ======
 
-ADVANCECOMP_VER := 2.1
+ADVANCECOMP_VER := 2.3
 GIFSICLE_VER := 1.93
 JHEAD_VER := 3.04
 JPEGARCHIVE_VER := 2.2.0
-JPEGOPTIM_VER := 1.4.6
+JPEGOPTIM_VER := 1.4.7
 LIBJPEG_VER := 9e
 LIBLCMS_VER := 2.13
 LIBMOZJPEG_VER := 4.0.3
@@ -78,6 +78,7 @@ $(call archive,$1)
 # download archive from url
 $$($1_TGZ) :
 	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 $$@
@@ -88,7 +89,7 @@ $(eval $(call archive-dl,ADVANCECOMP, https://github.com/amadvance/advancecomp/r
 $(eval $(call archive-dl,GIFSICLE,    https://www.lcdf.org/gifsicle/gifsicle-[VER].tar.gz))
 $(eval $(call archive-dl,JHEAD,       https://www.sentex.ca/~mwandel/jhead/jhead-[VER].tar.gz))
 $(eval $(call archive-dl,JPEGARCHIVE, https://github.com/danielgtaylor/jpeg-archive/archive/v[VER].tar.gz))
-$(eval $(call archive-dl,JPEGOPTIM,   https://www.kokkonen.net/tjko/src/jpegoptim-[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,LIBMOZJPEG,  https://github.com/mozilla/mozjpeg/archive/v[VER].tar.gz))
@@ -266,15 +267,21 @@ DOCKER_TAG := $(shell date +%Y%m%d)
 
 docker-build : download
 	@docker build \
+		--pull \
 		$(foreach archive,$(ARCHIVES),--build-arg $(archive)_VER=$($(archive)_VER) --build-arg $(archive)_SHA256=$($(archive)_SHA256)) \
-		-t $(DOCKER_IMAGE):$(DOCKER_TAG) \
 		-t $(DOCKER_IMAGE):latest \
 		.
 .PHONY : docker-build
 
-docker-push : docker-build
-	@docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
+docker-tag : docker-build
+	@docker tag \
+		$(DOCKER_IMAGE):latest \
+		$(DOCKER_IMAGE):$(DOCKER_TAG)
+.PHONY : docker-tag
+
+docker-push : docker-tag
 	@docker push $(DOCKER_IMAGE):latest
+	@docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
 .PHONY : docker-push
 
 # ====== CLEAN ======

data/checksums.mk

@@ -1,8 +1,8 @@
-ADVANCECOMP_SHA256 := 3ac0875e86a8517011976f04107186d5c60d434954078bc502ee731480933eb8
+ADVANCECOMP_SHA256 := 811f661dfbbdddefdcb5eaf133e403ca2af99328b850b22c1249f7bebe657578
 GIFSICLE_SHA256 := 92f67079732bf4c1da087e6ae0905205846e5ac777ba5caa66d12a73aa943447
 JHEAD_SHA256 := ef89bbcf4f6c25ed88088cf242a47a6aedfff4f08cc7dc205bf3e2c0f10a03c9
 JPEGARCHIVE_SHA256 := 3da16a5abbddd925dee0379aa51d9fe0cba33da0b5703be27c13a2dda3d7ed75
-JPEGOPTIM_SHA256 := 88b1eb64c2a33a2f013f068df8b0331f42c019267401ae3fa28e3277403a5ab7
+JPEGOPTIM_SHA256 := c52616f2fb8d481315871680f9943b0f58c553d1e0c49a6bd4691a3e66d7e6de
 LIBJPEG_SHA256 := 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d
 LIBLCMS_SHA256 := 0c67a5cc144029cfa34647a52809ec399aae488db4258a6a66fba318474a070f
 LIBMOZJPEG_SHA256 := 4f22731db2afa14531a5bf2633d8af79ca5cb697a550f678bf43f24e5e409ef0

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.8.0.20220131'
+  s.version     = '0.8.0.20220418'
   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']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.8.0.20220131
+  version: 0.8.0.20220418
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -100,6 +100,7 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".github/workflows/check.yml"
+- ".github/workflows/docker-build.yml"
 - ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -204,7 +205,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.20220131
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.8.0.20220418
   source_code_uri: https://github.com/toy/image_optim_pack
 post_install_message:
 rdoc_options: []
@@ -221,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,