Merge branch 'master' into arm-builds

Author: kleisauke

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="11e79ce1057fb9564eb842013c2efdc67bdcd24c"
+revision="31a4a4d3cdac108679b2ae8cbe4402ee4c335914"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then
@@ -41,9 +41,6 @@ if [ ! "$curr_revision" = "$revision" ]; then
 fi
 
 if [ "$initialize" = true ] ; then
-  # Copy our customized tool
-  cp -f $work_dir/tools/make-shared-from-static $mxe_dir/tools
-
   # Patch MXE to support the ARM/ARM64 targets
   git apply $work_dir/plugins/llvm-mingw/patches/mxe-fixes.patch
 fi
@@ -56,7 +53,7 @@ if [ "$LLVM" = "true" ]; then
   cp -f $work_dir/settings/llvm.mk $mxe_dir/settings.mk
   cp -f $work_dir/settings/meson-llvm.in $mxe_dir/plugins/meson-wrapper/conf/mxe-crossfile.meson.in
 else
-  # Build with GCC 9.2
+  # Build with GCC 9.3
   plugins="plugins/gcc9"
 
   # Copy GCC settings

8.9/overrides.mk

@@ -10,41 +10,42 @@ mingw-w64-headers_CONFIGURE_OPTS=--prefix='$(PREFIX)/$(TARGET)/mingw'
 common_CONFIGURE_OPTS=--prefix='$(PREFIX)/$(TARGET)/mingw' \
 --with-sysroot='$(PREFIX)/$(TARGET)/mingw' \
 CPPFLAGS='-I$(PREFIX)/$(TARGET)/mingw/include' \
-CFLAGS='-I$(PREFIX)/$(TARGET)/mingw/include -s -O3 -ffast-math' \
-CXXFLAGS='-I$(PREFIX)/$(TARGET)/mingw/include -s -O3 -ffast-math' \
+CFLAGS='-I$(PREFIX)/$(TARGET)/mingw/include' \
+CXXFLAGS='-I$(PREFIX)/$(TARGET)/mingw/include' \
 LDFLAGS='-L$(PREFIX)/$(TARGET)/mingw/lib' \
 RCFLAGS='-I$(PREFIX)/$(TARGET)/mingw/include'
 
 # Override GCC patches with our own patches
 gcc_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/gcc-[0-9]*.patch)))
 
-# Point native system header dir to /mingw/include and
-# compile without some optimizations / stripping
-gcc_CONFIGURE_OPTS=--with-native-system-header-dir='/mingw/include' \
-CFLAGS='-s -O3 -ffast-math' \
-CXXFLAGS='-s -O3 -ffast-math' \
+# Point native system header dir to /mingw/include
+# and compile without optimizations / stripping
+gcc_CONFIGURE_OPTS=--with-build-sysroot='$(PREFIX)/$(TARGET)' \
+--with-native-system-header-dir='/mingw/include' \
+CFLAGS='' \
+CXXFLAGS='' \
 LDFLAGS=''
 
 # The trick here is to symlink all files from /mingw/{bin,lib,include}/
 # to $(PREFIX)/$(TARGET) after building MinGW-w64
 # This ensures that all files are found during linking and that we
 # can clean up those unnecessary files afterwards
 define gcc_BUILD_x86_64-w64-mingw32
-    $(subst # build rest of gcc, ln -sf $(PREFIX)/$(TARGET)/mingw/bin/* $(PREFIX)/$(TARGET)/bin && \
-    ln -sf '$(PREFIX)/$(TARGET)/mingw/lib/'* $(PREFIX)/$(TARGET)/lib && \
-    ln -sf '$(PREFIX)/$(TARGET)/mingw/include/'* $(PREFIX)/$(TARGET)/include, \
     $(subst @gcc-crt-config-opts@,--disable-lib32 $(common_CONFIGURE_OPTS), \
     $(subst winpthreads/configure' $(MXE_CONFIGURE_OPTS),winpthreads/configure' $(MXE_CONFIGURE_OPTS) $(common_CONFIGURE_OPTS), \
-    $(gcc_BUILD_mingw-w64))))
+    $(gcc_BUILD_mingw-w64)))
+    ln -sf '$(PREFIX)/$(TARGET)/mingw/bin/'* '$(PREFIX)/$(TARGET)/bin'
+    ln -sf '$(PREFIX)/$(TARGET)/mingw/lib/'* '$(PREFIX)/$(TARGET)/lib'
+    ln -sf '$(PREFIX)/$(TARGET)/mingw/include/'* '$(PREFIX)/$(TARGET)/include'
 endef
 
 define gcc_BUILD_i686-w64-mingw32
