Update for 8.11.3

- Update GLib to 2.69.1. - Update libwebp to 1.2.1. - Update Pango to 1.48.8. - Update CFITSIO to 4.0.0. - Update highway to 0.14.0. - Update libjxl to 0.5. - Update OpenEXR to 3.1.1. - Update libjpeg-turbo to 2.1.1. - Update MinGW-w64 to the latest master version.
libvips · Aug 14, 2021 · a935810 · a935810
1 parent 511d8fc
commit a935810
Show file tree

Hide file tree

Showing 16 changed files with 210 additions and 355 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [freetype]      | 2.10.4    | [freetype Licence] (BSD-like)                                |
 | [fribidi]       | 1.0.10    | LGPLv3                                                       |
 | [gdk-pixbuf]    | 2.42.6    | LGPLv3                                                       |
-| [glib]          | 2.69.0    | LGPLv3                                                       |
+| [glib]          | 2.69.1    | LGPLv3                                                       |
 | [harfbuzz]      | 2.8.2     | MIT Licence                                                  |
 | [lcms]          | 2.12      | MIT Licence                                                  |
 | [libexif]       | 0.6.22    | LGPLv3                                                       |
@@ -36,12 +36,12 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [librsvg]       | 2.51.4    | LGPLv3                                                       |
 | [libspng]       | 0.6.3     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.3.0     | [libtiff License] (BSD-like)                                 |
-| [libvips]       | 8.11.2    | LGPLv3                                                       |
-| [libwebp]       | 1.2.0     | New BSD License                                              |
+| [libvips]       | 8.11.3    | LGPLv3                                                       |
+| [libwebp]       | 1.2.1     | New BSD License                                              |
 | [libxml2]       | 2.9.12    | MIT Licence                                                  |
 | [mozjpeg]       | 4.0.3     | [zlib License, IJG License, BSD-3-Clause]                    |
 | [orc]           | 0.4.32    | [orc License] (BSD-like)                                     |
-| [pango]         | 1.48.7    | LGPLv3                                                       |
+| [pango]         | 1.48.8    | LGPLv3                                                       |
 | [pixman]        | 0.40.0    | MIT Licence                                                  |
 | [zlib-ng]       | 2.0.5     | [zlib-ng Licence]                                            |
 
@@ -90,23 +90,20 @@ Same as libvips-web + these extra dependencies:
 | Dependency      | Version   | Used under the terms of                                      |
 |-----------------|-----------|--------------------------------------------------------------|
 | [brotli]        | 1.0.9     | MIT Licence                                                  |
-| [cfitsio]       | 3.49      | BSD-like                                                     |
+| [cfitsio]       | 4.0.0     | BSD-like                                                     |
 | [fftw]          | 3.3.9     | GPLv2                                                        |
-| [highway]       | [36c56ab] | Apache-2.0 License                                           |
+| [highway]       | 0.14.0    | Apache-2.0 License                                           |
 | [imagemagick]   | 6.9.12-19 | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.1.2     | BSD 3-Clause                                                 |
-| [libjxl]        | [50660ed] | BSD 3-Clause                                                 |
+| [libjxl]        | 0.5       | BSD 3-Clause                                                 |
 | [matio]         | 1.5.21    | BSD 2-Clause                                                 |
 | [nifticlib]     | 2.0.0     | Public domain                                                |
-| [openexr]       | 3.1.0     | BSD 3-Clause                                                 |
+| [openexr]       | 3.1.1     | BSD 3-Clause                                                 |
 | [openjpeg]      | 2.4.0     | BSD 2-Clause                                                 |
 | [openslide]     | 3.4.1     | LGPLv3                                                       |
 | [poppler]       | 21.08.0   | GPLv2                                                        |
 | [sqlite]        | 3.36.0    | Public domain                                                |
 
