diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-10-21 14:06:39 -0400 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2020-10-21 19:16:09 +0100 |
| commit | 4980be6f43cafcd501f41b7bd103d8ea6afc043d (patch) | |
| tree | 2de639d3e4662959a636992c5d80b4e370aa9a0b | |
| parent | 0175ea5ac70df1818cc085ffe7cce8287e84d62b (diff) | |
Update FreeType to 2.10.4 to fix security vulnerability
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/643>
| -rw-r--r-- | recipes/freetype.recipe | 4 | ||||
| -rw-r--r-- | recipes/freetype/0001-pngshim-Workaround-buggy-mingw-compiler.patch | 28 |
2 files changed, 12 insertions, 20 deletions
diff --git a/recipes/freetype.recipe b/recipes/freetype.recipe index 47368384..9423c745 100644 --- a/recipes/freetype.recipe +++ b/recipes/freetype.recipe @@ -3,10 +3,10 @@ class Recipe(recipe.Recipe): name = 'freetype' - version = '2.10.1' + version = '2.10.4' stype = SourceType.TARBALL url = 'savannah://.tar.xz' - tarball_checksum = '16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f' + tarball_checksum = '86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784' licenses = [{License.FreeType: ['docs/LICENSE.TXT']}, License.GPLv2Plus] configure_tpl = "%(config-sh)s --prefix=%(prefix)s --libdir=%(libdir)s --with-harfbuzz=no" deps = ['zlib', 'bzip2', 'libpng'] diff --git a/recipes/freetype/0001-pngshim-Workaround-buggy-mingw-compiler.patch b/recipes/freetype/0001-pngshim-Workaround-buggy-mingw-compiler.patch index 266f0308..c7878728 100644 --- a/recipes/freetype/0001-pngshim-Workaround-buggy-mingw-compiler.patch +++ b/recipes/freetype/0001-pngshim-Workaround-buggy-mingw-compiler.patch @@ -1,34 +1,26 @@ -From 96395f10a35a81b33064276f921a1bd0636d4837 Mon Sep 17 00:00:00 2001 +From b41f16d79b5e81cfca7a4bfc4aad68e87a8295d9 Mon Sep 17 00:00:00 2001 From: Edward Hervey <edward@centricular.com> -Date: Thu, 22 Feb 2018 07:56:35 +0100 +Date: Wed, 21 Oct 2020 14:03:36 -0400 Subject: [PATCH] pngshim: Workaround buggy mingw compiler Our antequated mingw toolchain is buggy :( --- - src/sfnt/pngshim.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + src/sfnt/pngshim.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c -index 1602026..b5fae67 100644 +index f550161..b510e13 100644 --- a/src/sfnt/pngshim.c +++ b/src/sfnt/pngshim.c -@@ -63,7 +63,7 @@ - /* `__builtin_shuffle' for gcc was introduced in gcc 4.7.0. */ - #if ( ( defined( __GNUC__ ) && \ +@@ -67,7 +67,7 @@ + #if !defined( __INTEL_COMPILER ) && \ + ( ( defined( __GNUC__ ) && \ ( ( __GNUC__ >= 5 ) || \ - ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 7 ) ) ) ) || \ -+ ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ > 7 ) ) ) ) || \ ++ ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ > 7 ) ) ) ) || \ ( defined( __clang__ ) && \ ( ( __clang_major__ >= 4 ) || \ ( ( __clang_major__ == 3 ) && ( __clang_minor__ >= 2 ) ) ) ) ) && \ -@@ -81,7 +81,6 @@ - - typedef unsigned short v82 __attribute__(( vector_size( 16 ) )); - -- - if ( row_info->rowbytes > 15 ) - { - /* process blocks of 16 bytes in one rush, which gives a nice speed-up */ -- -2.14.3 +2.25.1 |