-    $(subst # build rest of gcc, ln -sf $(PREFIX)/$(TARGET)/mingw/bin/* $(PREFIX)/$(TARGET)/bin && \
-    ln -sf '$(PREFIX)/$(TARGET)/mingw/lib/'* '$(PREFIX)/$(TARGET)/lib' && \
-    ln -sf '$(PREFIX)/$(TARGET)/mingw/include/'* '$(PREFIX)/$(TARGET)/include', \
     $(subst @gcc-crt-config-opts@,--disable-lib64 $(common_CONFIGURE_OPTS), \
     $(subst winpthreads/configure' $(MXE_CONFIGURE_OPTS),winpthreads/configure' $(MXE_CONFIGURE_OPTS) $(common_CONFIGURE_OPTS), \
-    $(gcc_BUILD_mingw-w64))))
+    $(gcc_BUILD_mingw-w64)))
+    ln -sf '$(PREFIX)/$(TARGET)/mingw/bin/'* '$(PREFIX)/$(TARGET)/bin'
+    ln -sf '$(PREFIX)/$(TARGET)/mingw/lib/'* '$(PREFIX)/$(TARGET)/lib'
+    ln -sf '$(PREFIX)/$(TARGET)/mingw/include/'* '$(PREFIX)/$(TARGET)/include'
 endef
 
 # GCC does not support Windows on ARM
@@ -124,8 +125,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.47.3
-librsvg_CHECKSUM := bf8b970f5e72edb66be79e11df2b20f180abff5029c90e94d6c254476b0ba5fa
+librsvg_VERSION  := 2.48.0
+librsvg_CHECKSUM := 4a348b76cf4c52838e9c337ca767a38fe7f742db40ccccf8ac99f1946872cda6
 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
@@ -142,11 +143,11 @@ pango_URL      := https://download.gnome.org/sources/pango/$(call SHORT_PKG_VERS
 # upstream version is 1.0.5
 # cannot use GH_CONF:
 # fribidi_GH_CONF  := fribidi/fribidi/releases,v
-fribidi_VERSION  := 1.0.8
-fribidi_CHECKSUM := 94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c
+fribidi_VERSION  := 1.0.9
+fribidi_CHECKSUM := c5e47ea9026fb60da1944da9888b4e0a18854a0e2410bbfe7ad90a054d36e0c7
 fribidi_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/fribidi-[0-9]*.patch)))
 fribidi_SUBDIR   := fribidi-$(fribidi_VERSION)
-fribidi_FILE     := fribidi-$(fribidi_VERSION).tar.bz2
+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.0.3
@@ -158,8 +159,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.63.5
-glib_CHECKSUM := 851a4725a2ae401c1a4e49cf2138920cf87e028f033a2af33f5a16d159a3b78c
+glib_VERSION  := 2.64.1
+glib_CHECKSUM := 17967603bcb44b6dbaac47988d80c29a3d28519210b28157c2bd10997595bbc7
 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
@@ -317,7 +318,7 @@ define libffi_BUILD
     cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS) \
         --disable-multi-os-directory \
-        --disable-raw-api \
+        $(if $(BUILD_STATIC), --disable-raw-api) \
         $(if $(findstring posix,$(TARGET)), --disable-symvers)
 
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
@@ -360,6 +361,18 @@ define harfbuzz_BUILD
      > '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc'
 endef
 
+define freetype_BUILD
+    # alias libharfbuzz and libfreetype to satisfy circular dependence
+    # libfreetype should already have been created by freetype-bootstrap.mk
+    $(if $(BUILD_STATIC), \
+        ln -sf libharfbuzz.a '$(PREFIX)/$(TARGET)/lib/libharfbuzz_too.a' \
+        && ln -sf libfreetype.a '$(PREFIX)/$(TARGET)/lib/libfreetype_too.a',)
+    $($(PKG)_BUILD_COMMON)
+    # remove circular dependencies from pc file
+    $(if $(BUILD_STATIC), \
+        $(SED) -i '/^Libs.private:/s/\-lharfbuzz_too -lfreetype_too//g' '$(PREFIX)/$(TARGET)/lib/pkgconfig/freetype2.pc')
+endef
+
 # exclude bz2 and gdk-pixbuf
 define libgsf_BUILD
     $(SED) -i 's,\ssed\s, $(SED) ,g'           '$(SOURCE_DIR)'/gsf/Makefile.in
