Update for 8.10.0-rc1

- Update libspng to 0.6.0.

README.md

@@ -21,20 +21,18 @@ Experiment with building a libvips binary for Windows with [MXE](https://github.
 | [libjpeg-turbo] | 2.0.5     | [zlib License, IJG License]     |
 | [libpng]        | 1.6.37    | [libpng License version 2]      |
 | [librsvg]       | 2.49.3    | LGPLv3                          |
-| [libspng]       | 9a08896¹  | [BSD 2-Clause, libpng License]  |
+| [libspng]       | 0.6.0     | [BSD 2-Clause, libpng License]  |
 | [libtiff]       | 4.1.0     | [libtiff License] (BSD-like)    |
-| [libvips]       | 8.10.0²   | LGPLv3                          |
+| [libvips]       | 8.10.0¹   | LGPLv3                          |
 | [libwebp]       | 1.1.0     | New BSD License                 |
 | [libxml2]       | 2.9.10    | MIT Licence                     |
 | [orc]           | 0.4.31    | [orc License] (BSD-like)        |
 | [pango]         | 1.45.3    | LGPLv3                          |
 | [pixman]        | 0.40.0    | MIT Licence                     |
 | [zlib]          | 1.2.11    | [zlib Licence]                  |
 
-¹ libspng is built from the [`master`](https://github.com/randy408/libspng/tree/master) branch because v0.6.0 hasn't been released yet.
-
-² libvips is built from the [`v8.10.0-beta2`](https://github.com/libvips/libvips/tree/v8.10.0-beta2) tag, see:
-https://github.com/libvips/libvips/releases/tag/v8.10.0-beta2
+¹ libvips is built from the [`v8.10.0-rc1`](https://github.com/libvips/libvips/tree/v8.10.0-rc1) tag, see:
+https://github.com/libvips/libvips/releases/tag/v8.10.0-rc1
 
 [cairo]: https://gitlab.freedesktop.org/cairo/cairo
 [expat]: https://github.com/libexpat/libexpat
@@ -120,8 +118,8 @@ argument. For example:
 
 | Dependency      | Version   | Used under the terms of          |
 |-----------------|-----------|----------------------------------|
-| [mozjpeg]       | 6d95c51³  | [zlib License, IJG License]      |
+| [mozjpeg]       | 6d95c51²  | [zlib License, IJG License]      |
 
-³ MozJPEG is built from master to maintain binary compatibility with libjpeg-turbo.
+² MozJPEG is built from the [`master`](https://github.com/mozilla/mozjpeg/tree/master) branch to maintain binary compatibility with libjpeg-turbo.
 
 [mozjpeg]: https://github.com/mozilla/mozjpeg

build/libspng.mk

@@ -2,11 +2,10 @@ PKG             := libspng
 $(PKG)_WEBSITE  := https://libspng.org/
 $(PKG)_DESCR    := Simple, modern libpng alternative.
 $(PKG)_IGNORE   :=
-# https://github.com/randy408/libspng/tarball/9a08896995b29f195078af3972c85e94d2051468
-$(PKG)_VERSION  := 9a08896
-$(PKG)_CHECKSUM := 932526e0e30535980d7feb06c75050aca3c99330a264e739154a7d22f8d29565
+$(PKG)_VERSION  := 0.6.0
+$(PKG)_CHECKSUM := 81fea8d8a2e0c8aa51769605ad0e49a682e88697c6b5b60105f5c3806efaa3a3
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
-$(PKG)_GH_CONF  := randy408/libspng/branches/master
+$(PKG)_GH_CONF  := randy408/libspng/tags,v
 $(PKG)_DEPS     := cc zlib
 
 define $(PKG)_BUILD

build/variables.sh

@@ -3,7 +3,7 @@
 vips_package=vips
 vips_version=8.10
 vips_patch_version=0
-vips_pre_version=beta2
+vips_pre_version=rc1
 
 # build-win64-mxe/build dir we are building
 work_dir=$(pwd)

build/vips-all.mk

@@ -3,19 +3,19 @@ $(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 8.10.0
-$(PKG)_CHECKSUM := 28465cf2cdc63e15da5c252455fbd38c12f0dabf4bc255ff9a92c976a4cacb83
+$(PKG)_CHECKSUM := e5083ccee8fb615c82ec7017459132122877c45688169e6e43cbaa5e3fa77286
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libvips/libvips/releases,v,-beta2,,,-beta2.tar.gz
+$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc1,,,-rc1.tar.gz
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)
-$(PKG)_FILE     := vips-$($(PKG)_VERSION)-beta2.tar.gz
+$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc1.tar.gz
 $(PKG)_DEPS     := cc matio libwebp librsvg giflib poppler glib pango fftw \
                    libgsf libjpeg-turbo tiff openslide lcms libexif libheif \
                    imagemagick libpng libspng openexr cfitsio nifticlib orc
 
 define $(PKG)_PRE_CONFIGURE
     # Copy some files to the packaging directory
     mkdir -p $(TOP_DIR)/vips-packaging
-    $(foreach f,COPYING ChangeLog README.md AUTHORS, mv '$(SOURCE_DIR)/$f' '$(TOP_DIR)/vips-packaging';)
+    $(foreach f,COPYING ChangeLog README.md AUTHORS, cp '$(SOURCE_DIR)/$f' '$(TOP_DIR)/vips-packaging';)
 
     (printf '{\n'; \
      printf '  "cairo": "$(cairo_VERSION)",\n'; \

build/vips-web.mk

@@ -3,18 +3,18 @@ $(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 8.10.0
-$(PKG)_CHECKSUM := 28465cf2cdc63e15da5c252455fbd38c12f0dabf4bc255ff9a92c976a4cacb83
+$(PKG)_CHECKSUM := e5083ccee8fb615c82ec7017459132122877c45688169e6e43cbaa5e3fa77286
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libvips/libvips/releases,v,-beta2,,,-beta2.tar.gz
+$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc1,,,-rc1.tar.gz
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)
-$(PKG)_FILE     := vips-$($(PKG)_VERSION)-beta2.tar.gz
+$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc1.tar.gz
 $(PKG)_DEPS     := cc libwebp librsvg giflib glib pango libgsf \
                    libjpeg-turbo tiff lcms libexif libpng libspng orc
 
 define $(PKG)_PRE_CONFIGURE
     # Copy some files to the packaging directory
     mkdir -p $(TOP_DIR)/vips-packaging
-    $(foreach f,COPYING ChangeLog README.md AUTHORS, mv '$(SOURCE_DIR)/$f' '$(TOP_DIR)/vips-packaging';)
+    $(foreach f,COPYING ChangeLog README.md AUTHORS, cp '$(SOURCE_DIR)/$f' '$(TOP_DIR)/vips-packaging';)
 
     (printf '{\n'; \
      printf '  "cairo": "$(cairo_VERSION)",\n'; \