-[36c56ab]: https://github.com/google/highway/commit/36c56ab76ac3c7cf57635d23228706669e8e48b0
-[50660ed]: https://github.com/libjxl/libjxl/commit/50660ed82c9f66570b469bc4d1ab7172524e637a
-
 [brotli]: https://github.com/google/brotli
 [cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/
 [fftw]: https://github.com/FFTW/fftw3
@@ -137,7 +134,7 @@ In that case, the following version of libjpeg-turbo is built:
 
 | Dependency      | Version   | Used under the terms of                                      |
 |-----------------|-----------|--------------------------------------------------------------|
-| [libjpeg-turbo] | 2.1.0     | [zlib License, IJG License]                                  |
+| [libjpeg-turbo] | 2.1.1     | [zlib License, IJG License]                                  |
 
 [libjpeg-turbo]: https://github.com/libjpeg-turbo/libjpeg-turbo
 [zlib License, IJG License]: https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/LICENSE.md

diff --git a/build/highway.mk b/build/highway.mk
@@ -2,11 +2,10 @@ PKG             := highway
 $(PKG)_WEBSITE  := https://github.com/google/highway
 $(PKG)_DESCR    := Performance-portable, length-agnostic SIMD with runtime dispatch
 $(PKG)_IGNORE   :=
-# https://github.com/google/highway/tarball/36c56ab76ac3c7cf57635d23228706669e8e48b0
-$(PKG)_VERSION  := 36c56ab
-$(PKG)_CHECKSUM := afecc08a39ed43333aed3bf1caef6d1dbc0b71c53ad13e4ee88b314d9d081b62
+$(PKG)_VERSION  := 0.14.0
+$(PKG)_CHECKSUM := 00ca110e15f634e81e931592ab7c902a58a006224dfcda70c05939c106890ca7
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/highway-[0-9]*.patch)))
-$(PKG)_GH_CONF  := google/highway/branches/master
+$(PKG)_GH_CONF  := google/highway/tags
 $(PKG)_DEPS     := cc
 
 define $(PKG)_BUILD

diff --git a/build/libjxl.mk b/build/libjxl.mk
@@ -2,11 +2,10 @@ PKG             := libjxl
 $(PKG)_WEBSITE  := https://github.com/libjxl/libjxl
 $(PKG)_DESCR    := JPEG XL image format reference implementation
 $(PKG)_IGNORE   :=
-# https://github.com/libjxl/libjxl/tarball/50660ed82c9f66570b469bc4d1ab7172524e637a
-$(PKG)_VERSION  := 50660ed
-$(PKG)_CHECKSUM := 6a3780534026093e68597106505abfcd461d95b2c2563dbce28ffc2341f095b7
+$(PKG)_VERSION  := 0.5
+$(PKG)_CHECKSUM := 911cb4b50eb621131ca22382166f40d4914a4ff4453dd299ade1e3292f311f89
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjxl-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libjxl/libjxl/branches/main
+$(PKG)_GH_CONF  := libjxl/libjxl/tags,v
 $(PKG)_DEPS     := cc brotli highway lcms libjpeg-turbo libpng
 
 define $(PKG)_BUILD

diff --git a/build/overrides.mk b/build/overrides.mk
@@ -54,8 +54,8 @@ librsvg_FILE     := librsvg-$(librsvg_VERSION).tar.xz
 librsvg_URL      := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,librsvg)/$(librsvg_FILE)
 
 # upstream version is 1.37.4
-pango_VERSION  := 1.48.7
-pango_CHECKSUM := 28a82f6a6cab60aa3b75a90f04197ead2d311fa8fe8b7bfdf8666e2781d506dc
+pango_VERSION  := 1.48.8
+pango_CHECKSUM := 009d9d830ecbe11911d6637e48eec1c51390d3d12eb286035ef7c641f3c87410
 pango_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pango-[0-9]*.patch)))
 pango_SUBDIR   := pango-$(pango_VERSION)
 pango_FILE     := pango-$(pango_VERSION).tar.xz
@@ -71,9 +71,17 @@ fribidi_SUBDIR   := fribidi-$(fribidi_VERSION)
 fribidi_FILE     := fribidi-$(fribidi_VERSION).tar.xz
 fribidi_URL      := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE)
 
+# upstream version is 1.2.0
+libwebp_VERSION  := 1.2.1
+libwebp_CHECKSUM := 808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018
+libwebp_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libwebp-[0-9]*.patch)))
+libwebp_SUBDIR   := libwebp-$(libwebp_VERSION)
+libwebp_FILE     := libwebp-$(libwebp_VERSION).tar.gz
+libwebp_URL      := http://downloads.webmproject.org/releases/webp/$(libwebp_FILE)
+
 # upstream version is 2.50.2
-glib_VERSION  := 2.69.0
-glib_CHECKSUM := 1cdb3fd8610f3c57b6622e5cd68e0a3210561d80b0eceb971eb51fb8b63dbfae
+glib_VERSION  := 2.69.1
+glib_CHECKSUM := f92f34057a091fc8638d91f10cece842cb8618e9a1090b0ddb19cc15a21bf39c
 glib_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
 glib_SUBDIR   := glib-$(glib_VERSION)
 glib_FILE     := glib-$(glib_VERSION).tar.xz