@@ -653,8 +666,7 @@ define cairo_BUILD
         --disable-ps \
         --disable-script \
         --disable-pdf \
-        $(if $(BUILD_STATIC), \
-            --disable-svg) \
+        $(if $(BUILD_STATIC), --disable-svg) \
         --disable-win32 \
         --disable-win32-font \
         --disable-interpreter \

8.9/package-vipsdev.sh

@@ -33,16 +33,12 @@ fi
 rm -rf $repackage_dir
 mkdir -p $repackage_dir/bin
 
-# Copy libvips-cpp-42.dll by default
+# Copy libvips-cpp-42.dll
 target_dll="libvips-cpp-42.dll"
 
 zip_suffix=""
 
 if [ "$type" = "static" ]; then
-  # Static build? Copy libvips-42.dll
-  # TODO(kleisauke): sharp needs libvips-cpp-42.dll
-  target_dll="libvips-42.dll"
-
   zip_suffix="-static"
 fi
 

8.9/patches/glib-2-fixes.patch

@@ -25,7 +25,7 @@ diff --git a/meson.build b/meson.build
 index 1111111..2222222 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1808,7 +1808,7 @@ glibconfig_conf.set10('G_HAVE_GROWING_STACK', growing_stack)
+@@ -1815,7 +1815,7 @@ glibconfig_conf.set10('G_HAVE_GROWING_STACK', growing_stack)
  # available in the actual runtime environment. On Windows, we always use
  # the built-in implementation
  iconv_opt = get_option('iconv')
@@ -34,7 +34,7 @@ index 1111111..2222222 100644
    libiconv = []
    # We have a #include "win_iconv.c" in gconvert.c on Windows, so we don't need
    # any external library for it
-@@ -1897,17 +1897,24 @@ endif
+@@ -1904,17 +1904,24 @@ endif
  # proxy-libintl subproject.
  # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
  # implementations. This could be extended if issues are found in some platforms.
@@ -78,7 +78,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
-@@ -436,7 +436,7 @@ gdbus_example_objectmanager_sources = files(
+@@ -435,7 +435,7 @@ gdbus_example_objectmanager_sources = files(
    'gdbus-example-objectmanager-server.c',
  )
 
@@ -87,9 +87,9 @@ 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!
-@@ -549,7 +549,7 @@ foreach memory_monitor_test : memory_monitor_tests
-   )
- endforeach
+@@ -548,7 +548,7 @@ if installed_tests_enabled
+   endforeach
+ endif
 
 -if not meson.is_cross_build() or meson.has_exe_wrapper()
 +if not (meson.is_cross_build() or meson.has_exe_wrapper()) and host_machine.system() != 'windows'
@@ -201,7 +201,7 @@ index 1111111..2222222 100644
 
    /* When building for UWP, load app asset DLLs instead of filesystem DLLs.
     * Needs MSVC, Windows 8 and newer, and is only usable from apps. */
-@@ -118,7 +119,7 @@ _g_module_close (gpointer handle,
+@@ -117,7 +118,7 @@ _g_module_close (gpointer handle,
  {
    if (handle != null_module_handle)
      if (!FreeLibrary (handle))
@@ -210,7 +210,7 @@ index 1111111..2222222 100644
  }
 
  static gpointer
-@@ -177,7 +178,7 @@ _g_module_symbol (gpointer     handle,
+@@ -176,7 +177,7 @@ _g_module_symbol (gpointer     handle,
      p = GetProcAddress (handle, symbol_name);
 
    if (!p)

8.9/patches/glib-static.patch

@@ -42,7 +42,7 @@ diff --git a/gio/meson.build b/gio/meson.build
 index 1111111..2222222 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -792,7 +792,7 @@ else
+@@ -786,7 +786,7 @@ else
    gio_dtrace_hdr = []
  endif