From 57f748130cd1eff67724102df164850cdbb0d40e Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 9 Jan 2023 12:11:37 +0100 Subject: [PATCH] Update for 8.14.1 - Update GLib to 2.75.2. - Update libheif to 1.14.2. MXE Updates: - Update Poppler to 23.01.0. --- README.md | 8 ++++---- build/build.sh | 2 +- build/libheif.mk | 4 ++-- build/overrides.mk | 4 ++-- build/patches/glib-2-fixes.patch | 8 ++++---- build/patches/glib-2-without-gregex.patch | 12 ++++++++---- build/plugins/llvm-mingw/rust.mk | 6 +++--- build/variables.sh | 2 +- build/vips-all.mk | 4 ++-- build/vips-web.mk | 4 ++-- 10 files changed, 29 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index de637cdf..7dafaff1 100644 --- a/README.md +++ b/README.md @@ -25,19 +25,19 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help. | [freetype] | 2.12.1 | [freetype Licence] (BSD-like) | | [fribidi] | 1.0.12 | LGPLv3 | | [gdk-pixbuf] | 2.42.10 | LGPLv3 | -| [glib] | 2.75.1 | LGPLv3 | +| [glib] | 2.75.2 | LGPLv3 | | [harfbuzz] | 6.0.0 | MIT Licence | | [lcms] | 2.14 | MIT Licence | | [libexif] | 0.6.24 | LGPLv3 | | [libffi] | 3.4.4 | MIT Licence | | [libgsf] | 1.14.50 | LGPLv3 | -| [libheif] | 1.14.0 | LGPLv3 | +| [libheif] | 1.14.2 | LGPLv3 | | [libimagequant] | 2.4.1ยน | BSD 2-Clause | | [libpng] | 1.6.39 | [libpng License version 2] | | [librsvg] | 2.55.90 | LGPLv3 | | [libspng] | 0.7.3 | BSD 2-Clause | | [libtiff] | 4.5.0 | [libtiff License] (BSD-like) | -| [libvips] | 8.14.0 | LGPLv3 | +| [libvips] | 8.14.1 | LGPLv3 | | [libwebp] | 1.2.4 | New BSD License | | [libxml2] | 2.10.3 | MIT Licence | | [mozjpeg] | 4.1.1 | [zlib License, IJG License, BSD-3-Clause] | @@ -105,7 +105,7 @@ Same as libvips-web + these extra dependencies: | [openexr] | 3.1.5 | BSD 3-Clause | | [openjpeg] | 2.5.0 | BSD 2-Clause | | [openslide] | 3.4.1 | LGPLv3 | -| [poppler] | 22.12.0 | GPLv2 | +| [poppler] | 23.01.0 | GPLv2 | | [sqlite] | 3.40.1 | Public domain | [brotli]: https://github.com/google/brotli diff --git a/build/build.sh b/build/build.sh index 6ac4f7f9..3acb0c2a 100755 --- a/build/build.sh +++ b/build/build.sh @@ -51,7 +51,7 @@ fi # Always checkout a particular revision which will successfully build. # This ensures that it will not suddenly break a build. # Note: Must be regularly updated. -revision="4a25150234b9c5f0c7cf4baeae5064d910bec567" +revision="d9d6278894c6d50bfca638857fe86a96335c56e6" initialize=false if [ -f "$mxe_dir/Makefile" ]; then diff --git a/build/libheif.mk b/build/libheif.mk index 2f23f643..a6ceb85a 100644 --- a/build/libheif.mk +++ b/build/libheif.mk @@ -2,8 +2,8 @@ PKG := libheif $(PKG)_WEBSITE := http://www.libheif.org/ $(PKG)_DESCR := libheif is a ISO/IEC 23008-12:2017 HEIF file format decoder and encoder. $(PKG)_IGNORE := -$(PKG)_VERSION := 1.14.0 -$(PKG)_CHECKSUM := 9a2b969d827e162fa9eba582ebd0c9f6891f16e426ef608d089b1f24962295b5 +$(PKG)_VERSION := 1.14.2 +$(PKG)_CHECKSUM := d016905e247d6952cd7ee4f9b90957350b6a6caa466bc76fdfe6eb302b6d088c $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch))) $(PKG)_GH_CONF := strukturag/libheif/releases,v $(PKG)_DEPS := cc aom diff --git a/build/overrides.mk b/build/overrides.mk index 841ed74b..af72b8c4 100644 --- a/build/overrides.mk +++ b/build/overrides.mk @@ -52,8 +52,8 @@ pango_FILE := pango-$(pango_VERSION).tar.xz pango_URL := https://download.gnome.org/sources/pango/$(call SHORT_PKG_VERSION,pango)/$(pango_FILE) # upstream version is 2.70.2 -glib_VERSION := 2.75.1 -glib_CHECKSUM := 96fd22355a542cca96c31082f2d09b72cb5a3454b6ea60c1be17c987a18a6b93 +glib_VERSION := 2.75.2 +glib_CHECKSUM := 360d6fb75202c0eb0d07f0ab812b19b526f1c05ccc0a8ed7e5d2c988616d343a 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 diff --git a/build/patches/glib-2-fixes.patch b/build/patches/glib-2-fixes.patch index c7225c3c..b85e6dcc 100644 --- a/build/patches/glib-2-fixes.patch +++ b/build/patches/glib-2-fixes.patch @@ -15,7 +15,7 @@ diff --git a/meson.build b/meson.build index 1111111..2222222 100644 --- a/meson.build +++ b/meson.build -@@ -2097,11 +2097,11 @@ if libintl.found() +@@ -2101,11 +2101,11 @@ if libintl.found() # # Meson's builtin dependency lookup as of 0.60.0 doesn't check for # pthread, so we do this manually here. @@ -29,15 +29,15 @@ index 1111111..2222222 100644 libintl_deps += [libintl, libintl_pthread] else libintl = disabler() -@@ -2110,7 +2110,7 @@ if libintl.found() +@@ -2114,7 +2114,7 @@ if libintl.found() endif if libintl.found() - have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps) + have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', prefix: '#include ', dependencies: libintl_deps) else - libintl = subproject('proxy-libintl').get_variable('intl_dep') - libintl_deps = [libintl] + libintl = dependency('intl', allow_fallback: true) + assert(libintl.type_name() == 'internal') From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen diff --git a/build/patches/glib-2-without-gregex.patch b/build/patches/glib-2-without-gregex.patch index 35e71860..27290bbd 100644 --- a/build/patches/glib-2-without-gregex.patch +++ b/build/patches/glib-2-without-gregex.patch @@ -182,11 +182,12 @@ diff --git a/meson.build b/meson.build index 1111111..2222222 100644 --- a/meson.build +++ b/meson.build -@@ -2038,40 +2038,6 @@ else +@@ -2038,44 +2038,6 @@ else libiconv = dependency('iconv') endif --pcre2 = dependency('libpcre2-8', version: '>= 10.32', required : false) +-pcre2_req = '>=10.32' +-pcre2 = dependency('libpcre2-8', version: pcre2_req, required: false, allow_fallback: false) -if not pcre2.found() - if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' - # MSVC: Search for the PCRE2 library by the configuration, which corresponds @@ -202,8 +203,11 @@ index 1111111..2222222 100644 - -# Try again with the fallback -if not pcre2.found() -- pcre2 = dependency('libpcre2-8', required : true, fallback : ['pcre2', 'libpcre2_8']) -- use_pcre2_static_flag = true +- pcre2 = dependency('libpcre2-8', version: pcre2_req, allow_fallback: true) +- assert(pcre2.type_name() == 'internal') +- # static flags are automatically enabled by the subproject if it's built +- # with default_library=static +- use_pcre2_static_flag = false -elif host_system == 'windows' - pcre2_static = cc.links('''#define PCRE2_STATIC - #define PCRE2_CODE_UNIT_WIDTH 8 diff --git a/build/plugins/llvm-mingw/rust.mk b/build/plugins/llvm-mingw/rust.mk index 53f15e05..d0d789aa 100644 --- a/build/plugins/llvm-mingw/rust.mk +++ b/build/plugins/llvm-mingw/rust.mk @@ -2,13 +2,13 @@ PKG := rust $(PKG)_WEBSITE := https://www.rust-lang.org/ $(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency. $(PKG)_IGNORE := -# https://static.rust-lang.org/dist/2023-01-01/rustc-nightly-src.tar.xz.sha256 +# https://static.rust-lang.org/dist/2023-01-09/rustc-nightly-src.tar.xz.sha256 $(PKG)_VERSION := nightly -$(PKG)_CHECKSUM := 8bba8e7db1041edbe31dce7929ee1d7baac5ccfead6c91f60027918fa5354055 +$(PKG)_CHECKSUM := 4a867fba6202c608da83fd968f30d35136e9d3461d5c491dc75a336e33b2d762 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch))) $(PKG)_SUBDIR := $(PKG)c-$($(PKG)_VERSION)-src $(PKG)_FILE := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz -$(PKG)_URL := https://static.rust-lang.org/dist/2023-01-01/$($(PKG)_FILE) +$(PKG)_URL := https://static.rust-lang.org/dist/2023-01-09/$($(PKG)_FILE) $(PKG)_DEPS := $(BUILD)~$(PKG) $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) diff --git a/build/variables.sh b/build/variables.sh index b914b9ee..3ade954f 100755 --- a/build/variables.sh +++ b/build/variables.sh @@ -2,7 +2,7 @@ vips_package=vips vips_version=8.14 -vips_patch_version=0 +vips_patch_version=1 #vips_pre_version=rc1 if [ -n "$GIT_COMMIT" ]; then diff --git a/build/vips-all.mk b/build/vips-all.mk index 33695f05..acbc6047 100644 --- a/build/vips-all.mk +++ b/build/vips-all.mk @@ -2,8 +2,8 @@ PKG := vips-all $(PKG)_WEBSITE := https://libvips.github.io/libvips/ $(PKG)_DESCR := A fast image processing library with low memory needs. $(PKG)_IGNORE := -$(PKG)_VERSION := 8.14.0 -$(PKG)_CHECKSUM := 3bd9813956e6360e6d425f03deca08f4cc91cf1f4cd4ca944ca0664f218da0f3 +$(PKG)_VERSION := 8.14.1 +$(PKG)_CHECKSUM := 5abde2a61f99ced7be4c32ccb13a654256eb7a0f6f0520ab61cc11412a1233fa $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) $(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz $(PKG)_SUBDIR := vips-$($(PKG)_VERSION) diff --git a/build/vips-web.mk b/build/vips-web.mk index d702f8b8..57ab9ba9 100644 --- a/build/vips-web.mk +++ b/build/vips-web.mk @@ -2,8 +2,8 @@ PKG := vips-web $(PKG)_WEBSITE := https://libvips.github.io/libvips/ $(PKG)_DESCR := A fast image processing library with low memory needs. $(PKG)_IGNORE := -$(PKG)_VERSION := 8.14.0 -$(PKG)_CHECKSUM := 3bd9813956e6360e6d425f03deca08f4cc91cf1f4cd4ca944ca0664f218da0f3 +$(PKG)_VERSION := 8.14.1 +$(PKG)_CHECKSUM := 5abde2a61f99ced7be4c32ccb13a654256eb7a0f6f0520ab61cc11412a1233fa $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) $(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz $(PKG)_SUBDIR := vips-$($(PKG)_VERSION)