From 6092bcc7eee226dbaaaca8dd04e4fa2487c83830 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sat, 25 Apr 2020 18:31:38 +0200 Subject: [PATCH] Update for 8.9.2 - Update GLib to 2.64.2. - Update librsvg to 2.48.4. - Update Pixman to 0.40.0. - Update ImageMagick to 6.9.11-6. - Update x265 to 3.3. - Update Rust to 1.43.0. - Update MozJPEG to the latest master version. - Prefer Git repositories within the README.md. MXE Updates: - Update gettext to 0.20.2. - Update HarfBuzz to 2.6.5. --- 8.9/build.sh | 2 +- 8.9/overrides.mk | 20 +- 8.9/patches/glib-2-fixes.patch | 18 -- 8.9/patches/pixman-0.3-fixes.patch | 251 ------------------ 8.9/plugins/mozjpeg/mozjpeg.mk | 12 +- .../mozjpeg/patches/mozjpeg-4-fixes.patch | 52 ---- 8.9/rust-std-aarch64.mk | 2 +- 8.9/rust-std-armv7.mk | 2 +- 8.9/rust-std-i686.mk | 4 +- 8.9/rust-std-x86_64.mk | 4 +- 8.9/rust.mk | 4 +- 8.9/variables.sh | 2 +- 8.9/vips-all.mk | 4 +- 8.9/vips-web.mk | 4 +- README.md | 50 ++-- 15 files changed, 56 insertions(+), 375 deletions(-) delete mode 100644 8.9/patches/pixman-0.3-fixes.patch delete mode 100644 8.9/plugins/mozjpeg/patches/mozjpeg-4-fixes.patch diff --git a/8.9/build.sh b/8.9/build.sh index e5a60a1d..b75e9e19 100755 --- a/8.9/build.sh +++ b/8.9/build.sh @@ -21,7 +21,7 @@ target="${2:-x86_64-w64-mingw32.shared.win32}" # 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="169c1da1e70307258cf763cd41f50a18071587c2" +revision="951c528c4e75fca058f491f0894fdb389294b61c" initialize=false if [ -f "$mxe_dir/Makefile" ]; then diff --git a/8.9/overrides.mk b/8.9/overrides.mk index 20dae984..3dfee8d3 100644 --- a/8.9/overrides.mk +++ b/8.9/overrides.mk @@ -106,14 +106,14 @@ 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.10-92 -imagemagick_CHECKSUM := 170cff8a401e958692513d19290b12bb63a7af48d19a2f7640fbfe7dede60f3a +imagemagick_VERSION := 6.9.11-6 +imagemagick_CHECKSUM := 6ba3248c43a7b5391a6638c7fbe08de2032db78458e58ee7f770efbe36c23ddd imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch))) imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags # upstream version is 2.4 -x265_VERSION := 3.2.1 -x265_CHECKSUM := fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc +x265_VERSION := 3.3 +x265_CHECKSUM := f26e148ed1f4dfb33fd1eb3ff5e60e08078d1b2017e88bcbb045b3fb58300b9c x265_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/x265-[0-9]*.patch))) x265_SUBDIR := x265_$(x265_VERSION) x265_FILE := x265_$(x265_VERSION).tar.gz @@ -121,8 +121,8 @@ x265_URL := https://bitbucket.org/multicoreware/x265/downloads/$(x265_FILE) x265_URL_2 := ftp://ftp.videolan.org/pub/videolan/x265/$(x265_FILE) # upstream version is 2.40.5 -librsvg_VERSION := 2.48.1 -librsvg_CHECKSUM := 91d7630cffbbe006c989ca575b404257abc2a4a636f0571ffb4607d69fd58f3a +librsvg_VERSION := 2.48.4 +librsvg_CHECKSUM := 28b63af85ced557383d3d3ece6e1f6938720dee1ecfa40d926bf1de4747c956e 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 @@ -155,8 +155,8 @@ 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.64.1 -glib_CHECKSUM := 17967603bcb44b6dbaac47988d80c29a3d28519210b28157c2bd10997595bbc7 +glib_VERSION := 2.64.2 +glib_CHECKSUM := 9a2f21ed8f13b9303399de13a0252b7cbcede593d26971378ec6cb90e87f2277 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 @@ -208,8 +208,8 @@ cfitsio_URL := https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/$(cfitsi cfitsio_URL_2 := https://mirrorservice.org/sites/distfiles.macports.org/cfitsio/$(cfitsio_FILE) # upstream version is 0.33.6 -pixman_VERSION := 0.38.4 -pixman_CHECKSUM := da66d6fd6e40aee70f7bd02e4f8f76fc3f006ec879d346bae6a723025cfbdde7 +pixman_VERSION := 0.40.0 +pixman_CHECKSUM := 6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc pixman_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pixman-[0-9]*.patch))) pixman_SUBDIR := pixman-$(pixman_VERSION) pixman_FILE := pixman-$(pixman_VERSION).tar.gz diff --git a/8.9/patches/glib-2-fixes.patch b/8.9/patches/glib-2-fixes.patch index f4dd559e..188c5bf8 100644 --- a/8.9/patches/glib-2-fixes.patch +++ b/8.9/patches/glib-2-fixes.patch @@ -239,21 +239,3 @@ index 1111111..2222222 100644 # define G_BREAKPOINT() G_STMT_START{ __builtin_trap(); }G_STMT_END #else /* !__i386__ && !__alpha__ */ # define G_BREAKPOINT() G_STMT_START{ raise (SIGTRAP); }G_STMT_END -diff --git a/glib/valgrind.h b/glib/valgrind.h -index 1111111..2222222 100644 ---- a/glib/valgrind.h -+++ b/glib/valgrind.h -@@ -130,11 +130,11 @@ - # define PLAT_x86_darwin 1 - #elif defined(__APPLE__) && defined(__x86_64__) - # define PLAT_amd64_darwin 1 --#elif (defined(__MINGW32__) && !defined(__MINGW64__)) \ -+#elif (defined(__MINGW32__) && !defined(__MINGW64__) && !defined(__arm__)) \ - || defined(__CYGWIN32__) \ - || (defined(_WIN32) && defined(_M_IX86)) - # define PLAT_x86_win32 1 --#elif defined(__MINGW64__) \ -+#elif (defined(__MINGW64__) && !defined(__aarch64__)) \ - || (defined(_WIN64) && defined(_M_X64)) - # define PLAT_amd64_win64 1 - #elif defined(__linux__) && defined(__i386__) diff --git a/8.9/patches/pixman-0.3-fixes.patch b/8.9/patches/pixman-0.3-fixes.patch deleted file mode 100644 index 1e270258..00000000 --- a/8.9/patches/pixman-0.3-fixes.patch +++ /dev/null @@ -1,251 +0,0 @@ -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: Basile Clement -Date: Tue, 9 Apr 2019 23:16:13 +0200 -Subject: [PATCH 1/5] Fix bilinear filter computation in wide pipeline - -The recently introduced wide pipeline for filters has a typo which -causes it to improperly compute bilinear interpolation positions, -causing various glitches when enabled. - -This patch uses the proper computation for bilinear interpolation in the -wide pipeline. It also makes related `if` statements conformant to the -CODING_STYLE: - -* If a substatement spans multiple lines, then there must be braces - around it. - -* If one substatement of an if statement has braces, then the other - must too. - -Signed-off-by: Maarten Lankhorst - -diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c -index 1111111..2222222 100644 ---- a/pixman/pixman-bits-image.c -+++ b/pixman/pixman-bits-image.c -@@ -432,29 +432,38 @@ bits_image_fetch_pixel_filtered (bits_image_t *image, - - case PIXMAN_FILTER_CONVOLUTION: - if (wide) -+ { - bits_image_fetch_pixel_convolution (image, x, y, - get_pixel, out, - accum_float, - reduce_float); -+ } - else -+ { - bits_image_fetch_pixel_convolution (image, x, y, - get_pixel, out, - accum_32, reduce_32); -+ } - break; - - case PIXMAN_FILTER_SEPARABLE_CONVOLUTION: - if (wide) -+ { - bits_image_fetch_pixel_separable_convolution (image, x, y, - get_pixel, out, - accum_float, - reduce_float); -+ } - else -+ { - bits_image_fetch_pixel_separable_convolution (image, x, y, - get_pixel, out, - accum_32, reduce_32); -+ } - break; - - default: -+ assert (0); - break; - } - } -diff --git a/pixman/pixman-inlines.h b/pixman/pixman-inlines.h -index 1111111..2222222 100644 ---- a/pixman/pixman-inlines.h -+++ b/pixman/pixman-inlines.h -@@ -231,7 +231,7 @@ bilinear_interpolation_float (argb_t tl, argb_t tr, - argb_t r; - - distxy = distx * disty; -- distxiy = distx - (1.f - distxy); -+ distxiy = distx * (1.f - disty); - distixy = (1.f - distx) * disty; - distixiy = (1.f - distx) * (1.f - disty); - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sat, 11 May 2019 10:17:36 +0200 -Subject: [PATCH 2/5] meson: define SIZEOF_LONG and use -Wundef - -meson builds defaulted to SIZEOF_LONG=0 in various places - -diff --git a/meson.build b/meson.build -index 1111111..2222222 100644 ---- a/meson.build -+++ b/meson.build -@@ -36,6 +36,7 @@ add_project_arguments( - '-Wdeclaration-after-statement', - '-fno-strict-aliasing', - '-fvisibility=hidden', -+ '-Wundef', - ]), - language : ['c'] - ) -@@ -445,6 +446,8 @@ if host_machine.endian() == 'big' - config.set('WORDS_BIGENDIAN', 1) - endif - -+config.set('SIZEOF_LONG', cc.sizeof('long')) -+ - # Required to make pixman-private.h - config.set('PACKAGE', 'foo') - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sat, 11 May 2019 11:18:35 +0200 -Subject: [PATCH 3/5] meson: allow building a static library - -So that passing "-Ddefault_library=both" also creates a static lib. - -Note that Libs.private in the .pc file will still be wrong because of -https://github.com/mesonbuild/meson/issues/3934 (it contains things like --lpixman-mmx) - -diff --git a/pixman/meson.build b/pixman/meson.build -index 1111111..2222222 100644 ---- a/pixman/meson.build -+++ b/pixman/meson.build -@@ -97,7 +97,7 @@ pixman_files = files( - 'pixman-utils.c', - ) - --libpixman = shared_library( -+libpixman = library( - 'pixman-1', - [pixman_files, config_h, version_h], - link_with : [pixman_simd_libs], - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sat, 11 May 2019 10:23:08 +0200 -Subject: [PATCH 4/5] meson: fix TLS support under mingw - -GCC on Windows complains that "__declspec(thread)" doesn't work, but still -compiles it, so the meson check doesn't work. The warning printed by gcc: -"warning: 'thread' attribute directive ignored [-Wattributes]" - -Pass -Werror=attributes to make the check fail instead. - -This fixes the test suite (minus gtk tests) on Windows with mingw. - -diff --git a/meson.build b/meson.build -index 1111111..2222222 100644 ---- a/meson.build -+++ b/meson.build -@@ -408,8 +408,12 @@ foreach h : ['sys/mman.h', 'fenv.h', 'unistd.h'] - endif - endforeach - -+# gcc on Windows only warns that __declspec(thread) isn't supported, -+# passing -Werror=attributes makes it fail. - if (host_machine.system() == 'windows' and -- cc.compiles('int __declspec(thread) foo;', name : 'TLS via __declspec(thread)')) -+ cc.compiles('int __declspec(thread) foo;', -+ args : cc.get_supported_arguments(['-Werror=attributes']), -+ name : 'TLS via __declspec(thread)')) - config.set('TLS', '__declspec(thread)') - elif cc.compiles('int __thread foo;', name : 'TLS via __thread') - config.set('TLS', '__thread') - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chun-wei Fan -Date: Wed, 24 Jul 2019 14:44:39 +0800 -Subject: [PATCH 5/5] build: Don't assume PThreads if threading support is found - -Look also for pthread.h if threading support is found by Meson, as the -underlying threading support may not be PThreads, depending on platform. - -For now, disable the thread-test test program if pthread.h and if -necessary, the PThreads library, cannot be found, as the current -implementation assumes the use of PThreads. - -Also bump the required Meson version to 0.50.0 since we need it for --cc.get_argument_syntax() --For a later commit, the has_headers sub-method for cc.find_library() - -diff --git a/meson.build b/meson.build -index 1111111..2222222 100644 ---- a/meson.build -+++ b/meson.build -@@ -23,7 +23,7 @@ project( - ['c'], - version : '0.38.5', - license : 'MIT', -- meson_version : '>= 0.47.2', -+ meson_version : '>= 0.50.0', - default_options : ['buildtype=debugoptimized'], - ) - -@@ -393,7 +393,29 @@ if dep_png.found() - endif - dep_m = cc.find_library('m', required : false) - dep_threads = dependency('threads') --if dep_threads.found() -+ -+# MSVC-style compilers do not come with pthreads, so we must link -+# to it explicitly, currently pthreads-win32 is supported -+pthreads_found = false -+ -+if dep_threads.found() and cc.has_header('pthread.h') -+ if cc.get_argument_syntax() == 'msvc' -+ pthread_lib = null_dep -+ foreach pthread_type : ['VC3', 'VSE3', 'VCE3', 'VC2', 'VSE2', 'VCE2'] -+ if not pthread_lib.found() -+ pthread_lib = cc.find_library('pthread@0@'.format(pthread_type), required : false) -+ endif -+ endforeach -+ if pthread_lib.found() -+ pthreads_found = true -+ dep_threads = pthread_lib -+ endif -+ else -+ pthreads_found = true -+ endif -+endif -+ -+if pthreads_found - config.set('HAVE_PTHREADS', 1) - endif - -diff --git a/test/meson.build b/test/meson.build -index 1111111..2222222 100644 ---- a/test/meson.build -+++ b/test/meson.build -@@ -34,7 +34,6 @@ tests = [ - 'scaling-crash-test', - 'alpha-loop', - 'scaling-helpers-test', -- 'thread-test', - 'rotate-test', - 'alphamap', - 'gradient-crash-test', -@@ -54,6 +53,12 @@ tests = [ - 'tolerance-test', - ] - -+# Remove/update this once thread-test.c supports threading methods -+# other than PThreads -+if pthreads_found -+ tests += 'thread-test' -+endif -+ - progs = [ - 'lowlevel-blt-bench', - 'radial-perf-test', diff --git a/8.9/plugins/mozjpeg/mozjpeg.mk b/8.9/plugins/mozjpeg/mozjpeg.mk index 95b194d2..d9e40034 100644 --- a/8.9/plugins/mozjpeg/mozjpeg.mk +++ b/8.9/plugins/mozjpeg/mozjpeg.mk @@ -2,20 +2,22 @@ PKG := mozjpeg $(PKG)_WEBSITE := https://github.com/mozilla/mozjpeg $(PKG)_DESCR := A JPEG codec that provides increased compression for JPEG images (at the expense of compression performance). $(PKG)_IGNORE := -$(PKG)_VERSION := 68564c0 -$(PKG)_CHECKSUM := 903c8259590e8110133612498827e221468f6f5e7ee380531d1505dbd478aee8 -$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/mozjpeg-[0-9]*.patch))) +$(PKG)_VERSION := 6d95c51 +$(PKG)_CHECKSUM := f8788ccc5a8fe3068b5cb72d620ecdf67d358324640e18095f36a05fdfee5ae6 +# Avoid duplicated patches +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/../../patches/libjpeg-turbo-[0-9]*.patch))) $(PKG)_GH_CONF := mozilla/mozjpeg/branches/master $(PKG)_DEPS := cc yasm # WITH_TURBOJPEG=OFF turns off a library we don't use (we just use the # libjpeg API) define $(PKG)_BUILD - cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \ + cd '$(BUILD_DIR)' && $(TARGET)-cmake \ -DWITH_TURBOJPEG=OFF \ -DENABLE_SHARED=$(CMAKE_SHARED_BOOL) \ -DENABLE_STATIC=$(CMAKE_STATIC_BOOL) \ - -DCMAKE_ASM_NASM_COMPILER=$(TARGET)-yasm + -DCMAKE_ASM_NASM_COMPILER=$(TARGET)-yasm \ + '$(SOURCE_DIR)' $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef diff --git a/8.9/plugins/mozjpeg/patches/mozjpeg-4-fixes.patch b/8.9/plugins/mozjpeg/patches/mozjpeg-4-fixes.patch deleted file mode 100644 index 4d91af3c..00000000 --- a/8.9/plugins/mozjpeg/patches/mozjpeg-4-fixes.patch +++ /dev/null @@ -1,52 +0,0 @@ -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: Alexpux -Date: Sun, 18 Jan 2015 16:49:05 +0300 -Subject: [PATCH 1/1] Fix compatibility with "basestd.h" header - -Taken from: -https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-libjpeg-turbo/0001-header-compat.mingw.patch - -diff --git a/jmorecfg.h b/jmorecfg.h -index 1111111..2222222 100644 ---- a/jmorecfg.h -+++ b/jmorecfg.h -@@ -14,6 +14,12 @@ - * optimizations. Most users will not need to touch this file. - */ - -+/* prevents conflicts */ -+#if defined(__MINGW32__) -+#include /* typedefs INT16 and INT32 */ -+ -+#define HAVE_BOOLEAN -+#endif - - /* - * Maximum number of components (color channels) allowed in JPEG image. -@@ -114,6 +120,7 @@ typedef char JOCTET; - #endif /* HAVE_UNSIGNED_CHAR */ - - -+#ifndef _BASETSD_H_ /* basestd.h from mingw-w64 defines UINT8, UINT16, INT16, INT32 */ - /* These typedefs are used for various table entries and so forth. - * They must be at least as wide as specified; but making them too big - * won't cost a huge amount of memory, so we don't provide special -@@ -173,14 +180,11 @@ typedef short INT16; - */ - - #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ --#ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */ --#ifndef _BASETSD_H /* MinGW is slightly different */ - #ifndef QGLOBAL_H /* Qt defines it in qglobal.h */ - typedef long INT32; - #endif - #endif - #endif --#endif - - /* Datatype used for image dimensions. The JPEG standard only supports - * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore diff --git a/8.9/rust-std-aarch64.mk b/8.9/rust-std-aarch64.mk index 39012027..d3fe3b89 100644 --- a/8.9/rust-std-aarch64.mk +++ b/8.9/rust-std-aarch64.mk @@ -4,5 +4,5 @@ PKG := rust-std-aarch64 $(PKG)_WEBSITE := https://www.rust-lang.org/ $(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency. $(PKG)_IGNORE := -$(PKG)_VERSION := 1.42.0 +$(PKG)_VERSION := 1.43.0 $(PKG)_TYPE := meta diff --git a/8.9/rust-std-armv7.mk b/8.9/rust-std-armv7.mk index c0259be1..9afcccb1 100644 --- a/8.9/rust-std-armv7.mk +++ b/8.9/rust-std-armv7.mk @@ -4,5 +4,5 @@ PKG := rust-std-armv7 $(PKG)_WEBSITE := https://www.rust-lang.org/ $(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency. $(PKG)_IGNORE := -$(PKG)_VERSION := 1.42.0 +$(PKG)_VERSION := 1.43.0 $(PKG)_TYPE := meta diff --git a/8.9/rust-std-i686.mk b/8.9/rust-std-i686.mk index 4cd2661d..c97eedf4 100644 --- a/8.9/rust-std-i686.mk +++ b/8.9/rust-std-i686.mk @@ -2,8 +2,8 @@ PKG := rust-std-i686 $(PKG)_WEBSITE := https://www.rust-lang.org/ $(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency. $(PKG)_IGNORE := -$(PKG)_VERSION := 1.42.0 -$(PKG)_CHECKSUM := 4f82487b879762f56ac6d9dfde41f3e6f265ab47975ff646cf73537d086041e0 +$(PKG)_VERSION := 1.43.0 +$(PKG)_CHECKSUM := 12a0c41f5a958972a4c872044ba4f5888f9c84a13147df9eb94b72a181daace5 $(PKG)_SUBDIR := rust-$($(PKG)_VERSION)-i686-pc-windows-gnu/rust-std-i686-pc-windows-gnu $(PKG)_FILE := rust-$($(PKG)_VERSION)-i686-pc-windows-gnu.tar.gz $(PKG)_URL := https://static.rust-lang.org/dist/$($(PKG)_FILE) diff --git a/8.9/rust-std-x86_64.mk b/8.9/rust-std-x86_64.mk index 82c86355..f9042cfe 100644 --- a/8.9/rust-std-x86_64.mk +++ b/8.9/rust-std-x86_64.mk @@ -2,8 +2,8 @@ PKG := rust-std-x86_64 $(PKG)_WEBSITE := https://www.rust-lang.org/ $(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency. $(PKG)_IGNORE := -$(PKG)_VERSION := 1.42.0 -$(PKG)_CHECKSUM := c3c469253fbac0733899c54e94d25b6437f2fd52a46fb54448f7da8f0985f352 +$(PKG)_VERSION := 1.43.0 +$(PKG)_CHECKSUM := 15c9a9bbf761430fe1c3796191fba8164aab6f0197e4864679ea01ea8689b0ee $(PKG)_SUBDIR := rust-$($(PKG)_VERSION)-x86_64-pc-windows-gnu/rust-std-x86_64-pc-windows-gnu $(PKG)_FILE := rust-$($(PKG)_VERSION)-x86_64-pc-windows-gnu.tar.gz $(PKG)_URL := https://static.rust-lang.org/dist/$($(PKG)_FILE) diff --git a/8.9/rust.mk b/8.9/rust.mk index aeb9ec66..aae04ff0 100644 --- a/8.9/rust.mk +++ b/8.9/rust.mk @@ -2,8 +2,8 @@ PKG := rust $(PKG)_WEBSITE := https://www.rust-lang.org/ $(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency. $(PKG)_IGNORE := -$(PKG)_VERSION := 1.42.0 -$(PKG)_CHECKSUM := 7d1e07ad9c8a33d8d039def7c0a131c5917aa3ea0af3d0cc399c6faf7b789052 +$(PKG)_VERSION := 1.43.0 +$(PKG)_CHECKSUM := 069f34fa5cef92551724c83c36360df1ac66fe3942bc1d0e4d341ce79611a029 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-x86_64-unknown-linux-gnu $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-x86_64-unknown-linux-gnu.tar.gz $(PKG)_URL := https://static.rust-lang.org/dist/$($(PKG)_FILE) diff --git a/8.9/variables.sh b/8.9/variables.sh index ec52d4d3..890d93f0 100755 --- a/8.9/variables.sh +++ b/8.9/variables.sh @@ -2,7 +2,7 @@ vips_package=vips vips_version=8.9 -vips_patch_version=1 +vips_patch_version=2 # build-win64/x.xx dir we are building work_dir=$(pwd) diff --git a/8.9/vips-all.mk b/8.9/vips-all.mk index feba1d71..24693545 100644 --- a/8.9/vips-all.mk +++ b/8.9/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.9.1 -$(PKG)_CHECKSUM := 45633798877839005016c9d3494e98dee065f5cb9e20f4552d3b315b8e8bce91 +$(PKG)_VERSION := 8.9.2 +$(PKG)_CHECKSUM := ae8491b1156cd2eb9cbbaa2fd6caa1dc9ed3ded0b70443d28cd7fea798ab2a27 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) $(PKG)_GH_CONF := libvips/libvips/releases,v $(PKG)_SUBDIR := vips-$($(PKG)_VERSION) diff --git a/8.9/vips-web.mk b/8.9/vips-web.mk index 3c07ebbb..5293ab87 100644 --- a/8.9/vips-web.mk +++ b/8.9/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.9.1 -$(PKG)_CHECKSUM := 45633798877839005016c9d3494e98dee065f5cb9e20f4552d3b315b8e8bce91 +$(PKG)_VERSION := 8.9.2 +$(PKG)_CHECKSUM := ae8491b1156cd2eb9cbbaa2fd6caa1dc9ed3ded0b70443d28cd7fea798ab2a27 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) $(PKG)_GH_CONF := libvips/libvips/releases,v $(PKG)_SUBDIR := vips-$($(PKG)_VERSION) diff --git a/README.md b/README.md index 270614ed..1f0b9f51 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,10 @@ Experiment with building a libvips binary for Windows with [MXE](https://github. | [freetype] | 2.10.1 | [freetype Licence] (BSD-like) | | [fribidi] | 1.0.9 | LGPLv3 | | [gdk-pixbuf] | 2.40.0 | LGPLv3 | -| [gettext] | 0.20.1 | LGPLv3 | +| [gettext] | 0.20.2 | LGPLv3 | | [giflib] | 5.1.4 | MIT Licence | -| [glib] | 2.64.1 | LGPLv3 | -| [harfbuzz] | 2.6.4 | MIT Licence | +| [glib] | 2.64.2 | LGPLv3 | +| [harfbuzz] | 2.6.5 | MIT Licence | | [lcms] | 2.9 | MIT Licence | | [libexif] | 0.6.21 | LGPLv3 | | [libffi] | 3.3 | MIT Licence | @@ -22,48 +22,48 @@ Experiment with building a libvips binary for Windows with [MXE](https://github. | [libiconv] | 1.16 | LGPLv3 | | [libjpeg-turbo] | 2.0.4 | [zlib License, IJG License] | | [libpng] | 1.6.37 | [libpng License version 2] | -| [librsvg] | 2.48.1 | LGPLv3 | +| [librsvg] | 2.48.4 | LGPLv3 | | [libtiff] | 4.1.0 | [libtiff License] (BSD-like) | -| [libvips] | 8.9.1 | LGPLv3 | +| [libvips] | 8.9.2 | LGPLv3 | | [libwebp] | 1.1.0 | New BSD License | | [libxml2] | 2.9.10 | MIT Licence | | [orc] | 0.4.31 | [orc License] (BSD-like) | | [pango] | 1.44.7 | LGPLv3 | -| [pixman] | 0.38.4 | MIT Licence | +| [pixman] | 0.40.0 | MIT Licence | | [zlib] | 1.2.11 | [zlib Licence] | -[cairo]: https://cairographics.org/ -[expat]: https://libexpat.github.io/ -[fontconfig]: https://www.fontconfig.org/ +[cairo]: https://gitlab.freedesktop.org/cairo/cairo +[expat]: https://github.com/libexpat/libexpat +[fontconfig]: https://gitlab.freedesktop.org/fontconfig/fontconfig [fontconfig Licence]: https://gitlab.freedesktop.org/fontconfig/fontconfig/blob/master/COPYING -[freetype]: https://www.freetype.org/ -[freetype Licence]: http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/FTL.TXT +[freetype]: https://git.savannah.gnu.org/cgit/freetype/freetype2.git +[freetype Licence]: https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/FTL.TXT [fribidi]: https://github.com/fribidi/fribidi [gdk-pixbuf]: https://gitlab.gnome.org/GNOME/gdk-pixbuf -[gettext]: https://www.gnu.org/software/gettext/ +[gettext]: https://git.savannah.gnu.org/cgit/gettext.git [giflib]: https://sourceforge.net/projects/giflib/ [glib]: https://gitlab.gnome.org/GNOME/glib [harfbuzz]: https://github.com/harfbuzz/harfbuzz [lcms]: https://github.com/mm2/Little-CMS [libexif]: https://github.com/libexif/libexif -[libffi]: https://sourceware.org/libffi/ +[libffi]: https://github.com/libffi/libffi [libgsf]: https://gitlab.gnome.org/GNOME/libgsf -[libiconv]: https://www.gnu.org/software/libiconv/ +[libiconv]: https://git.savannah.gnu.org/cgit/libiconv.git [libjpeg-turbo]: https://github.com/libjpeg-turbo/libjpeg-turbo [zlib License, IJG License]: https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/LICENSE.md [libpng]: https://github.com/glennrp/libpng -[libpng License version 2]: http://www.libpng.org/pub/png/src/libpng-LICENSE.txt +[libpng License version 2]: https://github.com/glennrp/libpng/blob/master/LICENSE [librsvg]: https://gitlab.gnome.org/GNOME/librsvg -[libtiff]: https://libtiff.gitlab.io/libtiff/ +[libtiff]: https://gitlab.com/libtiff/libtiff [libtiff License]: https://libtiff.gitlab.io/libtiff/misc.html [libvips]: https://github.com/libvips/libvips [libwebp]: https://github.com/webmproject/libwebp [libxml2]: https://gitlab.gnome.org/GNOME/libxml2 [orc]: https://gitlab.freedesktop.org/gstreamer/orc [orc License]: https://gitlab.freedesktop.org/gstreamer/orc/blob/master/COPYING -[pango]: https://www.pango.org/ -[pixman]: http://www.pixman.org/ -[zlib]: https://zlib.net/ +[pango]: https://gitlab.gnome.org/GNOME/pango +[pixman]: https://gitlab.freedesktop.org/pixman/pixman +[zlib]: https://github.com/madler/zlib [zlib Licence]: https://github.com/madler/zlib/blob/master/zlib.h ## libvips-all dependencies @@ -74,7 +74,7 @@ Same as libvips-web + these extra dependencies: | [cfitsio] | 3.470 | BSD-like | | [fftw] | 3.3.8 | GPLv2 | | [hdf5] | 1.10.6 | BSD-like | -| [imagemagick] | 6.9.10-92 | [ImageMagick License] (GPL-like) | +| [imagemagick] | 6.9.11-6 | [ImageMagick License] (GPL-like) | | [libde265] | 1.0.5 | LGPLv3 | | [libheif] | 1.6.2 | LGPLv3 | | [matio] | 1.5.17 | BSD 2-Clause | @@ -84,7 +84,7 @@ Same as libvips-web + these extra dependencies: | [openslide] | 3.4.1 | LGPLv3 | | [poppler] | 0.87.0 | GPLv2 | | [sqlite] | 3.31.1 | Public domain | -| [x265] | 3.2.1 | GPLv2 | +| [x265] | 3.3 | GPLv2 | [cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/ [hdf5]: https://www.hdfgroup.org/solutions/hdf5/ @@ -96,11 +96,11 @@ Same as libvips-web + these extra dependencies: [matio]: https://github.com/tbeu/matio [nifticlib]: https://nifti.nimh.nih.gov/ [openexr]: https://github.com/AcademySoftwareFoundation/openexr -[openjpeg]: http://www.openjpeg.org/ +[openjpeg]: https://github.com/uclouvain/openjpeg [openslide]: https://github.com/openslide/openslide -[poppler]: https://poppler.freedesktop.org/ +[poppler]: https://gitlab.freedesktop.org/poppler/poppler [sqlite]: https://www.sqlite.org/ -[x265]: http://x265.org/ +[x265]: https://bitbucket.org/multicoreware/x265/wiki/Home ## MozJPEG MozJPEG is a libjpeg-turbo fork that provides increased compression for JPEG images @@ -114,7 +114,7 @@ argument. For example: | Dependency | Version | Used under the terms of | |-----------------|-----------|----------------------------------| -| [mozjpeg] | 68564c0¹ | [zlib License, IJG License] | +| [mozjpeg] | 6d95c51¹ | [zlib License, IJG License] | ¹ MozJPEG is built from master to maintain binary compatibility with libjpeg-turbo.