From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 10 Mar 2025 19:35:37 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1trhyU-00CM5S-0L for lore@lore.pengutronix.de; Mon, 10 Mar 2025 19:35:37 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1trhyT-0000wX-4M; Mon, 10 Mar 2025 19:35:37 +0100 Received: from mail-vi1eur05on2113.outbound.protection.outlook.com ([40.107.21.113] helo=EUR05-VI1-obe.outbound.protection.outlook.com) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1trhyB-0000vy-BC for ptxdist@pengutronix.de; Mon, 10 Mar 2025 19:35:21 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dQPFWuyNXzXVRAFBjQs8whB06sjhFvFpPG+w2qeClyywzk6O7DFmGMDw2poO5vFt4kB0sj27ppWONIZvxsfhGt6v8oHEkZEQOjHRqltYWgsdVz0lHiDm74OXMrLj8Oeo+V7XNA175GeirUGosp3e4AplHFAgWFG9Xow4WHEcUd+WJt9vty5tPIWewiMruxSsBXZSGLtZzJDD4FEqbW+xvD/BRAT8IlbhOhTGc9mC895XypRwQK8u1D4KdthwTVpBcwLlZOH/ljQoSljH3nM9Qtg/ZVu/c0V/wBZZdQVO/U8Pm0NrLobqIHoNI78U8ew8+UFCGLyXu3Xv+FeQA7q89g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=UIBhj1QS+yOM7togg2vTPf2PRQdMVLLTxl6pAQHvN5o=; b=INL98yx2C73gNbaTqk8kBBaEDRqz79r2gR+9lR2f8h7bgyk/rBI2Z69Eqm4v0UEQmG+Nf9U9tFawDO7KWKI7uZnX1RleebNtgmurHKcuH3QVoPA0B5u2M8dv9krGbBVgnTYo1wh435Q8dJ7GIlr7Xr6s9m3nH3P02ClIt91ElZ0aE2XceOtyekhUA9UjVhqD8RPrApjXQcjtp4ERah23OcSC/png+2XDWnkZZcDoKMy4iG7NG7apHtWR2NJWyV8HMGAbCOielpZd7qxVxljleW+Yyj8PN92qONUA4wZ4lxQOt4mKjM4waN0t6Zf3lIVOP6lyC8L4dLK5pHdUz9RzRw== 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=UIBhj1QS+yOM7togg2vTPf2PRQdMVLLTxl6pAQHvN5o=; b=B/BNnsEWY3nU+wwKesIji5NZBuCn+8zN7/IAuH8/LXYABv+5pHbKShgeXYw11Gr4lPXXOCo0HZMX7FyyBJqm58jw/pf1e/gpzIDYLQjQ235uvaJv+5PeABeOwbuLTfEWRJfAghlWVAtoI+pk4Bf0lLWckZWWrYywQNd3rqG0/bg= 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 DU0P251MB0937.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:3e0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Mon, 10 Mar 2025 18:35:15 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::fe8d:f825:5b29:2903]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::fe8d:f825:5b29:2903%5]) with mapi id 15.20.8511.026; Mon, 10 Mar 2025 18:35:15 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Mon, 10 Mar 2025 19:34:50 +0100 Message-Id: <20250310183450.4038881-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV2PEPF000045BA.SWEP280.PROD.OUTLOOK.COM (2603:10a6:158:401::42b) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|DU0P251MB0937:EE_ X-MS-Office365-Filtering-Correlation-Id: 65f437a5-4252-4b1e-3240-08dd60024cea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?D4AyRyrFKnTHw2KE9Yzlt7Rc2VN6rC1gu5Bo8/ZlmzGw46TgPg1jYkpfAzrK?= =?us-ascii?Q?PS+qxlhdDf/SVB1VbYuSUp8KXHea6wuS+ytex6jgnyIVoalAUPj31W5C/fQA?= =?us-ascii?Q?Zfz/SJLAWkQeEuLB093UmlUmwwybdVovb7+dQIfVLd9ZUrUgK22B0/409CbC?= =?us-ascii?Q?XAqQn84QQi2EgqjXW+P3imi3wQXAKZHJII6yRYy0xcpgsuyCoML/2KsSjtbd?= =?us-ascii?Q?miutleVbE/Axy3zsHY3A+c0TO/1JYVnsNuu//yvWbtmz0pa7UhjXoGOUi+Za?= =?us-ascii?Q?rhhW175Ozn15l5qebwOyb9yixUJXSoHlfKcBS+2DkduHd3tulF4Ykyi2g7t3?= =?us-ascii?Q?vBBpbvutZaEQcL9+BdalY5CnhBEFRzBT2rBQcZeu+QLOkDk437JN1GpJ/Pxx?= =?us-ascii?Q?/nOMF/wk5GdxxQjZQYpeWF9tYjdJoZfQaiSyYzYpHhZTodaVnApvsKIMOqa+?= =?us-ascii?Q?V3/JOgLkKN5CC+fxM8tbPVXffzMm89qeFAK2YSmSFMIz+4IBgWeAlMD0GDVX?= =?us-ascii?Q?us/oSPEeAtKSyIYgGQspEJYdQKA+8suEFLvoGon++xmz2bN3zkkp7IAPdskd?= =?us-ascii?Q?l2bDbSbZ7/00t1g838yep6mwb1kKdisHgkjUsu4IDRdj02x8UAxCo6x1HjMJ?= =?us-ascii?Q?XusJ0Shv472WJhU0+Agr3j33XDkcf2K1b21rDKhveQnrefT+P/g2LuQDHply?= =?us-ascii?Q?2kZW6XrUqeU8P9j45B1uKfO+OkvrtgXV5hgC3IBlqT0qgGES9MpYTY83xcTh?= =?us-ascii?Q?VQ/I2KrIoz+3SvlP7D+vOrPSBKBwTkKVrCl0MYMoRlinGhDuLwRJ9XboXe/H?= =?us-ascii?Q?Pg9TxWiAggBzetlOK68zPaTwRU0Hf3SKDMJ8aHBQVeTTgH69dEFAQnlzNfcm?= =?us-ascii?Q?Tvj0RGAFyttW7ITzsyaaB6yhWmcaH+GNTh1h3V9foPicxjGkCUg3A7e9YjzL?= =?us-ascii?Q?qQNu/urrXnuYD8HvojYnT2LPthE0fdYzl6ncossdxdT4Nh/cWRodPgO616RA?= =?us-ascii?Q?0JA+HMo9GObZiTbeuyvcVaxxC4fEfHRH/7o4Ke/8umPX2qT2Xc8EuAyPRMOf?= =?us-ascii?Q?/wzpq7Gyl4iqu23Xx/WFG5NNt4ISs2wPluwCLjLiVcYwJytWjyw9AtqJTGkx?= =?us-ascii?Q?Epzxy9IbUDkfLyD96jAT5BHlZuRf2a8ubrvKsYzK5vrrOJCKarHHv3q54XpD?= =?us-ascii?Q?9Xvq2CPazoHGad0L4sOQkQgxwd94jrz9YKPgTFpTA5DiFpoYiY2CTV6ad/l6?= =?us-ascii?Q?SLVeaE8DCXsvyyuJt24fFfU/XRPPKfhejJBnxZXD6hi1IMcBJOG2IpLqzPuU?= =?us-ascii?Q?SoIJWQ/CsZZCJkCYAoHlet850KPBZQQw/+fvZDGAbxMLLuKN/rrcLWW8aiX8?= =?us-ascii?Q?Q+74uf4yoQD/LlQCSr9DBj9ciRw5?= 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:(13230040)(376014)(52116014)(1800799024)(366016)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5GnbKd6VoMnn+koONxe/0DdVVw0JMWOO977fkcczCVNTLP+o5CfUs1Z2RDRW?= =?us-ascii?Q?FVfY9Ww3lLmYuiFdcxFOa9XOOUAcNT4pRrg3i97rf/XSjsUxbSanSprwEn0W?= =?us-ascii?Q?xndB/8pBq3iITZHGP/M347E3nDeFdxtP/eRTa8x6k39kWTSY0p0O1epUkyUb?= =?us-ascii?Q?cuC/YDgMjyHCXF5b+pf7GbFWRvKkUUsFFIPRGlhRblVWFXe85GpOriScMMCv?= =?us-ascii?Q?augZ61K4d42jnqmsaejtYlZ5mGzzDfimckfHAPTDJojkhZs5Ts3d8VHANvmU?= =?us-ascii?Q?UyI3JXcTQYbOzKZVbA4HI5Nbah2q/iSGYedBmoMk3gJVLeS6965f0GKuyu9N?= =?us-ascii?Q?T9WC6ohOBDDdFiVmA2BRNIw3vh0kNLRl6+FM/RW8UrUYBeGw3tCuK3Ny5FAe?= =?us-ascii?Q?YACIuEtQYarC6fgBXT/o8rcrtP8L5eVwuVS2W3w5IXJpRi9REuNZRU3QGtGS?= =?us-ascii?Q?YOSBGUI8+VYxC2WaRrnZ6KIZZKvx3ClnHl3LI42EjMbM9OdXKNAaBkMmEOOh?= =?us-ascii?Q?IdiRZEaOBwHZkyJSdNWIMsHV8cGFFPRoz9U8/uoXq8XVHzcQ51LrSCy0dmNX?= =?us-ascii?Q?Jtty/qlwFSjZyxKFQ5r+c54xdhjTRjiYS/WySEUpv7e5wFbR7zOxPs2KO7Wd?= =?us-ascii?Q?woTDFs01GRTBJnK4mpjOpY2jBAkLMc+1lCqPFGXwGcQBdvfCEjjoij9YBWqI?= =?us-ascii?Q?r9SndLQ0Tm8ThSfZln4ZPrreqhs7H5yLpR0+M1Bmzx9Sx4Ymqjx3pl8E988C?= =?us-ascii?Q?rvlO+uHSwFwmeUTNeplIwKaqlVN3PavV20HRGE/hDSocrzAIaJlhTq6kAUOI?= =?us-ascii?Q?1UkybmLyvjyW7vYSQiNF2VNs3COfSQyCeGQdjn6pBzMNzZy0vqtvqVmLVlpr?= =?us-ascii?Q?kVKbIM36nCvmFEBvPHZ9NZCyiRDnV39W4BLvsDcCXJWa51qFC3c7bTga30qf?= =?us-ascii?Q?7AncpHvNHWdUjylFUczhImT9LldG/dWdGODq34raVI6fLZv3sxtSsfF+g5ve?= =?us-ascii?Q?zyW93qo6+ZXhPAPyBRu2skfUZW7jF3qILdQDdH7++nyYHA1YxoT5fvjSZkl0?= =?us-ascii?Q?mFjmLEoqZ5ArHeuSjVMEa7sSlpUgvaWZix+8N1xGq4t1TNuUUTyaqVbfGDuR?= =?us-ascii?Q?HmAA40m/uDrfj6pUYXlSBpK/nokSSRGZG86JmtJuay7deRdXpfAcCTsiaLfZ?= =?us-ascii?Q?sAPU1EIA2Fh/ornENzauNO2LqPd8lNAsIxj5c2asl5HhFNI6LBc4eItqox9D?= =?us-ascii?Q?Zv2gbxLnnojr1v6StpvqTOspgE45oKY7G7LJQvzHaJxlyqEycyzlS/Co4xVg?= =?us-ascii?Q?i0mAMNCVyUkKQGM0wMpBdvfo++md+gPqkfSV+fbUbxUKZ6xTlCMP7w0rwnQs?= =?us-ascii?Q?Uor9NOLMnOL1N6qN6CkTdZFFSWU0ee23Uz71yEsysvdotp34FIyuO9+N7fDL?= =?us-ascii?Q?Jctmifn1UxbgcPsy0jyVWv4aRyHDe+xt0OmSvvEYr7DQtSXUynBO/IYMXJSb?= =?us-ascii?Q?YiuXr9D74nQ/g7YUXVA7SRfwnnJ69W/cTDyZcEZCHsdG3MFicNACAaNMA+LT?= =?us-ascii?Q?jkeBPSE6xXwN2E5Mf80wwpxvjkOPPRGNrrx2L5E5YlY5/r1ijVFb+utBV78R?= =?us-ascii?Q?Lw=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65f437a5-4252-4b1e-3240-08dd60024cea X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2025 18:35:15.5780 (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: X/gkLGKMmGbiE6JP7DRk9BSugfzdTsklt00PU1hWZD39MYkbF/43KMG8Dg3sHl6q3syzguYhe2CCxMycmtk6VAQ5egR6HZsW64+YQEpisRs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P251MB0937 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.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_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] cairo: Version bump. 1.18.2 -> 1.18.4 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Minor changes. https://gitlab.freedesktop.org/cairo/cairo/-/releases/1.18.4 * Forward patches. * Make exposed LZO togglable and bind it to scripting (afaict). Signed-off-by: Christian Melki --- .../0001-cairo-ft-fx-building-without-SVG-support.patch | 0 ...airo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch | 0 ...here-is-an-assertion-in-function-_cairo_arc_in_dire.patch | 0 patches/{cairo-1.18.2 => cairo-1.18.4}/series | 0 rules/cairo.in | 5 +++++ rules/cairo.make | 5 +++-- 6 files changed, 8 insertions(+), 2 deletions(-) rename patches/{cairo-1.18.2 => cairo-1.18.4}/0001-cairo-ft-fx-building-without-SVG-support.patch (100%) rename patches/{cairo-1.18.2 => cairo-1.18.4}/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch (100%) rename patches/{cairo-1.18.2 => cairo-1.18.4}/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch (100%) rename patches/{cairo-1.18.2 => cairo-1.18.4}/series (100%) diff --git a/patches/cairo-1.18.2/0001-cairo-ft-fx-building-without-SVG-support.patch b/patches/cairo-1.18.4/0001-cairo-ft-fx-building-without-SVG-support.patch similarity index 100% rename from patches/cairo-1.18.2/0001-cairo-ft-fx-building-without-SVG-support.patch rename to patches/cairo-1.18.4/0001-cairo-ft-fx-building-without-SVG-support.patch diff --git a/patches/cairo-1.18.2/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch b/patches/cairo-1.18.4/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch similarity index 100% rename from patches/cairo-1.18.2/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch rename to patches/cairo-1.18.4/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch diff --git a/patches/cairo-1.18.2/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch b/patches/cairo-1.18.4/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch similarity index 100% rename from patches/cairo-1.18.2/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch rename to patches/cairo-1.18.4/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch diff --git a/patches/cairo-1.18.2/series b/patches/cairo-1.18.4/series similarity index 100% rename from patches/cairo-1.18.2/series rename to patches/cairo-1.18.4/series diff --git a/rules/cairo.in b/rules/cairo.in index a2c678a43..7490f6d5b 100644 --- a/rules/cairo.in +++ b/rules/cairo.in @@ -6,6 +6,7 @@ menuconfig CAIRO select GCCLIBS_GCC_S select XORG_LIB_XEXT if CAIRO_XLIB select XORG_LIB_XRENDER if CAIRO_XLIB + select LIBLZO if CAIRO_LZO select ZLIB if CAIRO_ZLIB select GLIB if CAIRO_GOBJECT select FREETYPE if CAIRO_FREETYPE @@ -26,6 +27,9 @@ if CAIRO config CAIRO_GOBJECT bool +config CAIRO_LZO + bool + config CAIRO_ZLIB bool @@ -66,6 +70,7 @@ config CAIRO_PNG config CAIRO_SCRIPT bool + select CAIRO_LZO select CAIRO_ZLIB prompt "script surface" diff --git a/rules/cairo.make b/rules/cairo.make index 3bbd5770b..c147998fe 100644 --- a/rules/cairo.make +++ b/rules/cairo.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo # # Paths and names # -CAIRO_VERSION := 1.18.2 -CAIRO_MD5 := 5ad67c707edd0003f1b91c8bbc0005c1 +CAIRO_VERSION := 1.18.4 +CAIRO_MD5 := db575fb41bbda127e0147e401f36f8ac CAIRO := cairo-$(CAIRO_VERSION) CAIRO_SUFFIX := tar.xz CAIRO_URL := http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX) @@ -45,6 +45,7 @@ CAIRO_CONF_OPT := \ -Dglib=$(call ptx/endis, PTXCONF_CAIRO_GOBJECT)d \ -Dgtk2-utils=disabled \ -Dgtk_doc=false \ + -Dlzo=$(call ptx/endis, PTXCONF_CAIRO_LZO)d \ -Dpng=$(call ptx/endis, PTXCONF_CAIRO_PNG)d \ -Dquartz=disabled \ -Dspectre=disabled \ -- 2.34.1