diff --git a/README.md b/README.md index 51d3b44c..3cf9700f 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,14 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help. |-----------------|-----------|--------------------------------------------------------------| | [aom] | 3.2.0 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] | | [cairo] | 1.17.4 | Mozilla Public License 2.0 | +| [cgif] | 0.0.2 | MIT Licence | | [expat] | 2.4.1 | MIT Licence | | [fontconfig] | 2.13.94 | [fontconfig Licence] (BSD-like) | | [freetype] | 2.11.0 | [freetype Licence] (BSD-like) | | [fribidi] | 1.0.11 | LGPLv3 | | [gdk-pixbuf] | 2.42.6 | LGPLv3 | | [glib] | 2.70.1 | LGPLv3 | -| [harfbuzz] | 3.0.0 | MIT Licence | +| [harfbuzz] | 3.1.1 | MIT Licence | | [lcms] | 2.12 | MIT Licence | | [libexif] | 0.6.23 | LGPLv3 | | [libffi] | 3.4.2 | MIT Licence | @@ -33,24 +34,27 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help. | [libheif] | 1.12.0 | LGPLv3 | | [libimagequant] | 2.4.1¹ | BSD 2-Clause | | [libpng] | 1.6.37 | [libpng License version 2] | -| [librsvg] | 2.52.3 | LGPLv3 | +| [librsvg] | 2.52.4 | LGPLv3 | | [libspng] | 0.7.0 | BSD 2-Clause | | [libtiff] | 4.3.0 | [libtiff License] (BSD-like) | -| [libvips] | 8.11.4 | LGPLv3 | +| [libvips] | 8.12.0² | 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.49.1 | LGPLv3 | +| [pango] | 1.49.3 | LGPLv3 | | [pixman] | 0.40.0 | MIT Licence | | [proxy-libintl] | 0.2 | LGPLv3 | | [zlib-ng] | 2.0.5 | [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.12.0-rc1`](https://github.com/libvips/libvips/tree/v8.12.0-rc1) tag, see: +https://github.com/libvips/libvips/releases/tag/v8.12.0-rc1 [aom]: https://aomedia.googlesource.com/aom/ [Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/ [cairo]: https://gitlab.freedesktop.org/cairo/cairo +[cgif]: https://github.com/dloebl/cgif [expat]: https://github.com/libexpat/libexpat [fontconfig]: https://gitlab.freedesktop.org/fontconfig/fontconfig [fontconfig Licence]: https://gitlab.freedesktop.org/fontconfig/fontconfig/blob/master/COPYING @@ -95,15 +99,15 @@ Same as libvips-web + these extra dependencies: | [cfitsio] | 4.0.0 | BSD-like | | [fftw] | 3.3.10 | GPLv2 | | [highway] | 0.14.2 | Apache-2.0 License | -| [imagemagick] | 6.9.12-27 | [ImageMagick License] (Apache-2.0-like) | +| [imagemagick] | 6.9.12-28 | [ImageMagick License] (Apache-2.0-like) | | [imath] | 3.1.3 | BSD 3-Clause | -| [libjxl] | 0.6 | BSD 3-Clause | +| [libjxl] | 0.6.1 | BSD 3-Clause | | [matio] | 1.5.21 | BSD 2-Clause | | [nifticlib] | 2.0.0 | Public domain | | [openexr] | 3.1.3 | BSD 3-Clause | | [openjpeg] | 2.4.0 | BSD 2-Clause | | [openslide] | 3.4.1 | LGPLv3 | -| [poppler] | 21.10.0 | GPLv2 | +| [poppler] | 21.11.0 | GPLv2 | | [sqlite] | 3.36.0 | Public domain | [brotli]: https://github.com/google/brotli diff --git a/build/build.sh b/build/build.sh index ae8df7d2..ee406597 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="4d7331c95f14a9db5a66033c5c81d2e8dfb343f8" +revision="02852a7b690aa411ce2a2089deea25a7292a33d6" initialize=false if [ -f "$mxe_dir/Makefile" ]; then diff --git a/build/cgif.mk b/build/cgif.mk new file mode 100644 index 00000000..7ce299fd --- /dev/null +++ b/build/cgif.mk @@ -0,0 +1,19 @@ +PKG := cgif +$(PKG)_WEBSITE := https://github.com/dloebl/cgif +$(PKG)_DESCR := A fast and lightweight GIF encoder +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.0.2 +$(PKG)_CHECKSUM := 679e8012b9fe387086e6b3bcc42373dbc66fb26f8d070d7a1d23f39d42842258 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_GH_CONF := dloebl/cgif/tags,V +$(PKG)_DEPS := cc + +define $(PKG)_BUILD + '$(TARGET)-meson' \ + -Dtests=false \ + '$(SOURCE_DIR)' \ + '$(BUILD_DIR)' + + ninja -C '$(BUILD_DIR)' install +endef diff --git a/build/libjxl.mk b/build/libjxl.mk index 24e05241..e1f0b29c 100644 --- a/build/libjxl.mk +++ b/build/libjxl.mk @@ -2,8 +2,8 @@ PKG := libjxl $(PKG)_WEBSITE := https://github.com/libjxl/libjxl $(PKG)_DESCR := JPEG XL image format reference implementation $(PKG)_IGNORE := -$(PKG)_VERSION := 0.6 -$(PKG)_CHECKSUM := 89584e20c6e537d8d65d286fd6ae48d5d6abb087ca89f3207238d8d7e6ced4dc +$(PKG)_VERSION := 0.6.1 +$(PKG)_CHECKSUM := ccbd5a729d730152303be399f033b905e608309d5802d77a61a95faa092592c5 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjxl-[0-9]*.patch))) $(PKG)_GH_CONF := libjxl/libjxl/tags,v $(PKG)_DEPS := cc brotli highway lcms libjpeg-turbo libpng diff --git a/build/overrides.mk b/build/overrides.mk index 9e2cd0fa..82726302 100644 --- a/build/overrides.mk +++ b/build/overrides.mk @@ -40,22 +40,22 @@ matio_FILE := matio-$(matio_VERSION).tar.gz matio_URL := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE) # upstream version is 7, we want ImageMagick 6 -imagemagick_VERSION := 6.9.12-27 -imagemagick_CHECKSUM := 2dc8037c98e7cef54018bf12659a0a1602cb41c512e72763269fd4625361c069 +imagemagick_VERSION := 6.9.12-28 +imagemagick_CHECKSUM := 31564e017110287d675bb997233b73a6fb5bd62671ca7f708503d26232f8598b imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch))) imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags # upstream version is 2.40.5 -librsvg_VERSION := 2.52.3 -librsvg_CHECKSUM := 36e7f5bc88d78608ea7f6c05e4afe4acc1606b9af13c2845d4385073d082b8a4 +librsvg_VERSION := 2.52.4 +librsvg_CHECKSUM := 660ec8836a3a91587bc9384920132d4c38d1d1718c67fe160c5213fe4dec2928 librsvg_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/librsvg-[0-9]*.patch))) librsvg_SUBDIR := librsvg-$(librsvg_VERSION) 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.49.1 -pango_CHECKSUM := c4266dc06c01bf0133d3815502426d209de5ea7abd895899e73e7edebaf48f6f +pango_VERSION := 1.49.3 +pango_CHECKSUM := 45c403b89910a121ad8eb6d57b5be1d8f19499d39b686435dc6f29b106d2be93 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 @@ -139,8 +139,8 @@ fftw_FILE := fftw-$(fftw_VERSION).tar.gz fftw_URL := http://www.fftw.org/$(fftw_FILE) # upstream version is 21.06.1 -poppler_VERSION := 21.10.0 -poppler_CHECKSUM := 964b5b16290fbec3fae57c2a5bcdea49bb0736bd750c3a3711c47995c9efc394 +poppler_VERSION := 21.11.0 +poppler_CHECKSUM := 31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584 poppler_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch))) poppler_SUBDIR := poppler-$(poppler_VERSION) poppler_FILE := poppler-$(poppler_VERSION).tar.xz diff --git a/build/patches/cairo-1-fixes.patch b/build/patches/cairo-1-fixes.patch index 76ed2dd9..5df9aaaf 100644 --- a/build/patches/cairo-1-fixes.patch +++ b/build/patches/cairo-1-fixes.patch @@ -27,13 +27,17 @@ index 1111111..2222222 100644 unset cairo_cv_warn_cflags From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Kleis Auke Wolthuizen -Date: Wed, 12 Feb 2020 20:00:00 +0100 +From: Peter Wang +Date: Mon, 21 Oct 2019 12:22:44 +1100 Subject: [PATCH 2/3] Always define _cairo_utf8_to_utf16 on Windows _cairo_utf8_to_utf16 is used by _cairo_fopen on Windows so it must be defined even if Win32 fonts or other features are disabled. +Fixes #381 + +Upstream-Status: Accepted [https://gitlab.freedesktop.org/cairo/cairo/-/commit/bd54a1bf9805ebb7905b857d7234271ae496f904] + diff --git a/src/cairoint.h b/src/cairoint.h index 1111111..2222222 100644 --- a/src/cairoint.h diff --git a/build/patches/glib-2-fixes.patch b/build/patches/glib-2-fixes.patch index fee6399e..b6151fcc 100644 --- a/build/patches/glib-2-fixes.patch +++ b/build/patches/glib-2-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Wed, 1 Jul 2020 12:30:21 +0200 -Subject: [PATCH 1/2] Revert "meson: Fix underlinking of static libintl by trying +Subject: [PATCH 1/3] Revert "meson: Fix underlinking of static libintl by trying iconv and pthread" This reverts commit 56271ff27119f0b6b7dc6cc0c081d64bec06b473 as it causes @@ -88,7 +88,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 13 May 2019 18:00:00 +0200 -Subject: [PATCH 2/2] Disable some tests +Subject: [PATCH 2/3] Disable some tests diff --git a/gio/tests/meson.build b/gio/tests/meson.build @@ -113,3 +113,25 @@ index 1111111..2222222 100644 plugin_resources_c = custom_target('plugin-resources.c', input : 'test4.gresource.xml', + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Sun, 7 Nov 2021 00:22:21 +0100 +Subject: [PATCH 3/3] Fix link to pcre-8.37.tar.bz2 + +ftp.pcre.org FTP site is no longer available + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/glib/-/commit/e5dc299701df7189685d322cb709649ce3c9c81d] + +diff --git a/subprojects/libpcre.wrap b/subprojects/libpcre.wrap +index 1111111..2222222 100644 +--- a/subprojects/libpcre.wrap ++++ b/subprojects/libpcre.wrap +@@ -1,6 +1,6 @@ + [wrap-file] + directory = pcre-8.37 +-source_url = https://ftp.pcre.org/pub/pcre/pcre-8.37.tar.bz2 ++source_url = https://sourceforge.net/projects/pcre/files/pcre/8.37/pcre-8.37.tar.bz2 + source_filename = pcre-8.37.tar.bz2 + source_hash = 51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d + patch_filename = pcre_8.37-2_patch.zip diff --git a/build/patches/imath-3-fixes.patch b/build/patches/imath-3-fixes.patch index db0f50ea..2e30bb65 100644 --- a/build/patches/imath-3-fixes.patch +++ b/build/patches/imath-3-fixes.patch @@ -6,6 +6,9 @@ Subject: [PATCH 1/1] Make libraries private within the pkg-config file Assuming that Imath is built statically, this ensures that the libraries are not exposed during linking. +Upstream-Status: Inappropriate [other] +Upstream may still build it as a shared library. + diff --git a/config/Imath.pc.in b/config/Imath.pc.in index 1111111..2222222 100644 --- a/config/Imath.pc.in diff --git a/build/patches/lcms-2-fixes.patch b/build/patches/lcms-2-fixes.patch index 1c3e1da6..ccdcd0e0 100644 --- a/build/patches/lcms-2-fixes.patch +++ b/build/patches/lcms-2-fixes.patch @@ -3,6 +3,7 @@ From: Kleis Auke Wolthuizen Date: Fri, 4 Jun 2021 12:12:02 +0200 Subject: [PATCH 1/3] Ensure threadsafe alternative of gmtime is used +Upstream-Status: Accepted [https://github.com/mm2/Little-CMS/commit/45a7fea828e1fbaca3c11d1110eec65890231fd8] diff --git a/configure.ac b/configure.ac index 1111111..2222222 100644 @@ -70,6 +71,8 @@ Subject: [PATCH 2/3] Provide a thread-safe get time function Use the context pool mutex in the case of none of the re-entrant alternatives to gmtime() is available +Upstream-Status: Accepted [https://github.com/mm2/Little-CMS/commit/79e8395cd405daa9fc99d7ab154762718587887a] + diff --git a/src/cmsio0.c b/src/cmsio0.c index 1111111..2222222 100644 --- a/src/cmsio0.c @@ -169,6 +172,8 @@ being called on Windows 32-bit, which will not work. This commit also generally ensures that a threadsafe alternative is provided for toolchains targeting Windows i686. +Upstream-Status: Accepted [https://github.com/mm2/Little-CMS/commit/68ee2ffca663f2b705dc84614f37b179a81b826c] + diff --git a/configure.ac b/configure.ac index 1111111..2222222 100644 --- a/configure.ac diff --git a/build/patches/libgsf-1-fixes.patch b/build/patches/libgsf-1-fixes.patch index c1eff338..a54824ae 100644 --- a/build/patches/libgsf-1-fixes.patch +++ b/build/patches/libgsf-1-fixes.patch @@ -279,6 +279,7 @@ From: Morten Welinder Date: Sat, 2 May 2020 21:24:12 -0400 Subject: [PATCH 4/4] Compilation: fix win32 build +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libgsf/-/commit/8441d5863cb90ed48199d6976bc6e2fcfbe3365a] diff --git a/gsf/Makefile.am b/gsf/Makefile.am index 1111111..2222222 100644 diff --git a/build/patches/libheif-1-fixes.patch b/build/patches/libheif-1-fixes.patch index 9423e1ba..77404111 100644 --- a/build/patches/libheif-1-fixes.patch +++ b/build/patches/libheif-1-fixes.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Fri, 7 May 2021 21:43:51 +0100 -Subject: [PATCH 1/3] aom encoder: improve performance by ~2x using new 'all intra' +Subject: [PATCH 1/4] aom encoder: improve performance by ~2x using new 'all intra' mode Available from aom v3.1.0, this usage mode is considered the @@ -12,6 +12,8 @@ in significantly fewer memory allocations and halves CPU time. libavif has already adopted this as the default. +Upstream-Status: Accepted [https://github.com/strukturag/libheif/commit/de0c159a60c2c50931321f06e36a3b6640c5c807] + diff --git a/libheif/heif_encoder_aom.cc b/libheif/heif_encoder_aom.cc index 1111111..2222222 100644 --- a/libheif/heif_encoder_aom.cc @@ -32,8 +34,9 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sat, 8 May 2021 10:02:18 +0100 -Subject: [PATCH 2/3] aom: expose decoder error messages +Subject: [PATCH 2/4] aom: expose decoder error messages +Upstream-Status: Accepted [https://github.com/strukturag/libheif/commit/7e1c1888023f6dd68cf33e537e7eb8e4d5e17588] diff --git a/libheif/heif_decoder_aom.cc b/libheif/heif_decoder_aom.cc index 1111111..2222222 100644 @@ -60,10 +63,12 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 13 May 2021 09:37:26 +0100 -Subject: [PATCH 3/3] Detect and prevent negative overflow of clap box dimensions +Subject: [PATCH 3/4] Detect and prevent negative overflow of clap box dimensions in the 32-bit unsigned to signed conversion, which can cause a divide-by-zero floating point exception when rounded. +Upstream-Status: Accepted [https://github.com/strukturag/libheif/commit/e625a702ec7d46ce042922547d76045294af71d6] + diff --git a/libheif/box.cc b/libheif/box.cc index 1111111..2222222 100644 --- a/libheif/box.cc @@ -79,3 +84,33 @@ index 1111111..2222222 100644 m_clean_aperture_width = Fraction(clean_aperture_width_num, clean_aperture_width_den); m_clean_aperture_height = Fraction(clean_aperture_height_num, + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Alexander Karpinsky +Date: Sun, 17 Oct 2021 13:57:05 +0300 +Subject: [PATCH 4/4] Avoid lroundf using + +Upstream-Status: Submitted [https://github.com/strukturag/libheif/pull/551] + +diff --git a/libheif/heif_colorconversion.cc b/libheif/heif_colorconversion.cc +index 1111111..2222222 100644 +--- a/libheif/heif_colorconversion.cc ++++ b/libheif/heif_colorconversion.cc +@@ -306,7 +306,7 @@ static inline uint8_t clip_int_u8(int x) + + static inline uint16_t clip_f_u16(float fx, int32_t maxi) + { +- long x = lroundf(fx); ++ long x = (long int) (fx + 0.5); + if (x < 0) return 0; + if (x > maxi) return (uint16_t) maxi; + return static_cast(x); +@@ -1961,7 +1961,7 @@ Op_RGB24_32_to_YCbCr::state_after_conversion(ColorState input_state, + + static inline uint8_t clip_f_u8(float fx) + { +- long x = lroundf(fx); ++ long x = (long int) (fx + 0.5); + if (x < 0) return 0; + if (x > 255) return 255; + return static_cast(x); diff --git a/build/patches/libjxl-0.6-fixes.patch b/build/patches/libjxl-0.6-fixes.patch index 076f990e..17eee3cb 100644 --- a/build/patches/libjxl-0.6-fixes.patch +++ b/build/patches/libjxl-0.6-fixes.patch @@ -3,7 +3,7 @@ From: Kleis Auke Wolthuizen Date: Wed, 2 Jun 2021 14:07:04 +0200 Subject: [PATCH 1/6] Remove LCMS mutex -See: https://github.com/libjxl/libjxl/pull/112 +Upstream-Status: Submitted [https://github.com/libjxl/libjxl/pull/112] diff --git a/lib/jxl/enc_color_management.cc b/lib/jxl/enc_color_management.cc index 1111111..2222222 100644 @@ -339,11 +339,17 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Wed, 9 Jun 2021 19:38:33 +0200 -Subject: [PATCH 5/6] tsc_timer: sync with highway +Subject: [PATCH 5/6] tsc_timer.h: sync with nanobenchmark.cc from Highway (#797) -Fixes compilation with llvm-mingw targeting i686. +This file was originally originated from nanobenchmark.cc on the +Highway project. Re-syncing this file ensures that the fixes from +commit google/highway@3769cb2, google/highway@1df8ed4 and +google/highway@f2efb75 are incorporated. -See: https://github.com/libjxl/libjxl/pull/797 +Including these commits also resolves the compilation with +llvm-mingw targeting i686 when build with support for profiling. + +Upstream-Status: Accepted [https://github.com/libjxl/libjxl/commit/0b70567432ab630c2d71a70ebdf3792fbdbf5768] diff --git a/lib/profiler/tsc_timer.h b/lib/profiler/tsc_timer.h index 1111111..2222222 100644 diff --git a/build/patches/mingw-w64-9-ucrtbased.patch b/build/patches/mingw-w64-9-ucrtbased.patch index e7dc5083..787a1678 100644 --- a/build/patches/mingw-w64-9-ucrtbased.patch +++ b/build/patches/mingw-w64-9-ucrtbased.patch @@ -3,7 +3,7 @@ From: Kleis Auke Wolthuizen Date: Sat, 18 Sep 2021 20:50:00 +0200 Subject: [PATCH 1/2] crt: Support ucrtbased -See: https://github.com/mstorsjo/llvm-mingw/issues/228 +Upstream-Status: Pending [https://github.com/mstorsjo/llvm-mingw/issues/228] diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am index 1111111..2222222 100644 @@ -113,6 +113,7 @@ From: Kleis Auke Wolthuizen Date: Sat, 18 Sep 2021 21:00:00 +0200 Subject: [PATCH 2/2] crt: Regenerate Makefile.in +Upstream-Status: Pending [https://github.com/mstorsjo/llvm-mingw/issues/228] diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in index 1111111..2222222 100644 diff --git a/build/patches/openslide-3-fixes.patch b/build/patches/openslide-3-fixes.patch index 15dd36d0..6dd47e55 100644 --- a/build/patches/openslide-3-fixes.patch +++ b/build/patches/openslide-3-fixes.patch @@ -11,6 +11,8 @@ Preparation for next commit. [Starting with this commit, my contributions are copyright Benjamin Gilbert.] +Upstream-Status: Accepted [https://github.com/openslide/openslide/commit/fa3e3355ec48924dafc0ff3894ab448c6c6a9ef0] + diff --git a/src/openslide-decode-jp2k.c b/src/openslide-decode-jp2k.c index 1111111..2222222 100644 --- a/src/openslide-decode-jp2k.c @@ -73,6 +75,8 @@ opj_decode() from failing with the message https://lists.andrew.cmu.edu/pipermail/openslide-users/2015-August/001086.html +Upstream-Status: Accepted [https://github.com/openslide/openslide/commit/64017b5d8dcbf091e55bda59b88d9bb7f87013ad] + diff --git a/src/openslide-decode-jp2k.c b/src/openslide-decode-jp2k.c index 1111111..2222222 100644 --- a/src/openslide-decode-jp2k.c @@ -160,6 +164,8 @@ convert to UTF-16, and pass to _wfopen(). http://lists.andrew.cmu.edu/pipermail/openslide-users/2015-September/001098.html +Upstream-Status: Accepted [https://github.com/openslide/openslide/commit/89bba00be872c27fdd1f7ef08a59e15546165c72] + diff --git a/configure.ac b/configure.ac index 1111111..2222222 100644 --- a/configure.ac @@ -287,6 +293,8 @@ g_utf8_to_utf16(), which should also be more efficient. Fixes #176. +Upstream-Status: Accepted [https://github.com/openslide/openslide/commit/bbc8ae2757a0e62187a7f79e427445c960f35ff7] + diff --git a/src/openslide-util.c b/src/openslide-util.c index 1111111..2222222 100644 --- a/src/openslide-util.c diff --git a/build/patches/vips-8-dlldir-as-libdir.patch b/build/patches/vips-8-dlldir-as-libdir.patch index 9472e7f4..f6b8ce8d 100644 --- a/build/patches/vips-8-dlldir-as-libdir.patch +++ b/build/patches/vips-8-dlldir-as-libdir.patch @@ -3,7 +3,7 @@ From: Kleis Auke Wolthuizen Date: Thu, 23 Sep 2021 17:55:19 +0200 Subject: [PATCH 1/1] Support for using the DLL directory as libdir -See: https://github.com/libvips/build-win64-mxe/issues/34. +Upstream-Status: Pending [https://github.com/libvips/build-win64-mxe/issues/34] diff --git a/libvips/include/vips/util.h b/libvips/include/vips/util.h index 1111111..2222222 100644 @@ -21,7 +21,7 @@ diff --git a/libvips/iofuncs/init.c b/libvips/iofuncs/init.c index 1111111..2222222 100644 --- a/libvips/iofuncs/init.c +++ b/libvips/iofuncs/init.c -@@ -1210,6 +1210,12 @@ vips_guess_prefix( const char *argv0, const char *env_name ) +@@ -1224,6 +1224,12 @@ vips_guess_prefix( const char *argv0, const char *env_name ) const char * vips_guess_libdir( const char *argv0, const char *env_name ) { @@ -34,7 +34,7 @@ index 1111111..2222222 100644 const char *prefix = vips_guess_prefix( argv0, env_name ); static char *libdir = NULL; -@@ -1234,6 +1240,7 @@ vips_guess_libdir( const char *argv0, const char *env_name ) +@@ -1248,6 +1254,7 @@ vips_guess_libdir( const char *argv0, const char *env_name ) libdir = g_strdup_printf( "%s/lib", prefix ); return( libdir ); @@ -46,7 +46,7 @@ diff --git a/libvips/iofuncs/util.c b/libvips/iofuncs/util.c index 1111111..2222222 100644 --- a/libvips/iofuncs/util.c +++ b/libvips/iofuncs/util.c -@@ -2002,6 +2002,54 @@ DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) +@@ -1975,6 +1975,54 @@ DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) return( TRUE ); } #endif diff --git a/build/patches/zlib-1-fixes.patch b/build/patches/zlib-1-fixes.patch index d687dd73..ba27ef2a 100644 --- a/build/patches/zlib-1-fixes.patch +++ b/build/patches/zlib-1-fixes.patch @@ -83,6 +83,8 @@ state->check is set to the same value as the adler32 of an empty string. Upstream bug: madler/zlib#245 +Upstream-Status: Pending [https://github.com/madler/zlib/issues/245] + diff --git a/inflate.c b/inflate.c index 1111111..2222222 100644 --- a/inflate.c diff --git a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch index f72d91a3..0e65f091 100644 --- a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch +++ b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch @@ -201,7 +201,7 @@ diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 1111111..2222222 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs -@@ -290,7 +290,7 @@ impl Step for Mingw { +@@ -288,7 +288,7 @@ impl Step for Mingw { /// without any extra installed software (e.g., we bundle gcc, libraries, etc). fn run(self, builder: &Builder<'_>) -> Option { let host = self.host; diff --git a/build/plugins/llvm-mingw/rust.mk b/build/plugins/llvm-mingw/rust.mk index 5da8f0d5..fced37ba 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/2021-10-29/rustc-nightly-src.tar.gz.sha256 +# https://static.rust-lang.org/dist/2021-11-14/rustc-nightly-src.tar.gz.sha256 $(PKG)_VERSION := nightly -$(PKG)_CHECKSUM := 85bd26e8e15e21d02f249a433ce647f0e7534e3952c92876827f1fa6d0d9e6d4 +$(PKG)_CHECKSUM := 88bbe21af0a49b2ea0bfa373d1fe106addf9a7771ea3e8d90a674016a2475864 $(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.gz -$(PKG)_URL := https://static.rust-lang.org/dist/2021-10-29/$($(PKG)_FILE) +$(PKG)_URL := https://static.rust-lang.org/dist/2021-11-14/$($(PKG)_FILE) $(PKG)_DEPS := $(BUILD)~$(PKG) $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) diff --git a/build/variables.sh b/build/variables.sh index 7775c4dc..77de7863 100755 --- a/build/variables.sh +++ b/build/variables.sh @@ -1,9 +1,9 @@ # included by all scripts vips_package=vips -vips_version=8.11 -vips_patch_version=4 -#vips_pre_version=rc1 +vips_version=8.12 +vips_patch_version=0 +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 index c87b2d54..d23e132d 100644 --- a/build/vips-all.mk +++ b/build/vips-all.mk @@ -2,16 +2,16 @@ 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.11.4 -$(PKG)_CHECKSUM := 5043f38828a0ff9f2275f9252f69e14f701ef11f55786cda8aa6ce2c4fbed2f7 +$(PKG)_VERSION := 8.12.0 +$(PKG)_CHECKSUM := f19948eaa8663e3d1734ad681cc353db79dd12147bb9e6aec7d942645bb4dd14 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) -$(PKG)_GH_CONF := libvips/libvips/releases,v +$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.gz $(PKG)_SUBDIR := vips-$($(PKG)_VERSION) -$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.gz +$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc1.tar.gz $(PKG)_DEPS := cc libwebp librsvg glib pango libgsf \ libjpeg-turbo tiff lcms libexif libheif libpng \ libspng libimagequant orc imagemagick matio openexr \ - cfitsio nifticlib poppler fftw openslide libjxl + cfitsio nifticlib poppler fftw openslide libjxl cgif define $(PKG)_PRE_CONFIGURE # Copy some files to the packaging directory @@ -24,6 +24,7 @@ define $(PKG)_PRE_CONFIGURE printf ' "brotli": "$(brotli_VERSION)",\n'; \ printf ' "cairo": "$(cairo_VERSION)",\n'; \ printf ' "cfitsio": "$(cfitsio_VERSION)",\n'; \ + printf ' "cgif": "$(cgif_VERSION)",\n'; \ $(if $(IS_HEVC),printf ' "de265": "$(libde265_VERSION)"$(comma)\n';) \ printf ' "exif": "$(libexif_VERSION)",\n'; \ printf ' "expat": "$(expat_VERSION)",\n'; \ diff --git a/build/vips-web.mk b/build/vips-web.mk index 24f327cb..08dd3c01 100644 --- a/build/vips-web.mk +++ b/build/vips-web.mk @@ -2,15 +2,15 @@ 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.11.4 -$(PKG)_CHECKSUM := 5043f38828a0ff9f2275f9252f69e14f701ef11f55786cda8aa6ce2c4fbed2f7 +$(PKG)_VERSION := 8.12.0 +$(PKG)_CHECKSUM := f19948eaa8663e3d1734ad681cc353db79dd12147bb9e6aec7d942645bb4dd14 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) -$(PKG)_GH_CONF := libvips/libvips/releases,v +$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.gz $(PKG)_SUBDIR := vips-$($(PKG)_VERSION) -$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.gz +$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc1.tar.gz $(PKG)_DEPS := cc libwebp librsvg glib pango libgsf \ libjpeg-turbo tiff lcms libexif libheif libpng \ - libspng libimagequant orc + libspng libimagequant orc cgif define $(PKG)_PRE_CONFIGURE # Copy some files to the packaging directory @@ -21,6 +21,7 @@ define $(PKG)_PRE_CONFIGURE (printf '{\n'; \ printf ' "aom": "$(aom_VERSION)",\n'; \ printf ' "cairo": "$(cairo_VERSION)",\n'; \ + printf ' "cgif": "$(cgif_VERSION)",\n'; \ printf ' "exif": "$(libexif_VERSION)",\n'; \ printf ' "expat": "$(expat_VERSION)",\n'; \ printf ' "ffi": "$(libffi_VERSION)",\n'; \