From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 31 Mar 2022 11:48:07 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nZrPU-000N40-Go for lore@lore.pengutronix.de; Thu, 31 Mar 2022 11:48:07 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nZrPS-00005A-Ej; Thu, 31 Mar 2022 11:48:06 +0200 Received: from mail-eopbgr70072.outbound.protection.outlook.com ([40.107.7.72] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nZrOy-000051-2f for ptxdist@pengutronix.de; Thu, 31 Mar 2022 11:47:38 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XSZqzyAW3/bUuMlwKxxFqfi1CFBeQzoffhkCPKvqnwgCMecyHNShx65wO5A4dzIGy6xlB0hq6AFHkAd1bCuRzkLLROfrQg5JvVpj4m+O7c12rgPtVhL1fH44aw7yK0CVlhZxfmUzALOso3tOXDtkO6Aei3dATUmHKwjXvirjGsng08aFxyH+8ohWA33Q/A6Yx1jobhpIzAFYqpD8zh9sK3fHPCPYstqI8M0htFAD114JzqCThbHzL5+TdRQqLLnkl9vWe2gtoTQGrmtioBP0V62emQdOlZ83OvwBDO+KH3N58R0rXXDSQRTQ+OMETQQN/XfZ/421MxM1UmwCxhJzeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lT/l2RlhwnEZ+zKUD3imkajTey6UfwCZ05Gz17eleLs=; b=ZWmJOkO93s0kzrEK0nwhe0PaufDVALOxsX07x5ojXmk0mecU/KiEedRToc4vi63ejAf3003Iv7ISbCeo24ch4lxwLToGohWqn7F/FHLTQqe46T1TyJ9Rn4ktffrbkO4h00/g/NERUGk42NRD2YhW1RtIvc+YzwlLjsdNSR4iYr1qwMLjnbsC3MyEfRzMYAlNir8q97mAbqrwBFFAt0oRI4D9Wr5ivmirffU2ezoAusAOV8NUufTfj2AzZ5FlKO6qXWBHYF/97E2IPTdFaP2WH8WFLNYDwnw+zzuVMXFzJO/CxXh4DZrsecv1mRtL3JrYWmCmAH3xH3aCl3nZaA7vPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lT/l2RlhwnEZ+zKUD3imkajTey6UfwCZ05Gz17eleLs=; b=PlbGuuRvx8ozGCmrCnqe068EWtj+dGsAwoQXYj3ch3wuDaroDLcrrhCQfjCRljo0ZchNuUCw94E0lUZLdTSaMn471YCuPdbMYnWdQMULoQw39BQDiICPE3R7uKjg6gjZX3+4Sz+jCqVsXI737dXaJxUNaayRIT3wtpVU8oblxIw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by AM9P251MB0400.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:3de::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.21; Thu, 31 Mar 2022 09:47:34 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::3ded:58a4:e21d:33db]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::3ded:58a4:e21d:33db%3]) with mapi id 15.20.5123.016; Thu, 31 Mar 2022 09:47:34 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Thu, 31 Mar 2022 11:47:27 +0200 Message-Id: <20220331094727.3486383-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.32.0 X-ClientProxiedBy: GV3P280CA0089.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:a::13) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c748cb52-5d5e-4fb0-9007-08da12fb7b20 X-MS-TrafficTypeDiagnostic: AM9P251MB0400:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8G/UtU1v02sd+BdaDVkBWBfI6PeoR1GnJ9gfks7nVFbIagCu3UmHvCgw4BD3jn2iQefAl2t/LihyUXzM3pwqZsLRwLomFSY4DUw6OtDvYe/z4mpzQ7/NZ0/rXphGGVhacshHOWUBXFDCXdUrVKx7aClpSHV3R91m4JYMu2lN8aYWOcP8z820di/O//SVacseT7j0BRE1ORhGriH+bJO6M4UHqt7ikebUSzvfA6pJRUqjKDIuFDc4CHu/AP8sYePO40JJ0IrpUOgUuYl666Os6Tj6Z51zItabKqKK8CBnbkaoIYcMn8OzPr/2NtQE986/yOfHGG5nLQaJzRKVkS9GfxpgKMKxZ0uE+xIVVosi7KATvFVaXf8zpmKbIW3CYsd6c9oHeSavC6aVnfb1wQJBAesAbRoHAsEo0IAXhfLseIER+l4Mq9XTpQ4t8CYOgBfzTz1y9cOK6YKaPCsxveZXM6UO2FieCqA1/NMhM+9aPSszRab0QvJf20tqokz/QiQiSMEbRjzcViCaNR9ZcFdUuKYLAOUyaBBzD/c5EoDFbVAuJz+nvpE9aVoQIQT4ZPYOHccffqvOt3sUwdx2z8QjxMFli1GricFC0dq2mLFh5XAClHdSGHpwYq7TJl05vurjKiBMTvB+izKJcD86JxtyvVcR8DkkKbQELJbXAewjAobFxf2NHrsBAex7FfJKLrRSyR35XQnNyAfs7PBUdcrQ5A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(39830400003)(366004)(396003)(136003)(376002)(346002)(2616005)(6506007)(6666004)(966005)(6916009)(6512007)(86362001)(52116002)(6486002)(508600001)(38350700002)(38100700002)(316002)(36756003)(83380400001)(186003)(26005)(1076003)(66946007)(66476007)(8676002)(66556008)(8936002)(44832011)(2906002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YS3FSNb4H2NgVvSsPSuLblBFBj9pTiVw0USeVZl+2arL8I/HzNDNTxJnpMYD?= =?us-ascii?Q?VuqARRXZyi8KE4fBLdnggjVrNhnBlTi2Ug3S8wIHgpLABifAlS8c0WPqeRr9?= =?us-ascii?Q?VgbMH/Jm6uTF+0M+haizgQQTJ5CnhDfFuj2Vff/wlxaTYWfd2kcP18fQIHUW?= =?us-ascii?Q?ISuPwcAMwQIDsNRhMXAlSI4jpkLTtBSY5G+1D747XuoIg6AMw4xqEinAI7Mf?= =?us-ascii?Q?VWyeV3likHqap8dNO3cZjS2yrbIPGD2PXDlMdDImHpab5liByRKvy/zOn/YU?= =?us-ascii?Q?S2ZcnDr+P+vu3QHS3V0Op6mEu30PfxH/CVv8o2pEfov0v1EZeHJJkjrb6Xqh?= =?us-ascii?Q?piULcNHkHxG7dzsxOcuHxuWSwIKW0oOwlGfuMBG2FEk9HQF/YBaczfj9tdzF?= =?us-ascii?Q?4PHu3P8zR6cdWk7fw+V0ovPVGx4ufo/qolMJF45g3twd19mZ+KPz39FNzQ/U?= =?us-ascii?Q?SRlYhXyZVi1zyoG3Yq3XFIt8hq0lo7NNZTTEFdI7U/uiPzXNeRResj283X1t?= =?us-ascii?Q?MSrvMF3kMjqgpqi2ZeuFwgZPy5lUxI1vosuDxDO0DbEmrzHjOH0L3rlfomVw?= =?us-ascii?Q?x1/45+God3WCQJPdRhNJipdebN0s1KCkzfMxui8lbVD6pZSIMHr1vFgwv42m?= =?us-ascii?Q?hZnnZNYCAsW2BhKkt3QFn3CK+rDwgs7V8u2afK73HWuEOziG7s+YattX+JhE?= =?us-ascii?Q?kyKXjrfFW+w+QpPNuedaUKJ5bv/YkalzRei/vu7aIxRD2Y9KPvd+5BQBJRdo?= =?us-ascii?Q?WLoRlc27uxkbOGO7UQsZeaOGrEeCr9gxdur7wCLxpDnOx0EeOnlYScK8KI8/?= =?us-ascii?Q?eAAu5wNSt/K/jseiRJxZlsLBpIvhvomGCEEWwojckyQTfGymcz8xgSnkQyxd?= =?us-ascii?Q?DG+8/HfyqJqfpqSxdO608m9Vp89twN3J++zIlQfz93lJCFrvdKt5Ww2C1xNl?= =?us-ascii?Q?bAor9GmeHV/g4h4ZscijHTRRVCm58pcjSTa+lfNED1shwQFtz9JfsdH1lMxp?= =?us-ascii?Q?4BdVeZ2QxVWZDNLBYfD+4W/QRxiqEYDTuNfZsw/etGbLtUAW0wqt8RZLepWG?= =?us-ascii?Q?A4mUiFjOUQvPgRIIjeQ95T1MtkQ3PBz9ZRlGOzPTqZ0ncijpSiXNwNuP6z8R?= =?us-ascii?Q?hkifJbQrMW15wMo948gC4hSTsmg4CNg726qejSgtcSFYX4d0J1j5pPOmNGhy?= =?us-ascii?Q?GhfeHhjKO/YF16SaRSjIblMt7yEanI6ZhGFaGP2MAm7j48S39inqf+W39iV/?= =?us-ascii?Q?N1mtQ4FUclszMsu/SKXchVexraQW8CbcG6HBTsog1c9G13dcs7FsXgzJT8bm?= =?us-ascii?Q?/+BwATMlJGUcg0PmR7RxY+eUighw/87qZTDOMpcDW5iTemKYBzy/ExaPmYnE?= =?us-ascii?Q?/RG+N+IXsqFKlizfRxPmGO/01hohi2ME1XqJYPe6m9np2XECUKRH3iemRmCY?= =?us-ascii?Q?uoKtvQId9jqVncupwiEYfnR2+ixqLAYqlJbsSzaM0KixZfhw+ye7KZ+3ihnN?= =?us-ascii?Q?yBQiUlBCicoVjtuuFabJzBxYG6wUeIhMn5tAalUKX+1U7FYjac+HqhFropgb?= =?us-ascii?Q?2WBFC9v1xFiryHTLUoL97BmqvZp7n0E1oMdyD74gQ/Rq2VMHhmaX5KMmmekC?= =?us-ascii?Q?nxaGjkLghI5QHRYNovP9CgL9+FEXrVC3Tgsdhy+ehZB5CXRWWoR5KDoR3K/D?= =?us-ascii?Q?1oRNuLyhObAL1zTEuLcAHOp/3OfVLDjajm60hQw/CzmrhzMRrhFJtNq7l3+p?= =?us-ascii?Q?fv3VZHmr6l2hGILkZe+tH5GEsDw+Vls=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: c748cb52-5d5e-4fb0-9007-08da12fb7b20 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2022 09:47:33.8950 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vSVg2ZAVX0t4GlovVxDYOgCaB3ijQqOuor+1st8Cqc+BEEIFO6VX3GmQhn8KKQONblNoCLMk3vckP5aa4ghrvgF9lT+KI5IujFM1wHATZKw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9P251MB0400 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] freetype: Version bump. 2.10.4 -> 2.11.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Various fixes and improvements. Changelog at: https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/CHANGES * LICENSE.TXT moved location with minor changes. * Change options. disable-biarch-config is gone. Also disable new brotli option. * Make comment about freetypes top level "configure". It is handcrafted. * Regenerate previous patch set, cosmetic line offset. Patch seems to work fine. Signed-off-by: Christian Melki --- ...freetype-config-and-freetype2.pc-correctly.patch | 8 ++++---- .../{freetype-2.10.4 => freetype-2.11.1}/autogen.sh | 0 patches/{freetype-2.10.4 => freetype-2.11.1}/series | 0 rules/freetype.make | 13 ++++++------- 4 files changed, 10 insertions(+), 11 deletions(-) rename patches/{freetype-2.10.4 => freetype-2.11.1}/0001-generate-freetype-config-and-freetype2.pc-correctly.patch (95%) rename patches/{freetype-2.10.4 => freetype-2.11.1}/autogen.sh (100%) rename patches/{freetype-2.10.4 => freetype-2.11.1}/series (100%) diff --git a/patches/freetype-2.10.4/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch similarity index 95% rename from patches/freetype-2.10.4/0001-generate-freetype-config-and-freetype2.pc-correctly.patch rename to patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch index 62052db8c..9f6d6b5fc 100644 --- a/patches/freetype-2.10.4/0001-generate-freetype-config-and-freetype2.pc-correctly.patch +++ b/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac -index f54b94631d27..28420c6ba3bd 100644 +index d1b7f1a78c59..11490364fd51 100644 --- a/builds/unix/configure.ac +++ b/builds/unix/configure.ac -@@ -1164,7 +1164,9 @@ AC_CONFIG_HEADERS([ftconfig.h]) +@@ -1094,7 +1094,9 @@ AC_CONFIG_HEADERS([ftconfig.h]) # and `builds/unix/unix-cc.mk' that will be used by the build system # AC_CONFIG_FILES([unix-cc.mk:unix-cc.in @@ -26,7 +26,7 @@ index f54b94631d27..28420c6ba3bd 100644 AC_OUTPUT diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in -index 3918ddb92f74..847d9393f09c 100644 +index 4edb092d09c4..f0864cbec48b 100644 --- a/builds/unix/freetype-config.in +++ b/builds/unix/freetype-config.in @@ -16,13 +16,6 @@ export LC_ALL @@ -94,7 +94,7 @@ index 2d759ecf8bfd..f44f14cabf9a 100644 +Libs.private: @LIBS_PRIVATE@ Cflags: -I${includedir}/freetype2 diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in -index 5e04f1c6a705..8ed66631dfb9 100644 +index d0c758d03fb2..dbfc40bf303e 100644 --- a/builds/unix/unix-def.in +++ b/builds/unix/unix-def.in @@ -153,7 +153,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in diff --git a/patches/freetype-2.10.4/autogen.sh b/patches/freetype-2.11.1/autogen.sh similarity index 100% rename from patches/freetype-2.10.4/autogen.sh rename to patches/freetype-2.11.1/autogen.sh diff --git a/patches/freetype-2.10.4/series b/patches/freetype-2.11.1/series similarity index 100% rename from patches/freetype-2.10.4/series rename to patches/freetype-2.11.1/series diff --git a/rules/freetype.make b/rules/freetype.make index ed6d22379..c65a2dbcf 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype # # Paths and names # -FREETYPE_VERSION := 2.10.4 -FREETYPE_MD5 := 0e6c0e9b218be3ba3e26e1d23b1c80dd +FREETYPE_VERSION := 2.11.1 +FREETYPE_MD5 := 24e79233d607ded439ef36ff1f3ab68f FREETYPE := freetype-$(FREETYPE_VERSION) FREETYPE_SUFFIX := tar.xz FREETYPE_SOURCE := $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX) FREETYPE_DIR := $(BUILDDIR)/$(FREETYPE) FREETYPE_LICENSE := BSD-2-Clause AND FTL AND GPL-2.0-or-later FREETYPE_LICENSE_FILES := \ - file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \ + file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \ file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \ file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \ file://src/bdf/README;startline=98;endline=140;md5=d0c2c2e2e102c393a12869bc34515be2 \ @@ -37,14 +37,12 @@ FREETYPE_URL := \ # Prepare # ---------------------------------------------------------------------------- -# -# autoconf -# +# freetype's top level configure is handcrafted + FREETYPE_CONF_TOOL := autoconf FREETYPE_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --disable-static \ - --disable-biarch-config \ --enable-freetype-config \ $(GLOBAL_LARGE_FILE_OPTION) \ --enable-mmap \ @@ -52,6 +50,7 @@ FREETYPE_CONF_OPT := \ --without-bzip2 \ --without-png \ --without-harfbuzz \ + --without-brotli \ --without-old-mac-fonts \ --without-fsspec \ --without-fsref \ -- 2.32.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de