Update for 8.11.0

- Update aom to 3.1.1.
libvips · Jun 10, 2021 · 6e10efa · 6e10efa
1 parent 03d5059
commit 6e10efa
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 
 | Dependency      | Version   | Used under the terms of                                      |
 |-----------------|-----------|--------------------------------------------------------------|
-| [aom]           | 3.1.0     | BSD 2-Clause + [Alliance for Open Media Patent License 1.0]  |
+| [aom]           | 3.1.1     | BSD 2-Clause + [Alliance for Open Media Patent License 1.0]  |
 | [cairo]         | 1.17.4    | Mozilla Public License 2.0                                   |
 | [expat]         | 2.4.1     | MIT Licence                                                  |
 | [fontconfig]    | 2.13.93   | [fontconfig Licence] (BSD-like)                              |
@@ -36,7 +36,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [librsvg]       | 2.51.2    | LGPLv3                                                       |
 | [libspng]       | 0.6.3     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.3.0     | [libtiff License] (BSD-like)                                 |
-| [libvips]       | 8.11.0²   | LGPLv3                                                       |
+| [libvips]       | 8.11.0    | LGPLv3                                                       |
 | [libwebp]       | 1.2.0     | New BSD License                                              |
 | [libxml2]       | 2.9.12    | MIT Licence                                                  |
 | [mozjpeg]       | 4.0.3     | [zlib License, IJG License, BSD-3-Clause]                    |
@@ -46,8 +46,6 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [zlib-ng]       | 2.0.3     | [zlib-ng Licence]                                            |
 
 ¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used.  
-² libvips is built from the [`v8.11.0-rc1`](https://github.com/libvips/libvips/tree/v8.11.0-rc1) tag, see:
-https://github.com/libvips/libvips/releases/tag/v8.11.0-rc1
 
 [aom]: https://aomedia.googlesource.com/aom/
 [Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/
@@ -94,10 +92,10 @@ Same as libvips-web + these extra dependencies:
 | [brotli]        | 1.0.9     | MIT Licence                                                  |
 | [cfitsio]       | 3.49      | BSD-like                                                     |
 | [fftw]          | 3.3.9     | GPLv2                                                        |
-| [highway]       | e8ab731   | Apache-2.0 License                                           |
+| [highway]       | [e8ab731] | Apache-2.0 License                                           |
 | [imagemagick]   | 6.9.12-14 | [ImageMagick License] (GPL-like)                             |
 | [imath]         | 3.0.4     | BSD 3-Clause                                                 |
-| [libjxl]        | 91204ed   | BSD 3-Clause                                                 |
+| [libjxl]        | [91204ed] | BSD 3-Clause                                                 |
 | [matio]         | 1.5.21    | BSD 2-Clause                                                 |
 | [nifticlib]     | 2.0.0     | Public domain                                                |
 | [openexr]       | 3.0.4     | BSD 3-Clause                                                 |
@@ -106,6 +104,9 @@ Same as libvips-web + these extra dependencies:
 | [poppler]       | 21.06.1   | GPLv2                                                        |
 | [sqlite]        | 3.35.5    | Public domain                                                |
 
+[e8ab731]: https://github.com/google/highway/commit/e8ab731e4eff6df5415771518345af85f9bffa0f
+[91204ed]: https://github.com/libjxl/libjxl/commit/91204ed4521a304f983163137283d35c7021de5b
+
 [brotli]: https://github.com/google/brotli
 [cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/
 [fftw]: https://github.com/FFTW/fftw3

diff --git a/build/aom.mk b/build/aom.mk
@@ -2,8 +2,8 @@ PKG             := aom
 $(PKG)_WEBSITE  := https://aomedia.googlesource.com/aom/
 $(PKG)_DESCR    := AV1 Codec Library
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.1.0
-$(PKG)_CHECKSUM := b1d51efbfd25a335e0dfe56eb62b65e63e3f52ce0c6bc9c8e303229dde3fe7a4
+$(PKG)_VERSION  := 3.1.1
+$(PKG)_CHECKSUM := 7cd5e8e469268c37241df93fe61557ea0dc46980ca21b37e786e92a3d0729276
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_FILE     := libaom-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://storage.googleapis.com/aom-releases/$($(PKG)_FILE)

diff --git a/build/patches/aom-2-fixes.patch b/build/patches/aom-2-fixes.patch
@@ -12,7 +12,7 @@ diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake
 index 1111111..2222222 100644
 --- a/build/cmake/aom_install.cmake
 +++ b/build/cmake/aom_install.cmake
-@@ -83,16 +83,21 @@ macro(setup_aom_install_targets)
+@@ -84,16 +84,21 @@ macro(setup_aom_install_targets)
      # Setup the install rules.
      install(
        FILES ${AOM_INSTALL_INCS}
@@ -218,7 +218,7 @@ diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
 index 1111111..2222222 100644
 --- a/av1/encoder/encoder.c
 +++ b/av1/encoder/encoder.c
-@@ -3380,6 +3380,7 @@ static int encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,
+@@ -3386,6 +3386,7 @@ static int encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,
    return AOM_CODEC_OK;
  }
 

diff --git a/build/variables.sh b/build/variables.sh
@@ -3,7 +3,7 @@
 vips_package=vips
 vips_version=8.11
 vips_patch_version=0
-vips_pre_version=rc1
+#vips_pre_version=rc1
 
 # build-win64-mxe/build dir we are building
 work_dir=$(pwd)

diff --git a/build/vips-all.mk b/build/vips-all.mk
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 8.11.0
-$(PKG)_CHECKSUM := 3d0bcffc0e00ce339fe151fd201b9d4318a7fa1a090fcd12e0e673e42817fc86
+$(PKG)_CHECKSUM := 6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc1,,,-rc1.tar.gz
+$(PKG)_GH_CONF  := libvips/libvips/releases,v
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)
-$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc1.tar.gz
+$(PKG)_FILE     := vips-$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := cc libwebp librsvg glib pango libgsf \
                    libjpeg-turbo tiff lcms libexif libheif libpng \
                    libspng libimagequant orc imagemagick matio openexr \

diff --git a/build/vips-web.mk b/build/vips-web.mk
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 8.11.0
-$(PKG)_CHECKSUM := 3d0bcffc0e00ce339fe151fd201b9d4318a7fa1a090fcd12e0e673e42817fc86
+$(PKG)_CHECKSUM := 6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc1,,,-rc1.tar.gz
+$(PKG)_GH_CONF  := libvips/libvips/releases,v
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)
-$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc1.tar.gz
+$(PKG)_FILE     := vips-$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := cc libwebp librsvg glib pango libgsf \
                    libjpeg-turbo tiff lcms libexif libheif libpng \
                    libspng libimagequant orc