From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 08 Feb 2023 10:43:11 +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 1pPgyu-000QgK-Pe for lore@lore.pengutronix.de; Wed, 08 Feb 2023 10:43:11 +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 1pPgyr-0005A7-CC; Wed, 08 Feb 2023 10:43:09 +0100 Received: from mail-vi1eur04on2052.outbound.protection.outlook.com ([40.107.8.52] 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 1pPgyi-00059V-NU for ptxdist@pengutronix.de; Wed, 08 Feb 2023 10:43:02 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cjYjrtss5FugthelkNBBqDsRC1/oAatAxUtd7cEA/dzFj+NE5uSRKc8fXqlwsuJezEm2PLS7rD9JCMhjv4XL9iEmzpBZyJrNlywe8Kt/JEC/JRQcPS91uZaxXQM8h38lyBYpvPTVcJGx1b0OE0hOjs+iBMv6XrSUShqmtikhoflGKlXj5iAle6kS5+CVukRwO+cXt+/hTeatrxgXzndClC0uXFAOlXrSFg4N63l4scZZNiCOEouo/kemiHsbd/sir5kwRYUl77/iblaBl/7pSM7rJ6DA+XrJ7IJUdah2p7epc5UQ8WtzfAmTXqOMUAGHDczrlN35Djqie6VeTtY+8g== 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=uh+rbI8o3hZOoHnYVzLu0Rg51NhNDNzzNU3uBHFyzuA=; b=OdMZBuPF5RhYrZfItvaxFX+paz10y+6Zulsi52A+1uP08236AmCNYrmsEenIrFfuKZpcXOKgn9tI4pw/nrzApCbWfjcdflAnLeJGvpou5DDt4How57IzBfvTsQ1hWPbMLVD+Af/HWhpUwz11DH3EWKm+XoX7RVzo+f61mknne+eftqIki8zUxNPVhI+LbXVGBAyWkuppy+rmJVvPf3xP+bgazg4Nr0X/3/6/A4DmZUuIklJmFX62js9AYW0nLyr/tpAK769S5tjZaLxqV4EyxGvMmP4VhS2ZJnKCaMzAtPadLOHPbczT0UWMeLQglJ1imwOwoSLB5mffVf0EGJR+bA== 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=uh+rbI8o3hZOoHnYVzLu0Rg51NhNDNzzNU3uBHFyzuA=; b=fD+P5WTpE7/kpOagCMgfWQy7C4FhKK2HwT79bI52TA1jVypJIqA+Fh8oto56TbDSugIoc1EnC+PueIyxpjXBU6nAR4SSDOhZXLYr2j9XjWWqjFOhKygO3J3pxyv8qD4+wYsAXscG5LZvtdM+SbKFet8FgRQnvJuzwlRzuNbU7iU= 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 AS1P251MB0608.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:48c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Wed, 8 Feb 2023 09:42:58 +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.6064.034; Wed, 8 Feb 2023 09:42:57 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Wed, 8 Feb 2023 10:42:50 +0100 Message-Id: <20230208094250.2595152-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0049.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:9::32) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|AS1P251MB0608:EE_ X-MS-Office365-Filtering-Correlation-Id: b7ad4eac-29bf-42b7-3023-08db09b8dc1d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sqhWxuHRpKTBeuvUVDErbXGkMSuRpjUxhzR5uT9PDt49Cm844bejoLgP2GdTYOzHjU6M1YQtifknzQjqFuwQynPB9U/oYsdmcEpGMuphsJgfHxgb486G9Qs9u8o27lsTuZ5UK9pwxmnGeUVWEz3wqnD7HpTbqsvwJEdbW3c+kx6rElnWEgmdFER0qaNrI2BqxKrMdmvcuqxaTnPJcnOgzBxRObams+aDFKyRbXQSTpArst30ha3oYiMhup3KPn5pq5XQLQikVOHayvrn8F9RoYpnWoqQ2ANikWQWE/2NgkjsCQfFKZ/LNkVtLPVzIuVYQbyvpAl3a8PZah96M2cly+1aNhyW/GAU2Cs3BM2liJWQ5AI0urbr8x431JZCVF2goQr7fBcoYr1e1u+0Y7L+opPZSE1Npw6bYXIaNvtNkdZhgxLYXnKWKBCtz8KCWG7C/KvboCxe3TXfkc2KYWC9TvPMUZc+9PfZlGHHi5ItWuVt0FJwkBMcAHMPScsBSamRwswwfK0sCdOUf13TtZgR0mFWzkLvBJ0d1JAa3w8iVVZ7zx7Q+HDZ0iKPtRe+BhiSmYfW5W9fx/TUJsld3H5tWNNdK3L2y4vDSPCcTZpiKePG9KG+9KrginP+uRTOOk99ImRWRZToA2OCkMVn87+s5RYLXqWY7GLQUCEa8AdTRxrFqvfQCkHkgA4se1DUtIqVLaSdjwoMHaZuZV28/txviq7VIikAqvVEOZ49KL1mW0I= 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)(396003)(136003)(39830400003)(376002)(346002)(366004)(451199018)(66556008)(66476007)(6916009)(6486002)(66946007)(41300700001)(316002)(478600001)(966005)(83380400001)(38100700002)(38350700002)(52116002)(44832011)(8676002)(186003)(2906002)(6512007)(86362001)(2616005)(26005)(8936002)(6666004)(5660300002)(6506007)(36756003)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oGWwi4gqQE4V1l1kf1Q++sEV4ihK9mQ9DHGr375BgKX/1TWC7R7mAHz3NaUN?= =?us-ascii?Q?c7IdGs2jc5i+Mz8m5LjmC5tsP/sRwtiNpuhUvPMg+oN3h1InZ903PNnkO5/K?= =?us-ascii?Q?IXskJbDCJE+yYrGqSUtqvaqIYw+HhTN38SmMT3xFu/2wY4OXGZuXyQkDWTlz?= =?us-ascii?Q?CHdCsTtwf0oxIuge4pZ77QVtkgZOZ38IG3orJvOsgvl3iLfelKZGsklV6fMY?= =?us-ascii?Q?yXGOc5Ujpjx/KSrzNjKhAG8QSe6oh5BGkGZRotI909zoSuC8KfVyuEeWMkSp?= =?us-ascii?Q?8nYARlCadoHg1nYT4bKHtTIuoiGBLTYqYQEJGvJJpAzE4XG+IgJdsRaLkVTx?= =?us-ascii?Q?N+xr27bceG+8lBYA5gbn/Ief/6+AusR0cw2ZE6bD4RTK4Hjd5MQtdmvmN6Xd?= =?us-ascii?Q?P/vXwGcCIL9eOwPjb8+BIKnWsENNCnhdZTrccU9ouC7Ro2k2Udy8X2HlEYaX?= =?us-ascii?Q?UA1CvFs5L4AHmf75a53DRBig50YO6LN76VUQesEx0IHT9tqjaOBA/SqxUsBx?= =?us-ascii?Q?bi2kG1A/5SkbpWBMSaSW4szF0JNju9oEesz8vPR04SKwD9NF/p9i6RJ0Qg3p?= =?us-ascii?Q?KonA9qzz/SDoyZOTO+YpL/2FvfnzrIJQ+Xhw0/4E88xbZ0QymNX9QD5xy1bK?= =?us-ascii?Q?naDYMPRmK7At9R+6Ldhv3uJKTqdZ5ooQNs6qOdFkWYllbUoNxXzsiSYuAF9G?= =?us-ascii?Q?t4wH53F+fHfprO+uW3RSI6F6D8sAcqc6+3Iu05xeGsU5jhPSlTQsZBqB19pc?= =?us-ascii?Q?y45ldSJ9CuPBOW/0VsTL1nOQiYZkVk66u/k5T51vA0yO+aQL3UC2jiEULXAI?= =?us-ascii?Q?PS+VOW5z8fhDX8cTIkkISrxpmTbnT37ao4Qo4ZRujwsop8RFT7gMZ2QGQjAQ?= =?us-ascii?Q?cQThcXkQw6k/0jMJPX5B0s39bYvQqlzv4pFP7dZyj6B3z/9jMQ4nXneb160X?= =?us-ascii?Q?hWwlEimwkB3VjQEIxZmQWK6NFtGlaI63l8eM+hQnUaqoxIY7Tztms/0GtnDL?= =?us-ascii?Q?znsxrHTS3Z4mFkug/XF4m5Gcy9gZr/UpvCNJdjg3PC+6Jm3mphGA+gv9ZAVS?= =?us-ascii?Q?O2oMU5wVp/Q3Zr94w5EEIguq6Kzsz4b8A6v6Zfd0DX55qEZiTNfCEAujg4vU?= =?us-ascii?Q?b71hoUEpBJMXY0W4ysHeIyLqpcKIs6yiSZ8lkz4N1lAp1AR/Z9n+DVzm7VU9?= =?us-ascii?Q?G5RQfBvBWFNGulUYodFp/7TkYM5PrBzoZwddh/omq7NP8rfQBHi/krGmXtoK?= =?us-ascii?Q?VN0CVy3wjmN6MVIt7ONZrYHaS83doS7rZZAtAhoDjlsTNWxq+GVS0qWv6v4Y?= =?us-ascii?Q?0wwL0NXp224Yh4hLSkdLd4F4MgWWo8mX4I69FGmCdmT/fJgznRCTrzmN4O25?= =?us-ascii?Q?jM7FrihrZZ/vV9wrJFfjen0T8dKQ3m2bqbxlziTA2uFcZQOwEQzr2EpCYjhP?= =?us-ascii?Q?jAWJcrvtnLIJQZ2KSlRyarKC9lQFeTp5+ZQq3IhBMQCxdOEKWRQDaIMZz1U1?= =?us-ascii?Q?33nGsO+8ANjgPu1T+Q5NJBoGwuOMdv2C5mW1TLKNAF+rTk7jPaUXXK6fhDkr?= =?us-ascii?Q?5LOw1n5hD8ikdTeb44Inx0F/iwmz6U0Y5dmQ55u0SfuO/5C2eYGObCvwB0Yg?= =?us-ascii?Q?Yg=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7ad4eac-29bf-42b7-3023-08db09b8dc1d X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2023 09:42:57.5839 (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: 3/4pvaVRTDv30vAOFMcdZ65/TNYJg9jbYJ7d/JFhVOvBgZ5+RTwYjqG5u+tkaVOvW1A9qTeWsWVLXO5agJ2+dvTvam/sn8nc17Qs/CPw4Lg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1P251MB0608 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 autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] sdl2-ttf: Version bump + rework. 2.20.1 -> 2.20.2. 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 Very minor bugfix release. https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.20.2 Also do some fixes. As the configuration was very non-complete. This should help reduce footprint if needed. Ptxdist had freetype dependencies, although sdl2-ttf was using the internal library. * License file copyright year changed. * Move patchset forward, applies cleanly. * Add option to control if the mandatory freetype library should be external (otherwise it must use the internal one). * Add option to enable optional harfbuzz. * Add option to enable internal harfbuzz if support is enabled. * Make the options default reflect the old behavior. Ie, internal freetype and harfbuzz as default. * Disable the freetypetest tool. Signed-off-by: Christian Melki --- ...igure-make-opengl-support-switchable.patch | 0 .../autogen.sh | 0 .../series | 0 rules/sdl2-ttf.in | 46 +++++++++++++++++-- rules/sdl2-ttf.make | 10 ++-- 5 files changed, 50 insertions(+), 6 deletions(-) rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/0001-configure-make-opengl-support-switchable.patch (100%) rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/autogen.sh (100%) rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/series (100%) diff --git a/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch similarity index 100% rename from patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch rename to patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch diff --git a/patches/SDL2_ttf-2.20.1/autogen.sh b/patches/SDL2_ttf-2.20.2/autogen.sh similarity index 100% rename from patches/SDL2_ttf-2.20.1/autogen.sh rename to patches/SDL2_ttf-2.20.2/autogen.sh diff --git a/patches/SDL2_ttf-2.20.1/series b/patches/SDL2_ttf-2.20.2/series similarity index 100% rename from patches/SDL2_ttf-2.20.1/series rename to patches/SDL2_ttf-2.20.2/series diff --git a/rules/sdl2-ttf.in b/rules/sdl2-ttf.in index a14676933..fb68fd5a0 100644 --- a/rules/sdl2-ttf.in +++ b/rules/sdl2-ttf.in @@ -1,12 +1,52 @@ ## SECTION=multimedia_sdl -config SDL2_TTF +menuconfig SDL2_TTF tristate select SDL2 - select FREETYPE - prompt "SDL2 ttf" + select FREETYPE if SDL2_TTF_EXTERNAL_FREETYPE + select HARFBUZZ if SDL2_TTF_EXTERNAL_HARFBUZZ + prompt "SDL2 ttf " help This is a sample library which allows you to use TrueType fonts in your SDL applications. It comes with an example program "showfont" which displays an example string for a given TrueType font file. + +if SDL2_TTF + +config SDL2_TTF_EXTERNAL_FREETYPE + bool + prompt "enable external freetype support" + help + Freetype is mandatory for SDL2-ttf. + And it has a version of freetype built in. + To reduce code footprint, there is an option + to use an external freetype library. + Probably not as well tested against different + versions of freetype as the internal one. + +config SDL2_TTF_HARFBUZZ + bool + prompt "enable harfbuzz support" + default y + help + Harfbuzz is optional for SDL2-ttf. + However, it has a version of harfbuzz built in. + To reduce code footprint, there is an option + to disable harfbuzz altogheter. + +if SDL2_TTF_HARFBUZZ + +config SDL2_TTF_EXTERNAL_HARFBUZZ + bool + prompt "enable external harfbuzz support" + help + Use this option to build with an external + harfbuzz library. + Much like the external freetype option, + this can be used to reduce footprint by + deduplicating library use. + +endif + +endif diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make index beaad3992..724e26ed6 100644 --- a/rules/sdl2-ttf.make +++ b/rules/sdl2-ttf.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf # # Paths and names # -SDL2_TTF_VERSION := 2.20.1 -SDL2_TTF_MD5 := 746be429bdfb5892066dcfaf593e1644 +SDL2_TTF_VERSION := 2.20.2 +SDL2_TTF_MD5 := 4815838c87410346226983f4e0a85fd4 SDL2_TTF := SDL2_ttf-$(SDL2_TTF_VERSION) SDL2_TTF_SUFFIX := tar.gz SDL2_TTF_URL := https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) @@ -23,7 +23,7 @@ SDL2_TTF_SOURCE := $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) SDL2_TTF_DIR := $(BUILDDIR)/$(SDL2_TTF) SDL2_TTF_LICENSE := zlib SDL2_TTF_LICENSE_FILES := \ - file://LICENSE.txt;md5=771dca8728b18d39b130e19b36514371 + file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68 # ---------------------------------------------------------------------------- # Prepare @@ -33,6 +33,10 @@ SDL2_TTF_CONF_TOOL := autoconf SDL2_TTF_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_LARGE_FILE_OPTION) \ + --$(call ptx/disen,PTXCONF_SDL2_TTF_EXTERNAL_FREETYPE)-freetype-builtin \ + --disable-freetypetest \ + --$(call ptx/endis,PTXCONF_SDL2_TTF_HARFBUZZ)-harfbuzz \ + --$(call ptx/disen,PTXCONF_SDL2_TTF_EXTERNAL_HARFBUZZ)-harfbuzz-builtin \ --disable-sdltest ifdef PTXCONF_SDL2_PULSEAUDIO -- 2.34.1