Skip to content

Commit

Permalink
Update for 8.9.2
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
kleisauke committed Apr 25, 2020
1 parent a5eb868 commit 6092bcc
Show file tree
Hide file tree
Showing 15 changed files with 56 additions and 375 deletions.
2 changes: 1 addition & 1 deletion 8.9/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions 8.9/overrides.mk
Original file line number Diff line number Diff line change
Expand Up @@ -106,23 +106,23 @@ 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
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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
18 changes: 0 additions & 18 deletions 8.9/patches/glib-2-fixes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
251 changes: 0 additions & 251 deletions 8.9/patches/pixman-0.3-fixes.patch

This file was deleted.

12 changes: 7 additions & 5 deletions 8.9/plugins/mozjpeg/mozjpeg.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit 6092bcc

Please sign in to comment.