freetype: update 2.10.4 -> 2.11.0

License-Update: formatting, changed location in source tree.

(From OE-Core rev: 28023ea2193405987062aa86d199d7844716cfe6)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2021-07-30 13:45:03 +02:00 committed by Richard Purdie
parent 3665b46e5f
commit f1a277433c
2 changed files with 22 additions and 5 deletions

View File

@ -1,3 +1,8 @@
From 50499e4482d40cff2ef05905c658ba4380e7e6fc Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Thu, 7 Jan 2016 21:13:07 +0000
Subject: [PATCH] freetype: enable out-of-tree builds, and use host zlib
Freetype think that it knows best about where libtool is, and explicitly the
libtool autoconf macros telling it where to find the libtool script. Of course
we prefix the script with the target triplet, so it's wrong. Fix this by
@ -7,8 +12,20 @@ put libtool is used.
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@intel.com>
--- freetype-2.6/builds/unix/unix-cc.in.orig 2016-01-07 19:21:45.244943479 +0000
+++ freetype-2.6/builds/unix/unix-cc.in 2016-01-07 19:21:50.213112131 +0000
@@ -19,1 +18,1 @@
---
builds/unix/unix-cc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index 89be450..72609d3 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -16,7 +16,7 @@ CC := @CC@
COMPILER_SEP := $(SEP)
FT_LIBTOOL_DIR ?= $(PLATFORM_DIR)
-LIBTOOL := $(FT_LIBTOOL_DIR)/libtool
+LIBTOOL := $(FT_LIBTOOL_DIR)/@LIBTOOL@ --tag CC
# The object file extension (for standard and static libraries). This can be

View File

@ -8,14 +8,14 @@ BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype"
SECTION = "libs"
LICENSE = "FreeType | GPLv2+"
LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \
LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \
file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec"
SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz \
file://use-right-libtool.patch \
"
SRC_URI[sha256sum] = "86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784"
SRC_URI[sha256sum] = "8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7"
UPSTREAM_CHECK_REGEX = "freetype-(?P<pver>\d+(\.\d+)+)"