@@ -87,6 +95,15 @@ libgsf_SUBDIR   := libgsf-$(libgsf_VERSION)
 libgsf_FILE     := libgsf-$(libgsf_VERSION).tar.xz
 libgsf_URL      := https://download.gnome.org/sources/libgsf/$(call SHORT_PKG_VERSION,libgsf)/$(libgsf_FILE)
 
+# Override libjpeg-turbo patch with our own
+# upstream version is 2.1.0
+libjpeg-turbo_VERSION  := 2.1.1
+libjpeg-turbo_CHECKSUM := b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+libjpeg-turbo_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjpeg-turbo-[0-9]*.patch)))
+libjpeg-turbo_SUBDIR   := libjpeg-turbo-$(libjpeg-turbo_VERSION)
+libjpeg-turbo_FILE     := libjpeg-turbo-$(libjpeg-turbo_VERSION).tar.gz
+libjpeg-turbo_URL      := https://$(SOURCEFORGE_MIRROR)/project/libjpeg-turbo/$(libjpeg-turbo_VERSION)/$(libjpeg-turbo_FILE)
+
 # upstream version is 1.16.0
 cairo_VERSION  := 1.17.4
 cairo_CHECKSUM := 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705
@@ -98,16 +115,16 @@ cairo_URL      := http://cairographics.org/snapshots/$(cairo_FILE)
 # upstream version is 2.2.0
 # cannot use GH_CONF:
 # openexr_GH_CONF  := AcademySoftwareFoundation/openexr/tags
-openexr_VERSION  := 3.1.0
-openexr_CHECKSUM := 8c2ff765368a28e8210af741ddf91506cef40f1ed0f1a08b6b73bb3a7faf8d93
+openexr_VERSION  := 3.1.1
+openexr_CHECKSUM := 045254e201c0f87d1d1a4b2b5815c4ae54845af2e6ec0ab88e979b5fdb30a86e
 openexr_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/openexr-[0-9]*.patch)))
 openexr_SUBDIR   := openexr-$(openexr_VERSION)
 openexr_FILE     := openexr-$(openexr_VERSION).tar.gz
 openexr_URL      := https://github.com/AcademySoftwareFoundation/openexr/archive/v$(openexr_VERSION).tar.gz
 
 # upstream version is 3410
-cfitsio_VERSION  := 3.49
-cfitsio_CHECKSUM := 5b65a20d5c53494ec8f638267fca4a629836b7ac8dd0ef0266834eab270ed4b3
+cfitsio_VERSION  := 4.0.0
+cfitsio_CHECKSUM := b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e
 cfitsio_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/cfitsio-[0-9]*.patch)))
 cfitsio_SUBDIR   := cfitsio-$(cfitsio_VERSION)
 cfitsio_FILE     := cfitsio-$(cfitsio_VERSION).tar.gz
@@ -155,9 +172,18 @@ nasm_FILE     := nasm-$(nasm_VERSION).tar.xz
 nasm_URL      := https://www.nasm.us/pub/nasm/releasebuilds/$(nasm_VERSION)/$(nasm_FILE)
 nasm_URL_2    := https://sources.voidlinux.org/nasm-$(nasm_VERSION)/$(nasm_FILE)
 
+# upstream version is 9.0.0
+# Update MinGW-w64 to 4613211
+# https://github.com/mirror/mingw-w64/tarball/4613211c6bfcb220dec9a116a76c5c9aff1939a3
+mingw-w64_VERSION  := 4613211
+mingw-w64_CHECKSUM := 8062c83070a599b3480e1ee128438350d476e5f79d53a2130b6a9502aa9bb6aa
+mingw-w64_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/mingw-w64-[0-9]*.patch)))
+mingw-w64_SUBDIR   := mirror-mingw-w64-$(mingw-w64_VERSION)
+mingw-w64_FILE     := mirror-mingw-w64-$(mingw-w64_VERSION).tar.gz
+mingw-w64_URL      := https://github.com/mirror/mingw-w64/tarball/$(mingw-w64_VERSION)/$(mingw-w64_FILE)
+
 ## Patches that we override with our own
 
-libjpeg-turbo_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjpeg-turbo-[0-9]*.patch)))
 tiff_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/tiff-[0-9]*.patch)))
 lcms_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/lcms-[0-9]*.patch)))
 
