diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2020-12-31 16:31:51 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2020-12-31 17:01:00 (GMT) |
| commit | cc7489acae3a65147aa9d332324e743d6b569820 (patch) | |
| tree | 3a8f612934780ae7326ec6d50aae933ab52f9f53 /src | |
| parent | 2d95bd76abfbba76af6f856c7fbac276f8808a48 (diff) | |
| download | mxe-cc7489acae3a65147aa9d332324e743d6b569820.zip mxe-cc7489acae3a65147aa9d332324e743d6b569820.tar.gz mxe-cc7489acae3a65147aa9d332324e743d6b569820.tar.bz2 | |
update: harfbuzz, openjpeg
Diffstat (limited to 'src')
| -rw-r--r-- | src/harfbuzz.mk | 4 | ||||
| -rw-r--r-- | src/openjpeg-1.patch | 25 | ||||
| -rw-r--r-- | src/openjpeg.mk | 4 |
3 files changed, 4 insertions, 29 deletions
diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index edd13c4..6c322ae 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -4,8 +4,8 @@ PKG := harfbuzz $(PKG)_WEBSITE := https://wiki.freedesktop.org/www/Software/HarfBuzz/ $(PKG)_DESCR := HarfBuzz $(PKG)_IGNORE := -$(PKG)_VERSION := 2.7.3 -$(PKG)_CHECKSUM := be01bc2c3f1e8902f31b432131280cdfdf6780b72c2389dd63cfab908f6213f3 +$(PKG)_VERSION := 2.7.4 +$(PKG)_CHECKSUM := daff8a4003ac420a8550760ed303ce33b310c8ea17b7f15b307d1969cabcebcb $(PKG)_GH_CONF := harfbuzz/harfbuzz/releases $(PKG)_DEPS := cc cairo freetype-bootstrap glib icu4c diff --git a/src/openjpeg-1.patch b/src/openjpeg-1.patch deleted file mode 100644 index 1cbfc63..0000000 --- a/src/openjpeg-1.patch +++ /dev/null @@ -1,25 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From 2e44887c114a4c6fb92a65f5505c8cf4cc452b8c Mon Sep 17 00:00:00 2001 -From: Julien Michel <julien.michel@orfeo-toolbox.org> -Date: Sat, 26 Aug 2017 01:13:50 +0200 -Subject: [PATCH] dllmacro - - -diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h -index d571c516..d12f1c36 100644 ---- a/src/lib/openjp2/openjpeg.h -+++ b/src/lib/openjp2/openjpeg.h -@@ -76,7 +76,8 @@ Most compilers implement their own version of this keyword ... - #define OPJ_DEPRECATED(func) func - #endif - --#if defined(OPJ_STATIC) || !defined(_WIN32) -+ -+#if defined(OPJ_STATIC) || defined(__MINGW32__) || !defined(_WIN32) - /* http://gcc.gnu.org/wiki/Visibility */ - # if __GNUC__ >= 4 - # if defined(OPJ_STATIC) /* static library uses "hidden" */ --- -2.11.0 - diff --git a/src/openjpeg.mk b/src/openjpeg.mk index 6810d28..fb5e0b6 100644 --- a/src/openjpeg.mk +++ b/src/openjpeg.mk @@ -5,8 +5,8 @@ PKG := openjpeg $(PKG)_WEBSITE := https://www.openjpeg.org/ $(PKG)_DESCR := OpenJPEG $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.1 -$(PKG)_CHECKSUM := 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9 +$(PKG)_VERSION := 2.4.0 +$(PKG)_CHECKSUM := 8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d $(PKG)_GH_CONF := uclouvain/openjpeg/tags,v,,version $(PKG)_DEPS := cc lcms libpng tiff zlib |