-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Update librsvg to 2.52.4. - Update Pango to 1.49.3. - Update ImageMagick to 6.9.11-28. - Update libjxl to 0.6.1. - Update Poppler to 21.11.0. - Include cgif as dependency for GIF save support. - Add libheif patch to improve colour conversion performance. - Include "Upstream-Status"-labels in patches. MXE Updates: - Update HarfBuzz to 3.1.1.
- Loading branch information
Showing
21 changed files
with
163 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 <[email protected]> | ||
| Date: Wed, 12 Feb 2020 20:00:00 +0100 | ||
| From: Peter Wang <[email protected]> | ||
| 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 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. | |
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| 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 <[email protected]> | ||
| 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 <[email protected]> | ||
| 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 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ From: Kleis Auke Wolthuizen <[email protected]> | |
| 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 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -279,6 +279,7 @@ From: Morten Welinder <[email protected]> | |
| 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 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Lovell Fuller <[email protected]> | ||
| 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 <[email protected]> | ||
| 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 <[email protected]> | ||
| 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 <[email protected]> | ||
| 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<uint16_t>(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<uint8_t>(x); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ From: Kleis Auke Wolthuizen <[email protected]> | |
| 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 <[email protected]> | ||
| 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 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ From: Kleis Auke Wolthuizen <[email protected]> | |
| 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 <[email protected]> | |
| 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 | ||
|
|
||
Oops, something went wrong.