From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 09 Feb 2023 14:38:38 +0100 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 1pQ78J-001hOU-Hm for lore@lore.pengutronix.de; Thu, 09 Feb 2023 14:38:38 +0100 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 1pQ78G-0005Nc-8J; Thu, 09 Feb 2023 14:38:36 +0100 Received: from mail-vi1eur04on2087.outbound.protection.outlook.com ([40.107.8.87] helo=EUR04-VI1-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 1pQ77n-0005NK-B2 for ptxdist@pengutronix.de; Thu, 09 Feb 2023 14:38:08 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KR7pblN/2eertZJLKNrOuRLvlO4B/dZExlw1pUR66c16rAdqLLIi21AzNkJpg3BRfadSYSDvQCAwPduZyb4a4J1FhWTZiiG4ZtDhLxaKUSCk8pnd5ZwMMwTF/hLCajNoFd7fPqc8zJ7QbAU82NDZySs6qGxR8wRemBx3AXzObHcr/qBPg8+rWRHOfg+ajJUQfh/yLQXkJMvH+enGK6c7QLaSF0A3SPi7oNJPYxLeGfe1b/DKA6kV5TFZhX3gwiTDbHVhnfmlegql658M8PB6Gd+6Dr5EWlzgRKiQCx/IXAUyZmxtYFxqbcmCLAGDbN49koAheXMXCrLNEKWRFaVfAw== 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=VWpfrFY0MkQ6ahao428jDnyL8JlK1ppAIY6FlyJkWX0=; b=PD10PgT7fFYf/ADDHz5LGwufaSRZO0IInPIHvfp/jQBwSQ7McARfG+GG1/eC643pbzat8Ax71a5k+TI7se404+/Dz8VnNECZn+p+xR9xP5IUmRBRHlirUOhffwrUhxYnbrLuw8wZOXUu7/F4T0gdqP01RoM9cklYBk+D4T4SleTERAobx/qoD1nyg0n2GCG73Tn8Cs6wXNysS4A8L0qGGNaRTzECveoxd9J0nswV8xZvV8FyrfZj9jZB4nt8i8hZYHppnzI9d6B6C60+b0eHOtsPaLRX+sb+SpCrgT95j5jyzEVyEq04+5mDdi3xxldJwwTp4v04QWt8Rh1BTQQGMA== 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=VWpfrFY0MkQ6ahao428jDnyL8JlK1ppAIY6FlyJkWX0=; b=XEgmRrR88Wuiu4Moe7ksqpVpqjL5Bwkcd7MyhoJ6JIFrlnNXYhgGvQcDSJ4B602v3zhwCWkgFE7aZVGD8gFpzm4fpNXdaUeU5AeP2FWf/HWZn+4x0NBq8DlfKhDWfx+P+728wc8euaSCqYAflo3j9b/TfA1uVtcfq1htXvUVswo= 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 AS4P251MB0870.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:575::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.18; Thu, 9 Feb 2023 13:38:04 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d8cf:bdbe:3526:aa50]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d8cf:bdbe:3526:aa50%5]) with mapi id 15.20.6086.018; Thu, 9 Feb 2023 13:38:03 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Thu, 9 Feb 2023 14:37:56 +0100 Message-Id: <20230209133756.2646242-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0111.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:8::28) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|AS4P251MB0870:EE_ X-MS-Office365-Filtering-Correlation-Id: c2e0cdec-6270-4a4f-88b5-08db0aa2de5b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WbJpIAapwMRU4MmjLSk6pXghmVnEq4JplWW8h5cyXr4bsNBnmel+S6p6LZb9ZYlBYGPlERjnSnx3UNg7eeFGkh7CfUDSt6Z3lyTkDrdwfiIIzIBLZCemvtl9bNWQEg4vgYHhISDcahkkD9VSuYEkjtN44HC/7bMqO1aoqJFVNc1qi7bZ7n52+mtwitseCBJcE27p4NmIdOfu/uTjYgTwVRGLHq/WYut/rlpaSdSsj5XUKmRp0qV+1Z/7+A4vngkTzE5a7soAZEFX56aj/YtvIUZxg/bPaDkibqMei7YorquZrWHvYOq803zafNXjHtNrsmCN8G1DoTkPdVLQUTJQEBjn59gIuzzB68VuYTZDlRiWyveOj5MeYfgCNRC1h+r2JqQC4xhQ+hYMBsjfxztT/RQQCn9nes7DAtUTkOhG0sw3wPIwHSdCEIxJCWPVNDAUGAKnMfWlx5z4w4zlH1+n8C4RcLV12rDbVEz2aNYuywIOGYa9VCdFOsB6LVjs4R3YZg9JLWd6YTVPLV9BJsSo7qKBkf2P+B+IKJC9Vw0ZEhir58nJWX6ZLSvO8kRyn7miS1sa/KH/hSDPjdSRybYct4SC/laItB7DCDjSNd3ASgHg7BCVcrdaJz4GjDaeoCZOE8V0kSu6XhsoMeBi9sMhi5I1YGw5mDWJtaxft0T75TKMkNKmhlWHKKBGeu75TeZLa4Omiqy5rKVvu7kfYHGmxjt38KDM35Oi94zQFOuHmJQ= 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:(13230025)(136003)(366004)(346002)(39830400003)(396003)(376002)(451199018)(5660300002)(86362001)(186003)(8936002)(26005)(38100700002)(2616005)(6512007)(38350700002)(83380400001)(66946007)(316002)(66556008)(8676002)(66476007)(6916009)(41300700001)(478600001)(6506007)(1076003)(6666004)(966005)(36756003)(52116002)(6486002)(2906002)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oII/YEhisCB6wG4ryBioONWM10eWQR9A+jMbjW9fr26nP8UHP65nJgTBHCRr?= =?us-ascii?Q?lDdu5jVCYocn4hAnG3D0dNeP8tuBPdfHzZnOiX/0iQltQotVU/tnAdafrsk9?= =?us-ascii?Q?R+BQ1EEyrQQ1vSV4tnFZCYk1WfK6aqKiztc0Gc6vFnkiPYzcwANxx3Xp6xNs?= =?us-ascii?Q?asfnGjDGZc9ir8f0UOEQMjA2xLqw69WfW3v/b64lf78NuUWVGhOLO64W1f0k?= =?us-ascii?Q?FsN8fnTPJ5VP26HCrtCjwy27Ui1zViT0S9YmLzjnYVgQYYw3XkkVF1RtQ9m2?= =?us-ascii?Q?z4SzNkOy2or5elbxIPtvf1sW2j06SlVTMXXZ/A6N0fu6g9E2UOC5K9UP3Dbw?= =?us-ascii?Q?+FD6AOvKMnsotCmiCkJJSO6g/ZKibQlcXDzqlOGyco0fz0BFoG5QWYtZ7Pco?= =?us-ascii?Q?yX7vmje/zYBceW3KzeGQJXERP20oB0q/YowyzGZEzk2ISJQJU+puA2Tq9g26?= =?us-ascii?Q?ziTNxbSOWcsAMKmS28yQ37poCqgnX5pXCJz0WhN4fzAZ9vPSwMbsf7hfKvzR?= =?us-ascii?Q?oAxpZfAWo+zoFRKZS/rSnv01MYiooFtZJSjyF2JjxcPMCIbNA5W2JR9E1Q+C?= =?us-ascii?Q?IVtzuHDpkJtE8JRwb63sxCp5ojv7KX5d2AAC9Pn84Pois2hUy7TGCiF1OFPJ?= =?us-ascii?Q?8BFhzSoH/89nMH2W7SZRiuvqKOHtFwnui3GWLmMfTU/9JI6j+mcWZfn8EzoT?= =?us-ascii?Q?ag3ORQkadMv1eU/EmaY41PFF2cYuSGq+CdJ1fRKjTDTX7osGaN+pxEaj7pjQ?= =?us-ascii?Q?7u2yave1XEycUI8tWUrJpmOwnO6AXAvw4vHJTPj8/KubaqOcMpnrIEjDnMgw?= =?us-ascii?Q?UqLWjaOujIx66NvV4gBZDuCyx7OjZhDyu/KjQ/tCUTMhrB4cx6pP27qFlKoK?= =?us-ascii?Q?L7oSiF/wx+hP+B+lG74oEG1FmNDJiKd+l50fiwtJh4sEhw15jhwjynYLLteB?= =?us-ascii?Q?GWkkD+/KRco/kgKGYJmaLloEna8qVN0eS4UVdUcBD7s1nqrRR3fqUcQRsaeh?= =?us-ascii?Q?8fte2XGsSJJoIpxyyUk3oEPwmoBMu9GYmE0qLWC+lldAYvs3PN6NrWCWEPI0?= =?us-ascii?Q?0FDAk6WQs9aSOUA58I66OfMqUAj1/VgbQOGE8cFobl6B5vp9HlQ6+2d0bVqe?= =?us-ascii?Q?y1CxanetYFnrnvRpTJs9ddiLEQYa5s/qv5kst0I4IQOudW+tlXxKUgZMEm+R?= =?us-ascii?Q?vljcwgMp3zgLrPb9r+1DIh46MieAMj4JnFFbX0/Ibwt/SufroeoSN0M83eO6?= =?us-ascii?Q?+ro8r7DuULscxoVxUqkQoLN0s9N6qFUA1eYKNwZ2cP4BEnVGPKO1spHnY0F8?= =?us-ascii?Q?/zBSC+rnbYQfNOTWDmth7LUk7cZOQiqaxEJ3uGogqAl06oBG5Lq2QabWV5OL?= =?us-ascii?Q?BQ4zYLq6MDFWTyy/VYxvDJRAFOCIfGzNNSlZPlnSQbUufqZPV/E3RHqMoylU?= =?us-ascii?Q?kGAbY4O0iCHqn1wiFAe4SJMWq3XwZeTDZlgeKg5ewmPH4t6SFSJgei3DCOJP?= =?us-ascii?Q?2VCSbvEEj1mjXSImTQHMcX7hGNEbwo2H+wCrmGIY5+PvTIW3UeHg9tDpMMpk?= =?us-ascii?Q?MkwenSiBdI4VuJPyk4Ipdz9DJAbzBdPEJefrHKDPB2DcP39N7r2RHdugPhR8?= =?us-ascii?Q?/Q=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2e0cdec-6270-4a4f-88b5-08db0aa2de5b X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 13:38:03.5983 (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: CdvQnU4NFQsQexM1pj+JY4xNWj1prXL11QZwOAWY0V/NK2VXNZD6dSvecgDTLD1LnI1Jh9gk3P0EC0KhUXVVgyqL4iWAqmnCE8vJRjenyTE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4P251MB0870 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.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] freetype: Version bump + fixes. 2.12.1 -> 2.13.0 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 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 https://gitlab.freedesktop.org/freetype/freetype/-/blob/de8b92dd7ec634e9e2b25ef534c54a3537555c11/docs/CHANGES I've refrained from adding harfbuzz support as they are currently circular dependant on eachother. Seems to be an ongoing discussion. * License changed. Files added that add AND MIT to the SPDX identifier. * LICENSE.TXT changed. New files that are MIT licensed. * Add the two files in the project that are from harfbuzz and MIT. * Change url to https. * Disable librsvg explicitly. * Add with-png option. This is controlled by a knob in the kconfig. png is often enabled, so might aswell give freetype the capability if one wants. * Minor whitespace removal. * Forward port patches, a minor offset now corrected. Signed-off-by: Christian Melki --- ...pe-config-and-freetype2.pc-correctly.patch | 8 ++++---- .../autogen.sh | 0 .../series | 0 rules/freetype.in | 15 ++++++++++++-- rules/freetype.make | 20 ++++++++++--------- 5 files changed, 28 insertions(+), 15 deletions(-) rename patches/{freetype-2.12.1 => freetype-2.13.0}/0001-generate-freetype-config-and-freetype2.pc-correctly.patch (95%) rename patches/{freetype-2.12.1 => freetype-2.13.0}/autogen.sh (100%) rename patches/{freetype-2.12.1 => freetype-2.13.0}/series (100%) diff --git a/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.13.0/0001-generate-freetype-config-and-freetype2.pc-correctly.patch similarity index 95% rename from patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch rename to patches/freetype-2.13.0/0001-generate-freetype-config-and-freetype2.pc-correctly.patch index 961b984fe..1110f457b 100644 --- a/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch +++ b/patches/freetype-2.13.0/0001-generate-freetype-config-and-freetype2.pc-correctly.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac -index 393ec3bb69a7..c58607c69fbd 100644 +index a98865a432d9..45c3bcbcd770 100644 --- a/builds/unix/configure.ac +++ b/builds/unix/configure.ac -@@ -1147,7 +1147,9 @@ AC_CONFIG_HEADERS([ftconfig.h]) +@@ -1140,7 +1140,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 393ec3bb69a7..c58607c69fbd 100644 AC_OUTPUT diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in -index c076bc1f8222..166afc685009 100644 +index 58561126f2bd..5d7cc4f36dfa 100644 --- a/builds/unix/freetype-config.in +++ b/builds/unix/freetype-config.in @@ -16,13 +16,6 @@ export LC_ALL @@ -96,7 +96,7 @@ index fe389f4b6fef..885444efebf7 100644 +Libs.private: @PKGCONFIG_LIBS_PRIVATE@ Cflags: -I${includedir}/freetype2 diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in -index 8e298ac59107..519d5958dce5 100644 +index d50994f3c928..ba02b00c742d 100644 --- a/builds/unix/unix-def.in +++ b/builds/unix/unix-def.in @@ -157,7 +157,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in diff --git a/patches/freetype-2.12.1/autogen.sh b/patches/freetype-2.13.0/autogen.sh similarity index 100% rename from patches/freetype-2.12.1/autogen.sh rename to patches/freetype-2.13.0/autogen.sh diff --git a/patches/freetype-2.12.1/series b/patches/freetype-2.13.0/series similarity index 100% rename from patches/freetype-2.12.1/series rename to patches/freetype-2.13.0/series diff --git a/rules/freetype.in b/rules/freetype.in index 5176ea91b..57731e88c 100644 --- a/rules/freetype.in +++ b/rules/freetype.in @@ -1,9 +1,10 @@ ## SECTION=multimedia_libs -config FREETYPE +menuconfig FREETYPE tristate - prompt "freetype" + prompt "freetype " select ZLIB + select LIBPNG if FREETYPE_LIBPNG help The FreeType project is a team of volunteers who develop free, portable and high-quality software solutions for digital typography. @@ -13,3 +14,13 @@ config FREETYPE library only supports true type fonts, since version 2 it supports all types of scalable fonts. If you intent to use this library in an X environment, its only needed on client side, not on server side. + +if FREETYPE + +config FREETYPE_LIBPNG + bool + prompt "enable png support" + help + libpng is optional for freetype. + +endif diff --git a/rules/freetype.make b/rules/freetype.make index 7008ebb78..696f779b1 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -15,23 +15,25 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype # # Paths and names # -FREETYPE_VERSION := 2.12.1 -FREETYPE_MD5 := 7f7cd7c706d8e402354305c1c59e3ff2 +FREETYPE_VERSION := 2.13.0 +FREETYPE_MD5 := fe73327ebbf0b629f3ad24be656d59de 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 := BSD-2-Clause AND FTL AND GPL-2.0-or-later AND MIT FREETYPE_LICENSE_FILES := \ - file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \ + file://LICENSE.TXT;md5=843b6efc16f6b1652ec97f89d5a516c0 \ file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \ file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \ file://src/bdf/README;startline=98;endline=140;md5=fef9416f085f0834b3ba93a5dc5a622c \ - file://src/pcf/README;startline=69;endline=88;md5=e0f11f550450e58753f2d54ddaf17d34 + file://src/pcf/README;startline=69;endline=88;md5=e0f11f550450e58753f2d54ddaf17d34 \ + file://src/autofit/ft-hb.c;md5=946b0e667b5fb58de5e675bc52ce047a \ + file://src/autofit/ft-hb.h;md5=3d5637ee2e72430693a37599f2eea714 FREETYPE_URL := \ - http://download.savannah.gnu.org/releases/freetype/$(FREETYPE).$(FREETYPE_SUFFIX) \ - http://download.savannah.gnu.org/releases/freetype/freetype-old/$(FREETYPE).$(FREETYPE_SUFFIX) + https://download.savannah.gnu.org/releases/freetype/$(FREETYPE).$(FREETYPE_SUFFIX) \ + https://download.savannah.gnu.org/releases/freetype/freetype-old/$(FREETYPE).$(FREETYPE_SUFFIX) # ---------------------------------------------------------------------------- # Prepare @@ -48,9 +50,10 @@ FREETYPE_CONF_OPT := \ --enable-mmap \ --with-zlib \ --without-bzip2 \ - --without-png \ + --$(call ptx/wwo,PTXCONF_FREETYPE_LIBPNG)-png \ --without-harfbuzz \ --without-brotli \ + --without-librsvg \ --without-old-mac-fonts \ --without-fsspec \ --without-fsref \ @@ -58,7 +61,6 @@ FREETYPE_CONF_OPT := \ --without-quickdraw-carbon \ --without-ats - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -- 2.34.1