From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 11 Apr 2022 10:06:23 +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 1ndp44-00Fd4r-Cu for lore@lore.pengutronix.de; Mon, 11 Apr 2022 10:06:23 +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 1ndp42-00016D-F7; Mon, 11 Apr 2022 10:06:22 +0200 Received: from mail-db8eur05on2078.outbound.protection.outlook.com ([40.107.20.78] helo=EUR05-DB8-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 1ndp3f-00014f-M0 for ptxdist@pengutronix.de; Mon, 11 Apr 2022 10:06:03 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n92PvtDmwywzN2rO8LyxOk1zYXWaQqf0VMWTQkcMwP8GMRMjA7eL3ojftE9ufWd+IXtGW3h/Ip9TbDClFsZvFW/Rg5kApguKpp8fX9QSxr1JbZPY1517ragLLwg8dCE14IVo7+czkLjPSkazjUbfxg7bAzXdbseyZIktZMLijSwHI6jt3pseOzZtZsCF/qwM9zAXnFFw31uku6IaI9giAzV/GzqhtUSW3y9M50jnN4vng3A82JQ7yRLx5aUy6PtaSame5tfhTiDhTeHldix4NtBIXQSXHXj96+TAiynVBl1m0dzhXB3dkOgvgWSt6rXxSE7IeZIT0LPgZzt/BHlPSA== 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=Bc4md8shi/Q7RKk8JG5LOwvqGtlphUqHIUBVoxPbC00=; b=XDlLAsuVEY62UxtPotKWaBw1RiS/FgBJS9rWjovewYaFXRSFtE3pfNt/IKM3mx+nuiYo0xJPoLWvwu/XOgnnvhr4M2y3s0YYkcq5cNrtsP8/pB/+DpVkPJhdRJwekWCUs/u1YM2jhLPoMHxQrAnHKYzDvEjK+86x7mFnzhhexD0lu2a5KDS3fBQ5O4aGMvkJTZo+nhA4nbjH5st8ZTMmiTna/T0jxjYaO1Tavuai9UjFMwmbx3omlm9G1pY7Rgny2j9aBwHtPhF9iL+PT9Lg28kOyL/cDuwx+I5NB0FxOZx84kRks9ZSFQOCUjra3cxXgi+27pvozsTBtXflzYkf6A== 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=Bc4md8shi/Q7RKk8JG5LOwvqGtlphUqHIUBVoxPbC00=; b=ACdjMxR0zih605mLPShUnUVf900Q542kDfvBkOuyAaOO3tshkLWGibyEWuhP6JTD+WoO8mlANWawtwPb6gdCJav6eXISQXWcaTAirNqMvu1hj77KLwSIwJaXn93o8YcrQhvUz5PzIJIbNUS8HpHvHtf9SN/pmx9g46H9JwwDLsA= 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 AS8P251MB0295.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:34f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Mon, 11 Apr 2022 08:05:56 +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.5144.029; Mon, 11 Apr 2022 08:05:56 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Mon, 11 Apr 2022 10:05:42 +0200 Message-Id: <20220411080542.3315311-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.32.0 X-ClientProxiedBy: GV3P280CA0009.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:b::25) 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: 93b91f0d-0635-4d27-3ded-08da1b921b0f X-MS-TrafficTypeDiagnostic: AS8P251MB0295: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: 4R83bplSnOyYBc5s4GMdBjZ2+LIhtAEqfnOHQ4IXn+8RWLwmBUSN8EHYqsVpkn05qIlhNPJm6gOs7pgdmklIBCj/REUu/+Q9q6UGcx8uYfKbPDFvwoDz1NsyxNjXSX3716pm8zVdIVLd4wyhXFvnd6Nf9yXBmRfGVWYzk6p+nhgo8m5nGVA/ymRHCeS9vn5lyAQF9loyLdOxsCkF8DrrkixRZsGs6hV5frfCbinSubJS+XVn51e4rznwll8VOtVd+ifyW2b0XyHjgRp/6UyKf+pH/b1QQhMTp07z4lHv0mRxNHTXXuh5leWHfuWiQdeGO7fmq2EHE3ftx2JCHTPGP4zcagtfXN4UB1P1CoRAPr+9QTsp98NZeNMJzAaPpwGlBNEHXRrSM1UO7UpJZTjKxIfxoZgZdRqI9Baf3BX0Jl3OxiO6N3ZXoubP+qw8AzD0u56Ax0P3j/VHiTvgQz7BWPn16+iMwQLGRNXplktpuI1VLaSbgYs0pQ0A7f4eOzwS9cNcJQonb3uLUT6zDPLDia/BBchQQ/qHlnoKJNbootaKE8kewgH/SA1eEggNvVGP5H5l993BRL1CO+Nj7h/GC7iHY2NgpIuPj9y/apUfHvu2YMWWnictsG6MWL1CiryDw7DtBk+Fz+c9FB75wAGUoc45xzePxa4ruteR2yWccC41vew7emjnfV5rQzW7jaJx/fWXY4brUQ25Xpc9WH+CjA== 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)(366004)(39830400003)(136003)(376002)(396003)(346002)(2906002)(6916009)(8676002)(316002)(66946007)(1076003)(66476007)(66556008)(44832011)(5660300002)(8936002)(36756003)(86362001)(83380400001)(6512007)(52116002)(6506007)(6666004)(26005)(6486002)(966005)(38350700002)(2616005)(38100700002)(186003)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pQdJJ4nzLwX8d9rbeE8hgQTkk52hTWhKTZY2vc53XiPG+owdJgUOQFDCYWZ8?= =?us-ascii?Q?iHBGwlSJRrhozclR+D9Y9eUlwdDDRnxVQPRqStSqVF97gGgrPl81lhCz8Co7?= =?us-ascii?Q?BsgMCEyMpNYFzDHkJFcnDeITk6khf2Y5j11x5xWX1TTKd6TBk4w8C4UuPbzN?= =?us-ascii?Q?U7Cj6TfTYux/gI7rGmPGUSNb+1GBJ+yVA5eYUwurpK8E3GBZZHp4ylUCJ9Lq?= =?us-ascii?Q?AKPE/qURxmG075rvF5fIy9wLHj0z8NeslVE0ah1yGURzh6Y0KF6yBGhVLeHh?= =?us-ascii?Q?vN7NIQ0Q2w/Clmr4PVaDjf3Begz7gHJX8r3jYJxBPrSvqaB70dGs91J8U9bY?= =?us-ascii?Q?Shhvnz2v3YmMROanqH6rfQTnM6xsSCVS11zOugnKCHThytjrab/bFcInNDyX?= =?us-ascii?Q?HOc4/zccWT2WtA1i/H3CJbOi2bmgr4jsYrvFE9orXBJDyiHEQ220PoXX40dK?= =?us-ascii?Q?ZVLHYm3sJkwIgfVJ1f4Wdfym3cGGZ9VJfYWfRAreoYK8eKjTV3p2RnEGxXC6?= =?us-ascii?Q?ndIAZJPeTmdGRFR3ZAEDcUypD2jV/Od9vb9w5QMgLo63lUfqxXO2hZ5wqYGV?= =?us-ascii?Q?5zeoq3dRXVNzd3I2gpW0GX3HNlRG4dMmCM4BNU1+CaA62SGd1AXrgM3KJRfh?= =?us-ascii?Q?B95+GL0mbCWF/YP4OcLbXSIbUguZ5EYmtqh+Ap4pkrMV5/whKKHmRIWK+ka+?= =?us-ascii?Q?y/4PvM3HOUomI20OtIFkgS3BnnKXsFzhAk+vzkTW4LlNSyQpP3Rv5UgyNrol?= =?us-ascii?Q?gBNbkvgYq4/KFqbuvdG/i9+il4BOfReTXomX5sBHBL1ZopQ+12HHeXBTRbW0?= =?us-ascii?Q?mnuxlvkQyH5Q0IO+eSCWLD3dwYgrfanB8py9rKUcmv77olNmKZbcC5upnJh0?= =?us-ascii?Q?RF+ga8AA7x+lZrDgFYuj/TyOEqd8eh1cOTjze8n+fmmApxyrHUPmawZ1rneI?= =?us-ascii?Q?2UVj81h7vAiQJhTnUxA+Y7cQ7EUZhY84QOmHlnXBg3BUv9ypGI6a3lSPtB6C?= =?us-ascii?Q?b3rnO7wT2pk9naRg5YpAA+Cx/MPRrU5QiiIhL+sxWh5q4yQX12Fnl4FjScfT?= =?us-ascii?Q?REk8OFOcD5KQR4zpXQwKYLNxMV0/ovtcGcUh3GEOYjtxp7GmALbcvzn/p4Ak?= =?us-ascii?Q?TqSLOFebfUFx8iG8l7RkdGm8uiXlPRHHWqr9Kw9wn4iTOkr6SCgNUfsyVlPL?= =?us-ascii?Q?y55L7lEzuL52N5xlWdK9mjUd0u4e9EcAppXn4shYEw7GMF8KMbgJ2x6ujtoj?= =?us-ascii?Q?NwOdmfzFDrmoMSWtzhRvU5pakJsTplzNbW2MuYtV0dx2y822g1YgcAacY6+w?= =?us-ascii?Q?t3PrREqU4Ge/tHbzqvEtZXdfpMbEJe6Hm5YL/nEhjq+lsY/AZw4Ngo5EaiIj?= =?us-ascii?Q?jHRd+2KvdFQfse9BY+SDdP0n3kWY+3x5r01qGRN16aFcm1CT8ww7h6ZAPsh0?= =?us-ascii?Q?tdFDR9JT9+ggSmaIUDi3cC06zSzurLGKnXZoORPhQIWaW2zyo3bpc8LgH0ev?= =?us-ascii?Q?wVgxIeas+Pn6sblsiWwV0TN66zcyidSpUeM0+VwOZlEFLskS18grq5lKwPwr?= =?us-ascii?Q?Ka3t5J9DV4KMOmOdc5PBheTEOgssznXhNakebBroFBEKGg1nJIjhmJ3uYvS8?= =?us-ascii?Q?LcFjlRxxGESNJIig1RrjqWxCMKU54CT41lFTJJhg7Gn5RqK4EptEobP4cjMe?= =?us-ascii?Q?uaTOm8QTpXH/lX2zxLFP5jR0DzdJHO9iI5eDYqEd+F8GtE7XqtURdH6tn7zM?= =?us-ascii?Q?5ILVyWW4kOB5wZU7E6cTNAIuvhuE08D0yFLx6b3dmp0SwKOnQy3A?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93b91f0d-0635-4d27-3ded-08da1b921b0f X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2022 08:05:56.0755 (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: kolZMCUogRF4yANLqrJDazKNs9ySY1FBAugTfr/7DyAgCoEdEEBc7p7flz9IC2PVBFTqNn8udEq4Fu4f+ms+w3H1oYok/Cdw/g62cZ0f6x8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P251MB0295 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_DNSWL_NONE,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 v3] 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. Minor in the sense that they are whitespace and path changes. But they indirectly touch a lot of lines (line break position). * 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