From patchwork Tue Aug 25 09:50:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3398 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPn1JT2z3x24 for ; Tue, 25 Aug 2020 09:50:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPk2kw0zvT; Tue, 25 Aug 2020 09:50:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPj6DCRz30Wm; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPh26whz2yDq for ; Tue, 25 Aug 2020 09:50:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPh0t9qzm4; Tue, 25 Aug 2020 09:50:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fWAAkHz9mS8jKQSPNQjaQMxTg7ugj45k8h2YdSHdCR8=; b=xsA5T78079Slk4SNOaT/Q5kP+Yvt4I2xtaahIlNGPpFKiav/BtCub0y+a4mXYHi0xogitl pQov+hb9qa8vEMDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fWAAkHz9mS8jKQSPNQjaQMxTg7ugj45k8h2YdSHdCR8=; b=nK5Uu+Ytq9uyHngzEnG6gnMM223sCpJJDgbwOuXXXErQh2iR1BEEHY7QB5hmNdYn9K+R6v ag2fZDvNh1YXY45MTIjMUQ8TCjoIFx5f18D2BWsW3OBpxbNphOeIYt3CD6h7JNje+zTeW6 uca4awHSeVTRJh8wjdWffb8ksMqyhvwRvDTRs3/8fHEU2M280DiyTQHLkDydUwVIROoIOG j5gAk39vjupzKuI2E08MIGpqzj7mnUCSSFgnRwPdc7Bmbg0E83/c0MJjd1/VN36jVTiGgQ YMNPQxwtdN7T7Ts9ObbptDZNLQWm/YRVNe6VgioL7AZU8Orp5mxBscou/a8bhA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 02/12] freetype: Update to 2.10.2 Date: Tue, 25 Aug 2020 09:50:30 +0000 Message-Id: <20200825095040.3854-2-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/freetype | 5 ++++- lfs/freetype | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype index 38bff842d..4d72ec357 100644 --- a/config/rootfiles/common/freetype +++ b/config/rootfiles/common/freetype @@ -18,6 +18,8 @@ #usr/include/freetype2/freetype/ftcffdrv.h #usr/include/freetype2/freetype/ftchapters.h #usr/include/freetype2/freetype/ftcid.h +#usr/include/freetype2/freetype/ftcolor.h +#usr/include/freetype2/freetype/ftdriver.h #usr/include/freetype2/freetype/fterrdef.h #usr/include/freetype2/freetype/fterrors.h #usr/include/freetype2/freetype/ftfntfmt.h @@ -36,6 +38,7 @@ #usr/include/freetype2/freetype/ftmoderr.h #usr/include/freetype2/freetype/ftotval.h #usr/include/freetype2/freetype/ftoutln.h +#usr/include/freetype2/freetype/ftparams.h #usr/include/freetype2/freetype/ftpfr.h #usr/include/freetype2/freetype/ftrender.h #usr/include/freetype2/freetype/ftsizes.h @@ -57,7 +60,7 @@ #usr/lib/libfreetype.la #usr/lib/libfreetype.so usr/lib/libfreetype.so.6 -usr/lib/libfreetype.so.6.13.0 +usr/lib/libfreetype.so.6.17.2 #usr/lib/pkgconfig/freetype2.pc #usr/share/aclocal/freetype2.m4 #usr/share/man/man1/freetype-config.1 diff --git a/lfs/freetype b/lfs/freetype index 795ba8378..4106d22ee 100644 --- a/lfs/freetype +++ b/lfs/freetype @@ -24,10 +24,10 @@ include Config -VER = 2.7.1 +VER = 2.10.2 THISAPP = freetype-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 78701bee8d249578d83bb9a2f3aa3616 +$(DL_FILE)_MD5 = 7c0d5a39f232d7eb9f9d7da76bf08074 install : $(TARGET) @@ -70,7 +70,13 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && sed -ri "s:.*(AUX_MODULES.*valid):\1:" modules.cfg + cd $(DIR_APP) && sed -r "s:.*(#.*SUBPIXEL_RENDERING) .*:\1:" \ + -i include/freetype/config/ftoption.h + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-freetype-config \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP)