From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 13 Oct 2022 13:16:01 +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 1oiwC2-007I3u-Bg for lore@lore.pengutronix.de; Thu, 13 Oct 2022 13:16:01 +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 1oiwC0-00031N-GC; Thu, 13 Oct 2022 13:16:00 +0200 Received: from mail-am6eur05on2068.outbound.protection.outlook.com ([40.107.22.68] helo=EUR05-AM6-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 1oiwB9-0002dn-Vs for ptxdist@pengutronix.de; Thu, 13 Oct 2022 13:15:11 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P2Ny5DReJTg5ZZIHOECPHh74t9NrqslLZPSgFLTNq3sW7UaHFIe1Ws580d2L3JmFXKK4xMh0FugEBbq4RclmM1NZ7Tw+5LwfF++pLRco9BLRxdrncZ7lyUeJoPel+OfDRCjyyB85hvXwansTKG86Ga9d84vCzbHqR9HlAk++qRqaNsOLVteqW6MUutbSQ2soEDcqE/5KEV32zH8U8ap0DYoZYL7WVy9h/C5zqoNEnI1dZe2mr5Ktzk4KgjMRLngOtCvEPfsgQYbUy/3ZXvbG3p5IogY49qcysaWyuW+X7Lbw/q7U0zMTSO794YJUb44u/JKP6E3hrtETfdnjsgsIGA== 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=8hstTHfkvrcoCoykQAcu8eMiq7EsAQWYw/ovq0KO+Sg=; b=GFbnAskBibd1WRoMYsICzMeXrLqk76kH/dVLisgLNFrdI0xftzJNDj/Zm6/QqIw7I+7A1yMB/RtHJ8m/2dmVzDzwEmW60X96f3Po49Ux4Wy77bpbRhQzsLmeXDeW/5PvJS0mp81zqouOeNerNzy32ZQ6kXsg7KmSb+oA6U6PGvQnATmIolkjVQnNkrOvmL1FQEC4EtgkY8klgsdApLtLBDmhRrtx6M8OmwjHYrWQLrkZGJsmSaP1fKk0WSKGJINzi1tRawbL23xvFWBiZCzvl2AHBvu+V0ZgGShWhJPOkmNsuLKAfNiviq/WU+K9IbHfH3BTl8SikRUcHdqzJiMvWg== 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=8hstTHfkvrcoCoykQAcu8eMiq7EsAQWYw/ovq0KO+Sg=; b=RsboXYxa6z7pu6ByX3BAjiCHmOdgQ9wxHsghG4OgeIODkjuON2QrqBnm0uIrdlSoKITlUtqbowJN8Hrq05o8dFW6g23as0luoC9Q4von/F0mhWDES7WUSE237pQELtsjMDKECZ7ufM08wmigI90YiTDmcD40LiflyiYqQ+y/H2g= 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 GV1P251MB0881.EURP251.PROD.OUTLOOK.COM (2603:10a6:150:8e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.24; Thu, 13 Oct 2022 11:15:01 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::e75a:4c4e:8faa:99ae]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::e75a:4c4e:8faa:99ae%5]) with mapi id 15.20.5723.026; Thu, 13 Oct 2022 11:15:00 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Thu, 13 Oct 2022 13:14:52 +0200 Message-Id: <20221013111452.3298415-3-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221013111452.3298415-1-christian.melki@t2data.com> References: <20221013111452.3298415-1-christian.melki@t2data.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0073.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:a::12) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|GV1P251MB0881:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d9423ef-52c1-4963-91a1-08daad0c2b14 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9MTqX+/682kCvFDQuDy5CwdL46x4RPegXqy3b7Jd4yBK32eAcGqZVlGhYEpEsSeLpeOD+Hkw+u2RZCL1XZx7W3S1V6r+7ar0ef/l+IoVX07VV0itcEEGK7KJ7GG4Jxdfy5LbeYVAECPXpJrau2gZk0YWQcG/JZ++iClCfrEDJzkigDaTPvm4sXfAZlIWgBDiU0nQZoQ2hqY9UHanmdWzi5K8HIhzOT9iNfJG835bvgXtjXvu7q55+8cDBA6AK2YvZLOcQLEBFvkWDtTkscvudbcF6NczVnM1k4Up8/LglGQBSWxTqtb+tQWt935tjSyAzJjSJnZFx3HIvc286tPvoDON/pmyGAMatuHYxoKkCjf0hJv18kNOT85v6AghTEBsi3Xy1pGSBw09lr72zRtRJJi3HMWzaH3XcF8M4j6yluNhegFf5jsIVMvMUhdROBHZ2Msd3FRUk/TLWOl2jZRl93trPoud4Ko6nR/l/xHiDACHyRfIFwMliOVlj93VRXLTn1ou2A/9S4wnNOOUynmsU2jLwzGz6TjdCgH+Q2MreKw2UaebtujJMRn1GQc8SmKGMu02g7I6sKrHkpN4iaRWp2FkUiY/AuYtT59SX7PwMkX+61um7mUGWCmnre11jhA2NFnple0jUHweCdG+9d/UoRvPWzGB7kfeRd2N216qVpKzbrMOTIbQ8Qjew9NsdXk0agIk3KOS0tBKvRWV71fp1RF/y6fGusIUPHm3M6v8fgW4bQuYRdVpGCBsbemCl1FSsVqFCkqSKGVzV4Sd1+qy2j5qjcICN0SG04OGF8FJCe4= 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:(13230022)(136003)(346002)(39830400003)(376002)(366004)(396003)(451199015)(8936002)(66946007)(5660300002)(8676002)(41300700001)(6916009)(66476007)(316002)(44832011)(36756003)(86362001)(66556008)(2906002)(6506007)(2616005)(83380400001)(38350700002)(6512007)(26005)(38100700002)(186003)(6666004)(478600001)(1076003)(966005)(6486002)(52116002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qdLWMUeNGn2wFROJFUkk4mwziRGFGf8oFHhET5irv4SXqF62HvNdPzwcHZde?= =?us-ascii?Q?RBiJwbt81NQG6B1ed/sYbgTS4MKP4taKBGZRTGwR8TFvL95dvwWYW9aXWz+X?= =?us-ascii?Q?+KnPM9zYEx8tevMtvSXIX5ifo1axTJ71PaKRHOrEbZIloRPcx6qQKmqcDhkE?= =?us-ascii?Q?tvHk3+35T46LwsO/PsmfF4HPV9EkW0+mzJWfUPv5a7kcIEj4BZ0PwmVICq75?= =?us-ascii?Q?6xdRnVuVTJc6c+v1Jptloa24RmhdTQjcK+A6qjtYQKvbpmohNpOMxq9UI8Dx?= =?us-ascii?Q?Nv2bJF17Xt8/pAvrxVebq2LDSRskRKylxi4DLDORBtGf0F50BXi4WPe+BeBc?= =?us-ascii?Q?ZK1SK2zTSNBIKxptH1dPffXk3e2YRUtjrk7polKR5qpDQI49Xt2Q6NOcRPDB?= =?us-ascii?Q?s2S1kFleBB/2BcuZ7Pwr8l+wOo/VhQItOGuWC7bds197tVBDm1neLCZmrxuU?= =?us-ascii?Q?W2ETNP0DQUN1L/d/CTAz557cEfYqjB3OJitQdyaKtb3KIpiejINB/mxUV1iS?= =?us-ascii?Q?elrUv7sVJ59c93Ypsk0F+MYi40I30+4RI8h0bE5zb/3qPD+FY0WPBHr/wA6t?= =?us-ascii?Q?QWU++r1C36P1Ah97M99zSI3PxrlanDCuVHMZeyrDb+f+8MgaMlDbetGOvYZr?= =?us-ascii?Q?Mz2wtdV36JVKzubqvGQqEV8Xd2FfpjTXam7u6wjwFAEBQxEPh+r/x32en5OT?= =?us-ascii?Q?3eGC4g3cSeITYTVvlTlJqtztLdHXw7zv44O1ISI+EzIKCu/OgFzWEY4avSox?= =?us-ascii?Q?8c6KR6HB+mcxHu4Nywon8a77HH06e6iaPG7qRLuLR/HWolUhpZrg1F0I65lQ?= =?us-ascii?Q?v3gzQma/dUyKnnN4uEpbb8dncqM/QIqGALOpextCYPI9HPNsUgmKLi/DtSHP?= =?us-ascii?Q?VMsZrSLORcLP5temwxgF4viFcL8jPmJwCxH3KzaUIBIMOpSDydrB/OP3jfbu?= =?us-ascii?Q?3NYOIA11iWLb0/tRlIPh8LM/uk4Ul6VuoM1TTFyuhJTpl/QH4h6PYaJUeACG?= =?us-ascii?Q?vlNMIMy1bPEV9PCailaK/bx1yWN5HgWC9mMe4H1jsuAJrEeisAH9jCjFv9nT?= =?us-ascii?Q?eIERYIsphU9rCKrIBoX2cqN8OEeVDgdZjGyB0Fhx5jAKVzfWQHjQ928uer/2?= =?us-ascii?Q?dilKNiHh1hiLZGO0WCtFvKVqVZiiVXsN4LtRhhlXCu2j06jsHHMWJTjrBos4?= =?us-ascii?Q?qmriA8Cm7AtQWVUsv4oBrdvUT/bQnzMXBcF5aLUe3Rk568iH1K5j9Dk7ZODF?= =?us-ascii?Q?52V2xP1ndZ7Uzx8XmG9k3EnnmuLXbBG8J2VV9arX7wNCzdESb3jKRDF94NtS?= =?us-ascii?Q?kwztHUd/9G+5X5sojUKSkrUNNUuKHRS2LlsHGo09xOyGDu2EvAzcO6pGLmlg?= =?us-ascii?Q?xK0BXiCFf7MBtD4vm/buD9b7KLjS2OZ/AJwRy8feVFiTQTrrlcgBWGBkJOPF?= =?us-ascii?Q?yeBHOgtUQFoJilvTmSQJ/mpe8kBwiTV8UUpBZBkr6Pn+a7FbbUYSMXy7Rcal?= =?us-ascii?Q?y23LiG7XyR7TndBGGc3EMyvUyAVpw15kzUo+BTjR6NR1KnBy2+wFubPfIqI0?= =?us-ascii?Q?2omAoZ7gnceWOxoLzncmAaWMadjpeGieG60fHuMMTelV4nEupEYvxSXuDnva?= =?us-ascii?Q?5Q=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d9423ef-52c1-4963-91a1-08daad0c2b14 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2022 11:15:00.1421 (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: 9CDsba3NQR66has/8pvIitkbP0pRzy0ZZhLnfofpm+7beCgGcyY7JA0MHfNxIzVtkqTpf6Xg1V9NiUwx8gRDDUuALKxfPVwVB8phQEX/WjA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1P251MB0881 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 autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] sdl2-ttf: Version bump. 2.0.18 -> 2.20.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 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://github.com/libsdl-org/SDL_ttf/releases SDL2 community have changed their version numbering scheme. So this isn't as big of a bump as the version number would indicate. * Plugs CVE-2018-25032, CVE-2022-27470 * License file changed name and contents is reformatted. The reformatting is to make github recognize the file as the correct license. * Forward patch series with some changes to make them apply cleanly. * Add global largefile option. * Disable sdltest. Signed-off-by: Christian Melki --- ...01-configure-make-opengl-support-switchable.patch | 12 ++++++------ .../{SDL2_ttf-2.0.18 => SDL2_ttf-2.20.1}/autogen.sh | 0 patches/{SDL2_ttf-2.0.18 => SDL2_ttf-2.20.1}/series | 0 rules/sdl2-ttf.make | 10 ++++++---- 4 files changed, 12 insertions(+), 10 deletions(-) rename patches/{SDL2_ttf-2.0.18 => SDL2_ttf-2.20.1}/0001-configure-make-opengl-support-switchable.patch (75%) rename patches/{SDL2_ttf-2.0.18 => SDL2_ttf-2.20.1}/autogen.sh (100%) rename patches/{SDL2_ttf-2.0.18 => SDL2_ttf-2.20.1}/series (100%) diff --git a/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch similarity index 75% rename from patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch rename to patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch index 95d04c40c..95ab1d2bf 100644 --- a/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch +++ b/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch @@ -8,12 +8,12 @@ Signed-off-by: Michael Grzeschik 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac -index cb2a65ee83b7..7123a7c564b4 100644 +index 9b1c36358d41..640a4e228706 100644 --- a/configure.ac +++ b/configure.ac -@@ -232,6 +232,12 @@ CheckVisibilityHidden() - } - CheckVisibilityHidden +@@ -304,6 +304,12 @@ AM_CONDITIONAL(USE_BUILTIN_HARFBUZZ, test x$enable_harfbuzz_builtin = xyes) + dnl check for LD --no-undefined option + CheckNoUndef +dnl Check to see if OpenGL support is desired +AC_ARG_ENABLE(opengl, @@ -24,11 +24,11 @@ index cb2a65ee83b7..7123a7c564b4 100644 dnl Check for OpenGL case "$host" in *-*-cygwin* | *-*-mingw*) -@@ -282,6 +288,7 @@ else +@@ -354,6 +360,7 @@ else GL_LIBS="" fi AC_SUBST([GL_LIBS]) +fi AC_SUBST([MATHLIB]) - AC_SUBST([WINDRES]) AC_SUBST([TTF_CFLAGS]) + AC_SUBST([TTF_LIBS]) diff --git a/patches/SDL2_ttf-2.0.18/autogen.sh b/patches/SDL2_ttf-2.20.1/autogen.sh similarity index 100% rename from patches/SDL2_ttf-2.0.18/autogen.sh rename to patches/SDL2_ttf-2.20.1/autogen.sh diff --git a/patches/SDL2_ttf-2.0.18/series b/patches/SDL2_ttf-2.20.1/series similarity index 100% rename from patches/SDL2_ttf-2.0.18/series rename to patches/SDL2_ttf-2.20.1/series diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make index 1f649e166..beaad3992 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.0.18 -SDL2_TTF_MD5 := 86d3023ad3fab597203022f856cff103 +SDL2_TTF_VERSION := 2.20.1 +SDL2_TTF_MD5 := 746be429bdfb5892066dcfaf593e1644 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://COPYING.txt;md5=e98cfd01ca78f683e9d035795810ce87 + file://LICENSE.txt;md5=771dca8728b18d39b130e19b36514371 # ---------------------------------------------------------------------------- # Prepare @@ -31,7 +31,9 @@ SDL2_TTF_LICENSE_FILES := \ SDL2_TTF_CONF_TOOL := autoconf SDL2_TTF_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) + $(CROSS_AUTOCONF_USR) \ + $(GLOBAL_LARGE_FILE_OPTION) \ + --disable-sdltest ifdef PTXCONF_SDL2_PULSEAUDIO SDL2_TTF_LDFLAGS := \ -- 2.34.1