From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 10 Feb 2023 14:04:06 +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 1pQT4S-0031NO-6h for lore@lore.pengutronix.de; Fri, 10 Feb 2023 14:04:06 +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 1pQT4P-00026n-TS; Fri, 10 Feb 2023 14:04:05 +0100 Received: from mail-dbaeur03on2047.outbound.protection.outlook.com ([40.107.104.47] helo=EUR03-DBA-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 1pQT3v-00024Z-Eb for ptxdist@pengutronix.de; Fri, 10 Feb 2023 14:03:37 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ESBBKCBNjkZqN/KNQTsiCK23OOm2YYqFG+hIOi21kWQqFLcGf5Rf2r+E4DTnx1c+tLfpywOhF8TwVxoxvYSAqvxonJzBkplOBUX8m6dh0IAq8+7rJ9pdRovEWqBdeTBT+nBzJsBHoTmvubIEukRmYeeQ8KI2HByw49AtEw0R9zPvHaqcKdjO8jXM1AHWPNUNZsaSpMtglhP03Pgm3SZUq/sTY8T2SkIHAvvr/RWcvdSZocWwSIbXsBB4Sv6th7mAkiuw+opullx8ifyI0fPYYL51vsLWSH+mJeEZfTGUhkcNkATlnsWWexmd9MxyTS+oSkETY8PX/Qx3giJuQlsH4w== 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=DRMbMk6TaHQCCEm3ApPKlHjDYfgJWaFkq3JcFTux4vM=; b=nQdGsNpJRpIUyQZ32G4rG/Lsfn6oMD3hFxD5lIPIUbXit43qngOaTnwUr/SXR38GPeQfbxx53XNVVvMZcVTs1dyPhNEZS8aGyKf0yLkwyi94AZPMSQOK/qbeMmmNoQMCZgTl5y4tnMjNjalKfVmCwqGzEb96uTwDOypJ8CuUyo0RVmuvp3X2OIv1MVNaAsT1wyQT9quZEvVRrBRwL7kxPW/PgSqqnQ9jmuRW9vY/5xMxEDuK5JcIuB4rZCEd9qdKOg7t8jcijso/W//Xthr+5ljLsJs0QRvqOXggOlbQL2p+gRmQl62xe+4K/fr/RGlac77wtCcQXIDEyfqDg0xc9w== 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=DRMbMk6TaHQCCEm3ApPKlHjDYfgJWaFkq3JcFTux4vM=; b=FIn5WqYjZrRtALfmk9fG86xpPKRC1CdOSGJWC2RNVhgThbT5oK8xoeBmcbL1eWBs3eJ1PTseWCWre9FD7mbdLoIK7yZ5KX2+VpMw8FtDLUkKxwm7Dkr+QhdbcIFKI2emvlzO8E7+km76z0kdqFoHEsyhnn+8dOT6wVexbxZtQrw= 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 DB9P251MB0522.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:339::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.21; Fri, 10 Feb 2023 13:03:33 +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; Fri, 10 Feb 2023 13:03:32 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Fri, 10 Feb 2023 14:03:25 +0100 Message-Id: <20230210130325.2697696-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0072.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:a::7) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|DB9P251MB0522:EE_ X-MS-Office365-Filtering-Correlation-Id: d2573f0e-2aa5-4f64-6a9b-08db0b67365c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TBLQ9VrVYeFE1FWN4bUzgAA4Wk75UJHO0GddgC/Ifc0wVSZajl7mlW6kwKweNr3I7okHWmKLUvAu9RPMDgpnf0Netj5lYUrOJYg8VmRi1riJI4pNj5zAp5xuD7C5gmckh09FBR/2f7HDmFIZENM/GW1ib7awjQbrm/NRXqqL1VvqpyTNb2uN8RvVaImszb7hVAvNM5AhF/ROLnk6RfYA3Eh3H3uNe7tRAllTc5wRqjxIVs3+PbYl0KICoDxkQkm/MRO2TpZnwB4vLUbP4kHMP7yTUVA2OmPF6OBHqE16tIHbb0iEj20PBazjuijhrmr6pg4RYoE0GZ/q02LyruJ9HDzCkiRelp4fg8JCZTuQo520KvGc51qNGecGZy59w6kvPPwj3qV/0t8N02+/QVNpUTxvzz5w5YLl7Y1ioAkJHTjNj0UiDMZd6yxCnupSS0sVZY+IBPRZ+4v6rIpypwsGiPr+cdqA/HyqxEysk0HBpLE5T8HzAOKHLVQm7Gx+eYBzzLq4UWgxs9u6Bvq5W0Z16nOYuto/c04rOdw8XE+8l/DtrIAvDZ8DbOyzwcrsMaG27MUDkwR/AS1ioKFV/e86qr6TTMPT+qQTHgZ3FQfLoATl/B6HnIOqAGDwnZsc9tMNTQfpTgPr24Vm3VmwKdC/zSEGr85PIbkpxWXmvYZ2oJaCSMjPoH92GQNxk3nl9IsH4qRyzAz58/UFTFDFvb6qPAINjjgDho+VqFYuzVs6YD4= 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)(39830400003)(346002)(136003)(396003)(366004)(376002)(451199018)(186003)(66476007)(1076003)(8676002)(66946007)(8936002)(66556008)(6512007)(6506007)(6916009)(26005)(38350700002)(36756003)(86362001)(38100700002)(2616005)(2906002)(316002)(478600001)(6486002)(966005)(52116002)(41300700001)(44832011)(6666004)(5660300002)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ux82B8fV71ExlHv3FiMSP5eeK8WGfONv+eJ895oBK0UakW+0LxjL2IhkpwWL?= =?us-ascii?Q?DzbcjoAjUK/nmt39GV0KbxOB0XDisCU2LqVObzWnMH0b1q7ZFOGfUVAafhD2?= =?us-ascii?Q?8u2FSeUyhw3V9O1mzdvPohV9vdDXi3kdQ/cfvZW4Ss8sXO6X5+cR16xOg6zo?= =?us-ascii?Q?JtBonj9//XSm6++zlSb0V8XgwNGhqjU87+9fgpIvPFzBV53kvjrXWlWPitjg?= =?us-ascii?Q?JR3MPRuAUmdj7vGY2E6stp2mb40LEuci2Znatqpx2xE6NjqQQmKBP3CLqFTq?= =?us-ascii?Q?fkHoEYDRxtEGJkurdwxuPhAnafBha/KKWXC6BKg27DvMwc6fUd7ilENU9rd+?= =?us-ascii?Q?rNGpaMHDMotK56dfI7fkg8+pPQkZg8g6BxSp8BpfUkT0tNxBElT9F4dss0eR?= =?us-ascii?Q?G6OA/hgoP1yAk+AQwBtnSk7TIxMTfNCuDx1CbCfRaph1AovguODM4W0Y1jtQ?= =?us-ascii?Q?P29Bo+KUeWDO5MtUdsYSCfWY/1HizQact7V9nP/HrchnB4zLMcOiBKbq+Ojq?= =?us-ascii?Q?k03bU+vQAwvYoJWDYFeJdvhznXvs2FmKNbSiwxRlQ5zM/53ZM7fCHoC3wyU4?= =?us-ascii?Q?LdoQ4Xt03YIQ7GoqVGsu0d9n05vjVohLhcfSTzBJxiruDuEUCs7rW0vVXMrm?= =?us-ascii?Q?DZUgJkzR6tTe6imn2o4pWqeKnzbtAITImva3X2xiHD4dod2APUWgrRkzayhz?= =?us-ascii?Q?kMXxJ1SrBpzh3Rb35UI87Ceje5J5sio1QvBndq894m+ZD5G4po2+e9ehpZqI?= =?us-ascii?Q?XqZ2GXYK0i/dPBJbVofhnEsKlyXAWTcsDwGpmu0/WCf/pfY+VhQWfeR/eG9O?= =?us-ascii?Q?BWr+atACFvWMEeA1W19TwOwJthzUbb3HapwTsWgd0Dnn8x319UWpnjtFAB2F?= =?us-ascii?Q?3Q8N9gk1LT8zG5VhaaIRCLnhvR3+a9+A5lgOgvNMj2JsbPqW7srE7pKAZj0I?= =?us-ascii?Q?mzKu9OaYbrjgwGSdCEDU/saRlSlVfotrkU5knksbKu9lCuO2HrSvx2wPMbQZ?= =?us-ascii?Q?Xy/S3TQMrPiJpT1PUs1gWyysVW+wcaIw24nPV4NliAVJMvIQ4Z6rpCNfD+WQ?= =?us-ascii?Q?B73oUk6BZoqKZT+WNW3O9/D1YaF+gQLLBR58YTFfPvJWCxdy8k8nfR6mq1mg?= =?us-ascii?Q?5GdHuTHFZtAP+DzLNLhxw7kliSMvMjBKnGM852+Yuf4S8Lw5RdIru5s5Gey2?= =?us-ascii?Q?9mN5h8QKgnKP1Iq9aS2wwL1AKfb3IMEdOm/cWX0wof0roHF+t/CqGf4HP3w+?= =?us-ascii?Q?yLrJQY5aDJfWR9yub/uWgouVXNdNqpKexupgmCxDu+3RydRTzFwo8fxVrgRd?= =?us-ascii?Q?WexmNcidtMMef5XbHZapwP3AgQVfak9znledWAxL8gQqCC+Kjtn9Vjogsf9m?= =?us-ascii?Q?lNzDmLTE1wKv//KwQnBratZdyBns8exEGned/bjnagtelxtJdqzTQFsN3ifV?= =?us-ascii?Q?W2h7QuJBx4VRpFLy6/zqvCNi2uyf8V+YovPGsRqMa4EqObqmdUC539Skbjon?= =?us-ascii?Q?oPvomtttUiXk07bNWb5mr65vBFTj0Ck7b2DSXMQ6RBHNLoMFBUUcvTFil3gg?= =?us-ascii?Q?UpHQdSdC4H5VL0TojpCCbfA+95gLLgAioaEYCKb2BE8Xhy99wxUJYe5TZHdr?= =?us-ascii?Q?6g=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2573f0e-2aa5-4f64-6a9b-08db0b67365c X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2023 13:03:32.5870 (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: 1lu5SA9hZwzP9qLJMV0HO51azLYWZw+5pRH65LZ39fdDQx7GWWYdX0mADywPN9DnQmzPKGO7zlFE8i4sR6dSsSBsvihUFHgUTD/kgVPv5T0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9P251MB0522 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_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] 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. Previously we had freetype dependencies, although sdl2-ttf was using the internal library. Now opt for external libraries only. * License file copyright year changed. * Move patchset forward, applies cleanly. * Add options to disable internal libraries. * Add option to enable optional harfbuzz. * Disable the freetypetest tool. Signed-off-by: Christian Melki --- ...onfigure-make-opengl-support-switchable.patch | 0 .../autogen.sh | 0 .../{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/series | 0 rules/sdl2-ttf.in | 16 ++++++++++++++-- rules/sdl2-ttf.make | 10 +++++++--- 5 files changed, 21 insertions(+), 5 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..4dafa09ae 100644 --- a/rules/sdl2-ttf.in +++ b/rules/sdl2-ttf.in @@ -1,12 +1,24 @@ ## SECTION=multimedia_sdl -config SDL2_TTF +menuconfig SDL2_TTF tristate select SDL2 select FREETYPE - prompt "SDL2 ttf" + select HARFBUZZ if SDL2_TTF_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_HARFBUZZ + bool + prompt "enable harfbuzz support" + help + Enable support for Harfbuzz (meaning open type, in Persian), + the open type shaping engine. + +endif diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make index beaad3992..fd27fc014 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) \ + --disable-freetype-builtin \ + --disable-freetypetest \ + --$(call ptx/endis,PTXCONF_SDL2_TTF_HARFBUZZ)-harfbuzz \ + --disable-harfbuzz-builtin \ --disable-sdltest ifdef PTXCONF_SDL2_PULSEAUDIO -- 2.34.1