@@ -710,7 +736,7 @@ endef
 define cfitsio_BUILD_SHARED
     cd '$(BUILD_DIR)' && $(TARGET)-cmake \
         -DBUILD_SHARED_LIBS=ON \
-        -DUseCurl=OFF \
+        -DUSE_CURL=OFF \
         '$(SOURCE_DIR)'
 
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'

diff --git a/build/patches/cfitsio-3-fixes.patch b/build/patches/cfitsio-3-fixes.patch
diff --git a/build/patches/cfitsio-4-fixes.patch b/build/patches/cfitsio-4-fixes.patch
@@ -0,0 +1,56 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kleis Auke Wolthuizen <[email protected]>
+Date: Thu, 26 Dec 2019 20:00:00 +0100
+Subject: [PATCH 1/2] Don't install the library in lib/
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -275,7 +275,6 @@ IF (BZIP2_FOUND)
+ ENDIF(BZIP2_FOUND)
+
+ SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_MAJOR_VERSION})
+-install(TARGETS ${LIB_NAME} DESTINATION ${LIB_DESTINATION})
+ install(TARGETS ${LIB_NAME}
+                             RUNTIME DESTINATION bin
+                             LIBRARY DESTINATION lib
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kleis Auke Wolthuizen <[email protected]>
+Date: Fri, 3 Jul 2020 19:00:00 +0200
+Subject: [PATCH 2/2] Fix .pc files
+
+
+diff --git a/cfitsio.pc.cmake b/cfitsio.pc.cmake
+index 1111111..2222222 100644
+--- a/cfitsio.pc.cmake
++++ b/cfitsio.pc.cmake
+@@ -6,7 +6,8 @@ includedir=@INCLUDE_INSTALL_DIR@
+ Name: cfitsio
+ Description: FITS File Subroutine Library
+ URL: https://heasarc.gsfc.nasa.gov/fitsio/
+-Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@
+-Libs: -L${libdir} @PKG_CONFIG_LIBS@
++Version: @CFITSIO_VERSION@
++Requires.private: zlib
++Libs: -L${libdir} -lcfitsio
+ Libs.private: -lm
+ Cflags: -I${includedir}
+diff --git a/cfitsio.pc.in b/cfitsio.pc.in
+index 1111111..2222222 100644
+--- a/cfitsio.pc.in
++++ b/cfitsio.pc.in
+@@ -7,6 +7,7 @@ Name: cfitsio
+ Description: FITS File Subroutine Library
+ URL: https://heasarc.gsfc.nasa.gov/fitsio/
+ Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@
++Requires.private: zlib
+ Libs: -L${libdir} -lcfitsio
+ Libs.private: -lm @LIBS@
+ Cflags: -I${includedir}
diff --git a/build/patches/glib-2-fixes.patch b/build/patches/glib-2-fixes.patch
@@ -95,7 +95,7 @@ diff --git a/gio/tests/meson.build b/gio/tests/meson.build
 index 1111111..2222222 100644
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -453,7 +453,7 @@ gdbus_example_objectmanager_sources = files(
+@@ -454,7 +454,7 @@ gdbus_example_objectmanager_sources = files(
    'gdbus-example-objectmanager-server.c',
  )
 
@@ -104,7 +104,7 @@ index 1111111..2222222 100644
    test_extra_programs += {
      # These three are manual-run tests because they need a session bus but don't bring one up themselves
      # FIXME: these build but don't seem to work!
-@@ -567,7 +567,7 @@ if installed_tests_enabled
+@@ -568,7 +568,7 @@ if installed_tests_enabled
    endforeach
  endif
 

diff --git a/build/patches/glib-2-without-gregex.patch b/build/patches/glib-2-without-gregex.patch
@@ -103,7 +103,7 @@ diff --git a/gobject/gboxed.c b/gobject/gboxed.c
 index ae48df566..9f1ca04c8 100644
 --- a/gobject/gboxed.c
 +++ b/gobject/gboxed.c
-@@ -147,9 +147,6 @@ G_DEFINE_BOXED_TYPE (GByteArray, g_byte_array, g_byte_array_ref, g_byte_array_un
+@@ -148,9 +148,6 @@ G_DEFINE_BOXED_TYPE (GByteArray, g_byte_array, g_byte_array_ref, g_byte_array_un
  G_DEFINE_BOXED_TYPE (GBytes, g_bytes, g_bytes_ref, g_bytes_unref)
  G_DEFINE_BOXED_TYPE (GTree, g_tree, g_tree_ref, g_tree_unref)