From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] activating tests for skia 2D graphics library Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Jan 2023 10:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167291298120090 (code B ref -1); Thu, 05 Jan 2023 10:04:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jan 2023 10:03:01 +0000 Received: from localhost ([127.0.0.1]:50322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDN5R-0005Ds-Dr for submit@debbugs.gnu.org; Thu, 05 Jan 2023 05:03:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:58206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDN5P-0005Dk-Hi for submit@debbugs.gnu.org; Thu, 05 Jan 2023 05:03:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDN5P-0003fj-5u for guix-patches@gnu.org; Thu, 05 Jan 2023 05:02:59 -0500 Received: from 17.mo561.mail-out.ovh.net ([87.98.178.58]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDN5N-0002Iy-A0 for guix-patches@gnu.org; Thu, 05 Jan 2023 05:02:58 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.16.164]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id E4A0025192 for ; Thu, 5 Jan 2023 10:02:45 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-kjkrm (unknown [10.110.103.249]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3F3671FF72 for ; Thu, 5 Jan 2023 10:02:44 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-kjkrm with ESMTPSA id 34EHE0SgtmO0HwAASFnOuQ (envelope-from ) for ; Thu, 05 Jan 2023 10:02:44 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002122cea51-c2af-4f68-8aee-b1f100a55b0d, CCCEE37B4F29B2D663A2C00FBFAE6261951393C8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 194.57.247.3 From: Nicolas Graves Date: Thu, 05 Jan 2023 11:02:42 +0100 Message-ID: <87pmbtfge5.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 11548636820124918522 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeekgdduudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeujeelieeljeffhfelteejtdeljeehveduffelvefgudefkeehgfdvvdevgeevfeenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=87.98.178.58; envelope-from=ngraves@ngraves.fr; helo=17.mo561.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi guix! I have a series of patches to activate tests on the SKIA graphics 2D library. Originally my goal was to add skia as a dependency to libreoffice and remove the --without-skia flag, but I didn't want to do that before being able to test the library change. It took me quite a while since google uses its own tools in a way that is hard to package in guix. There are still some disabled tests that I'm not able to fix myself, but at least it's testable for most tests. Help and review welcome, at least one function fails with segmentation fault, but I'm not able to debug it. -- Best regards, Nicolas Graves From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH 1/4] gnu: Add spirv-headers-for-skia. References: <87pmbtfge5.fsf@ngraves.fr> In-Reply-To: <87pmbtfge5.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Jan 2023 12:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.167292114511060 (code B ref 60571); Thu, 05 Jan 2023 12:20:02 +0000 Received: (at 60571) by debbugs.gnu.org; 5 Jan 2023 12:19:05 +0000 Received: from localhost ([127.0.0.1]:50439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDPD6-0002sF-No for submit@debbugs.gnu.org; Thu, 05 Jan 2023 07:19:05 -0500 Received: from 9.mo576.mail-out.ovh.net ([46.105.56.78]:42225) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDPD4-0002rn-8g for 60571@debbugs.gnu.org; Thu, 05 Jan 2023 07:19:03 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.20.179]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4977724E47 for <60571@debbugs.gnu.org>; Thu, 5 Jan 2023 12:18:58 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-vcj6j (unknown [10.110.171.249]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 59EFD1FF3F; Thu, 5 Jan 2023 12:18:57 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-vcj6j with ESMTPSA id BRetFjHAtmMtWwMAanWh3Q (envelope-from ); Thu, 05 Jan 2023 12:18:57 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0032e6a1c6d-4dfa-4520-97fa-d063a3a04a89, CCCEE37B4F29B2D663A2C00FBFAE6261951393C8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 194.57.247.3 From: Nicolas Graves Date: Thu, 5 Jan 2023 13:18:39 +0100 Message-Id: <20230105121842.18662-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 13849131806226178786 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeekgdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffhfefieeljeeuveelleeugeetheekffefteekveelfeekgfduffegudfhleffheenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhgohhoghhlvghsohhurhgtvgdrtghomhenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedtheejudesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vulkan.scm (spirv-headers-for-skia): New variable. --- gnu/packages/vulkan.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index a2db5511d5..8895d8a5cf 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -74,6 +74,23 @@ (define-public spirv-headers (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/" version "/LICENSE"))))) +(define-public spirv-headers-for-skia + (let ((commit "814e728b30ddd0f4509233099a3ad96fd4318c07") + (revision "0")) + (package + (inherit spirv-headers) + (name "spirv-headers-for-skia") + (version "skia") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0v6ycgfxh9d2gzhxrnxgrn5gyg2cshg55767qdg46px8412j5lbi"))))))) + (define-public spirv-tools (package (name "spirv-tools") -- 2.38.1 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH 2/4] gnu: Add spirv-tools-for-skia. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Jan 2023 12:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.167292114611070 (code B ref 60571); Thu, 05 Jan 2023 12:20:02 +0000 Received: (at 60571) by debbugs.gnu.org; 5 Jan 2023 12:19:06 +0000 Received: from localhost ([127.0.0.1]:50441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDPD8-0002sS-5m for submit@debbugs.gnu.org; Thu, 05 Jan 2023 07:19:06 -0500 Received: from 3.mo576.mail-out.ovh.net ([188.165.52.203]:57181) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDPD5-0002s6-6K for 60571@debbugs.gnu.org; Thu, 05 Jan 2023 07:19:04 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.143.201]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id F3F06244E5 for <60571@debbugs.gnu.org>; Thu, 5 Jan 2023 12:19:01 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-m8dkx (unknown [10.110.115.9]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7757E1FF6C; Thu, 5 Jan 2023 12:19:00 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-6684bf9d7b-m8dkx with ESMTPSA id Gcg9IDTAtmPXWgMAu7G/HA (envelope-from ); Thu, 05 Jan 2023 12:19:00 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R001b7bf7139-f308-403d-8a61-cf06633bcf47, CCCEE37B4F29B2D663A2C00FBFAE6261951393C8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 194.57.247.3 From: Nicolas Graves Date: Thu, 5 Jan 2023 13:18:40 +0100 Message-Id: <20230105121842.18662-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230105121842.18662-1-ngraves@ngraves.fr> References: <20230105121842.18662-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 13849976231613031138 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeekgdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffgefhheevuefhvddufeethffhleduiedtledvuefhheelieefheehveevffffteenucffohhmrghinhepghhoohhglhgvshhouhhrtggvrdgtohhmpdhgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vulkan.scm (spirv-tools-for-skia): New variable. --- gnu/packages/vulkan.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 8895d8a5cf..231fa2e281 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -120,6 +120,31 @@ (define-public spirv-tools parser,disassembler, validator, and optimizer for SPIR-V.") (license license:asl2.0))) +(define-public spirv-tools-for-skia + (let ((commit "4b092d2ab81854e61632bdd1e658907f0071c37e") + (revision "0")) + (package + (inherit spirv-tools) + (name "spirv-tools-for-skia") + (version "skia") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dqdybkxkwjiwwhxf0p3p1408wrqvwysymq7c9rzd1a2220y6lry")))) + (inputs (list spirv-headers-for-skia)) + (native-inputs (list pkg-config python-wrapper)) + (arguments + (list + #:configure-flags `(list "-DBUILD_SHARED_LIBS=ON" + (string-append + "-DSPIRV-Headers_SOURCE_DIR=" + (assoc-ref %build-inputs "spirv-headers-for-skia")))))))) + (define-public spirv-cross (package (name "spirv-cross") -- 2.38.1 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH 3/4] gnu: Add icu4c-for-skia. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Jan 2023 12:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.167292115111086 (code B ref 60571); Thu, 05 Jan 2023 12:20:03 +0000 Received: (at 60571) by debbugs.gnu.org; 5 Jan 2023 12:19:11 +0000 Received: from localhost ([127.0.0.1]:50444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDPDC-0002sj-Gc for submit@debbugs.gnu.org; Thu, 05 Jan 2023 07:19:10 -0500 Received: from 1.mo550.mail-out.ovh.net ([178.32.127.22]:54967) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDPDA-0002sU-Gt for 60571@debbugs.gnu.org; Thu, 05 Jan 2023 07:19:09 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.4.72]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id BA57A250D2 for <60571@debbugs.gnu.org>; Thu, 5 Jan 2023 12:19:05 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-c52db (unknown [10.110.208.177]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C03CC1FF21; Thu, 5 Jan 2023 12:19:03 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-c52db with ESMTPSA id fEvGMDfAtmPoxwAABnm1Sg (envelope-from ); Thu, 05 Jan 2023 12:19:03 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004c586ae94-ced5-4bb4-94a6-9e7977fb6e5b, CCCEE37B4F29B2D663A2C00FBFAE6261951393C8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 194.57.247.3 From: Nicolas Graves Date: Thu, 5 Jan 2023 13:18:41 +0100 Message-Id: <20230105121842.18662-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230105121842.18662-1-ngraves@ngraves.fr> References: <20230105121842.18662-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 13851102132087153378 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeekgdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefhjeeuudeihfeijeffkeeiheegkeekgfdugfduledthfffvdduiefhhffhjeduteenucffohhmrghinhepghhoohhglhgvshhouhhrtggvrdgtohhmnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/icu4c.scm (icu4c-for-skia): New variable. --- gnu/packages/icu4c.scm | 99 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 1e4f66d956..05911addcd 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -27,14 +27,17 @@ (define-module (gnu packages icu4c) #:use-module (gnu packages) + #:use-module (gnu packages cpio) #:use-module (gnu packages java) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system ant) #:use-module (guix build-system gnu)) @@ -243,3 +246,99 @@ (define-public java-icu4j globalisation support for software applications. This package contains the Java part.") (license x11))) + +(define-public icu4c-for-skia + (let ((commit "a0718d4f121727e30b8d52c7a189ebf5ab52421f") + (revision "0")) + (package + (inherit icu4c) + (name "icu4c-for-skia") + (version "skia") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/chromium/deps/icu.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qxws2p91f6dmhy7d3967r5ygz06r88pkmpm97px067x0zzdz384")))) + (native-inputs (list python cpio pkg-config)) + (arguments + (list + #:make-flags #~`(,(string-append "DESTDIR=" #$output)) + #:configure-flags #~'(;;"--enable-shared=no" "--enable-static=yes" + "--prefix=" "--exec-prefix=") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir-to-source + (lambda _ (chdir "source"))) + (replace 'configure + (lambda* (#:key inputs parallel-build? configure-flags #:allow-other-keys) + (let ((bash (search-input-file inputs "/bin/sh"))) + ;; Replace bash executable. + (setenv "CONFIG_SHELL" bash) + (substitute* "./configure" + (("`/bin/sh") + (string-append "`" bash))) + ;; Make the static library position-independent. + ;; (substitute* "./icudefs.mk.in" + ;; (("^CFLAGS = ") + ;; "CFLAGS = -fPIC ") + ;; (("^CXXFLAGS = ") + ;; "CXXFLAGS = -fPIC ")) + ;; Update runpath. + (substitute* "./icudefs.mk.in" + (("= -L\\$\\(LIBDIR\\)") + (string-append "= -L$(LIBDIR)" + " -Wl,-rpath=\"" #$output "/lib\""))) + ;; Set prefix and exec-prefix. + (substitute* "./runConfigureICU" + (("^OPTS=") + (string-append "OPTS=\"" + (string-join configure-flags " ") + "\""))) + ;; Configure. + (invoke "./runConfigureICU" "Linux/gcc" + "--disable-layout" "--disable-tests")))) + (add-after 'install 'configure-filtered-data + (lambda* (#:key make-flags configure-flags #:allow-other-keys) + ;; Cleanup. + (with-directory-excursion "data" + `(,invoke "make" "clean" ,@make-flags)) + ;; Set prefix and exec-prefix. + (substitute* "./runConfigureICU" + (("^OPTS=") + (string-append + "OPTS=\"" (string-join configure-flags " ") "\""))) + ;; Configure for common data. + (setenv "ICU_DATA_FILTER_FILE" + (string-append (getcwd) "/../filters/common.json")) + (invoke "./runConfigureICU" "Linux/gcc" + "--disable-layout" "--disable-tests"))) + (add-after 'configure-filtered-data 'build-filtered-data + (lambda* (#:key parallel-build? make-flags #:allow-other-keys) + (let ((job-count (if parallel-build? + (number->string (parallel-job-count)) + "1"))) + `(,invoke "make" "-j" ,job-count ,@make-flags) + (setenv "DESTDIR" #$output) + (invoke "bash" "../scripts/copy_data.sh" "common")))) + (add-after 'build-filtered-data 'install-scripts-and-data + (lambda _ + (let* ((share (string-append #$output "/share")) + (scripts (string-append share "/scripts")) + (data (string-append share "/data/common"))) + ;; Install scripts. + (mkdir-p scripts) + (copy-recursively "../scripts/" scripts) + ;; Install data. + (mkdir-p data) + (copy-recursively "./dataout/common/data/out/tmp" data) + (symlink (string-append data "/icudt69l.dat") + (string-append data "/icudtl.dat"))))) + (add-before 'check 'disable-failing-uconv-test + (lambda _ + (substitute* "extra/uconv/Makefile.in" + (("check: check-local") + "")))))))))) -- 2.38.1 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH 4/4] gnu: skia: Activate tests. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Jan 2023 12:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.167292115611105 (code B ref 60571); Thu, 05 Jan 2023 12:20:03 +0000 Received: (at 60571) by debbugs.gnu.org; 5 Jan 2023 12:19:16 +0000 Received: from localhost ([127.0.0.1]:50447 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDPDI-0002t2-0n for submit@debbugs.gnu.org; Thu, 05 Jan 2023 07:19:16 -0500 Received: from 12.mo582.mail-out.ovh.net ([178.32.125.228]:44285) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDPDF-0002ss-HJ for 60571@debbugs.gnu.org; Thu, 05 Jan 2023 07:19:14 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.4.44]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id EC4DE25AFA for <60571@debbugs.gnu.org>; Thu, 5 Jan 2023 12:19:11 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-ps6sb (unknown [10.110.103.53]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0F88B1FF02; Thu, 5 Jan 2023 12:19:10 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-ps6sb with ESMTPSA id oa53BD7AtmMhgQAAKOSeTw (envelope-from ); Thu, 05 Jan 2023 12:19:10 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S002913756fe-ae5f-4b1e-80a4-b2599b5f259c, CCCEE37B4F29B2D663A2C00FBFAE6261951393C8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 194.57.247.3 From: Nicolas Graves Date: Thu, 5 Jan 2023 13:18:42 +0100 Message-Id: <20230105121842.18662-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230105121842.18662-1-ngraves@ngraves.fr> References: <20230105121842.18662-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 13852790981114061538 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeekgdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefhieekvddtveevgeeiiefgleelieehvdfghfeuvdevheffveekieettdeuhfeiteenucffohhmrghinhepshhkihgrrdhorhhgnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/graphics.scm (skia): Activate tests. --- gnu/packages/graphics.scm | 144 ++++++++++++++++++++++++++++++++++---- 1 file changed, 132 insertions(+), 12 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f23fad7c50..2392a63d33 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -80,6 +80,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) @@ -1876,10 +1877,6 @@ (define-public skia (build-system gnu-build-system) ;actually GN + Ninja (arguments (list - ;; Running the test suite would require 'dm'; unfortunately the tool - ;; can only be built for debug builds, which require fetching third - ;; party sources. - #:tests? #f #:phases #~(modify-phases %standard-phases (replace 'configure @@ -1944,13 +1941,136 @@ (define skia.pc (string-append #$output URL: https://skia.org/ Version: ~a Libs: -L${libdir} -lskia -Cflags: -I${includedir}~%" #$output #$version)))))))) - (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper)) - (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib)) - (home-page "https://skia.org/") - (synopsis "2D graphics library") - (description - "Skia is a 2D graphics library for drawing text, geometries, and images. +Cflags: -I${includedir}~%" #$output #$version))))) + (replace 'check + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((icu #$(this-package-native-input "icu4c-for-skia"))) + ;; Configure SPIRV-Tools dependency. + (substitute* "BUILD.gn" + (("deps \\+= \\[ \"\\/\\/third_party\\/externals\\/spirv-tools:spvtools_val\" \\]") + "libs += [ \"SPIRV-Tools\" ]")) + (substitute* "src/sksl/SkSLCompiler.cpp" + (("\"spirv-tools/libspirv.hpp\"") + "")) + ;; Configure ICU dependency. + (substitute* "third_party/icu/BUILD.gn" + (("data_dir = \"\\.\\.\\/externals\\/icu\\/\"") + (string-append "data_dir = \"" icu "/share/data/\"")) + (("script = \"\\.\\.\\/externals\\/icu\\/scripts\\/") + (string-append "script = \"" icu "/share/scripts/")) + (("\\.\\.\\/externals\\/icu\\/common\\/icudtl.dat") + (string-append icu "/share/data/icudtl.dat")) + (("sources = icu_sources") + "") + (("sources \\+= \\[ \"\\$data_assembly\" \\]") + "sources = [ \"$data_assembly\" ]")) + ;; Enable system libraries without is_official_build=true. + ;; Necessary because is_official_build prevents building dm. + (for-each + (lambda (libname) + (let ((snake (string-join (string-split libname #\-) "_"))) + (substitute* + (string-append "third_party/" libname "/BUILD.gn") + (((string-append "skia_use_system_" + snake + " = is_official_build.*")) + (string-append "skia_use_system_" snake " = true"))))) + '("zlib" "libjpeg-turbo" "harfbuzz" "libpng" "libwebp")) + ;; Configure with gn. + (invoke "gn" "gen" "out/Debug" + (string-append + "--args=" + "cc=\"gcc\" " ;defaults to 'cc' + "skia_compile_sksl_tests=false " ; disable some tests + "skia_use_system_expat=true " ; use system expat library + ;; Specify where to locate the includes. + "extra_cflags=[" + (string-join + (map + (lambda (lib) + (string-append + "\"-I" + (search-input-directory + inputs + (string-append "include/" lib)) "\"")) + '("harfbuzz" + "freetype2" + "spirv-tools" + "spirv" + "unicode")) + ",") + "] " + ;; Otherwise the validate-runpath phase fails. + "extra_ldflags=[" + "\"-Wl,-rpath=" #$output "/lib\"" + "] " + ;; Disabled, otherwise the build system attempts to + ;; download the SDK at build time. + "skia_use_dng_sdk=false " + "skia_use_runtime_icu=true ")) + ;; Build dm testing tool. + (symlink + (string-append #$(this-package-native-input "gn") "/bin/gn") + "./bin/gn") + (invoke "ninja" "-C" "out/Debug" "dm") + ;; Test require an X server. + (let ((xvfb (search-input-file (or native-inputs inputs) + "bin/Xvfb")) + (display ":1")) + (setenv "DISPLAY" display) + (system (string-append xvfb " " display " &"))) + ;; Run tests. + (invoke "out/Debug/dm" "-v" + "-w" "dm_output" + "--codecWritePath" "dm_output" + "--simpleCodec" + "--skip" + ;; These tests fail with segmentation fault. + "_" "_" "_" "Codec_trunc" + "_" "_" "_" "AnimCodecPlayer" + "_" "_" "_" "Codec_partialAnim" + "_" "_" "_" "Codec_InvalidImages" + "_" "_" "_" "Codec_GifInterlacedTruncated" + "_" "_" "_" "SkText_UnicodeText_Flags" + "_" "_" "_" "SkParagraph_FontStyle" + "_" "_" "_" "flight_animated_image" + ;; These tests fail because of Codec/Sk failure. + "_" "_" "_" "AndroidCodec_computeSampleSize" + "_" "_" "_" "AnimatedImage_invalidCrop" + "_" "_" "_" "AnimatedImage_scaled" + "_" "_" "_" "AnimatedImage_copyOnWrite" + "_" "_" "_" "AnimatedImage" + "_" "_" "_" "BRD_types" + "_" "_" "_" "Codec_frames" + "_" "_" "_" "Codec_partial" + "_" "_" "_" "Codec_partialWuffs" + "_" "_" "_" "Codec_requiredFrame" + "_" "_" "_" "Codec_rewind" + "_" "_" "_" "Codec_incomplete" + "_" "_" "_" "Codec_InvalidAnimated" + "_" "_" "_" "Codec_ossfuzz6274" + "_" "_" "_" "Codec_gif_out_of_palette" + "_" "_" "_" "Codec_xOffsetTooBig" + "_" "_" "_" "Codec_gif" + "_" "_" "_" "Codec_skipFullParse" + "_" "_" "_" "AndroidCodec_animated_gif" + ;; Other failures + "_" "_" "_" "Gif" + "_" "_" "_" "Wuffs_seek_and_decode" + "_" "_" "_" "Skottie_Shaper_ExplicitFontMgr" + "8888" "skp" "_" "_" + "8888" "lottie" "_" "_" + "gl" "skp" "_" "_" + "gl" "lottie" "_" "_" + "_" "_" "_" "ES2BlendWithNoTexture"))))))) + (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper + spirv-tools-for-skia spirv-headers-for-skia + icu4c-for-skia glu xorg-server-for-tests)) + (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib)) + (home-page "https://skia.org/") + (synopsis "2D graphics library") + (description + "Skia is a 2D graphics library for drawing text, geometries, and images. It supports: @itemize @item 3x3 matrices with perspective @@ -1958,7 +2078,7 @@ (define skia.pc (string-append #$output @item shaders, xfermodes, maskfilters, patheffects @item subpixel text @end itemize") - (license license:bsd-3)))) + (license license:bsd-3)))) (define-public superfamiconv (package -- 2.38.1 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] activating tests for skia 2D graphics library Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Mar 2023 03:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Graves Cc: 60571@debbugs.gnu.org Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.167962774423751 (code B ref 60571); Fri, 24 Mar 2023 03:16:01 +0000 Received: (at 60571) by debbugs.gnu.org; 24 Mar 2023 03:15:44 +0000 Received: from localhost ([127.0.0.1]:39594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfXu1-0006Au-0u for submit@debbugs.gnu.org; Thu, 23 Mar 2023 23:15:44 -0400 Received: from mail-qt1-f181.google.com ([209.85.160.181]:35570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfXtt-0006AP-AT for 60571@debbugs.gnu.org; Thu, 23 Mar 2023 23:15:39 -0400 Received: by mail-qt1-f181.google.com with SMTP id ga7so407451qtb.2 for <60571@debbugs.gnu.org>; Thu, 23 Mar 2023 20:15:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679627708; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=gkjM3cTXRbq02jRFCZAUdrh8anen9j6SNp+Gp3keU44=; b=UFFEtveOOkY1OFuDhZkMwizkl20EYEYmKEWNRvhHuRb78yXktLkepW/t4ckFrXIPHj 1riGewYncwqlNOb5Oilu/uSdaPCiGQ/A4V4k7N6EQWVqS00d/LZVM0LW0Ihf1/EXhRrc tOwyoG/an8LJj78wae5lZ/DShCqrgiY/phM+/ekTAKUxlKHr9eswyGht+K1d2d5twzMw nX2m3RvGWqPJvKyXLgfcpyJljaKfiE1IcH8ibX0vVHW9W9xzYymvGTjVK00MvXrrmfsH rMkN7SII/ikWxydsOJS5c9yp8MP1NwySId9CqFQANzVZZkIxHoheVCVDFn/FOVdDF6iS 46TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679627708; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=gkjM3cTXRbq02jRFCZAUdrh8anen9j6SNp+Gp3keU44=; b=7wHF8EKInaW5mgtg6dlnnWNxgHNRznYrIzLUw3CVO6UHZmJCuOOg9gd3ZSe84XoGcs ExfTsXpvHmTsvlfeCaavMD/XQM9jHQcf0aEA5d1sbGvYVsqDz0Y+Fh0/gabooxNQNTTH 52RtSwbwth/9Czfdb0Mm7Fbi/4mTxcLpRTobo2c5KV8C7+mzvHUXlqbMYf0I4iB+QT5k FUJ47XHNPpX9wl9cdcRqmRyTamVFWt9qyGHguLjNBYiZvHdEW6WTJDOBGWfwU3elLQas gFY1qvP4vjVm6jGvhxobfQiUWIGvqRb3Qb3GCeFdO74CJ7CB++jfuKCNuqRS4/X2003a f/+A== X-Gm-Message-State: AAQBX9ecGW9/2Uf2JsHqEwN8yjc2DvgY15LcrXFTlJUJIyYvpFrMS0uh U8Cc+EzwoaIYwChXzhJgQMTlYIlHZ+vMvg== X-Google-Smtp-Source: AK7set8eF9XlFYMe+2KLgDg67iFaIO/H2cJ54EH+O/kQcNdFnigQg1JrGrWfYx8eMyc/RXfi6I4Y8w== X-Received: by 2002:a05:622a:b:b0:3e2:b529:e7fe with SMTP id x11-20020a05622a000b00b003e2b529e7femr3081521qtw.0.1679627702957; Thu, 23 Mar 2023 20:15:02 -0700 (PDT) Received: from hurd (dsl-155-54.b2b2c.ca. [66.158.155.54]) by smtp.gmail.com with ESMTPSA id bl28-20020a05620a1a9c00b007339c5114a9sm13993990qkb.103.2023.03.23.20.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Mar 2023 20:15:02 -0700 (PDT) From: Maxim Cournoyer References: <87pmbtfge5.fsf@ngraves.fr> <20230105121842.18662-1-ngraves@ngraves.fr> Date: Thu, 23 Mar 2023 23:15:01 -0400 In-Reply-To: <20230105121842.18662-1-ngraves@ngraves.fr> (Nicolas Graves's message of "Thu, 5 Jan 2023 13:18:39 +0100") Message-ID: <87fs9u3kne.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Nicolas Graves writes: > * gnu/packages/vulkan.scm (spirv-headers-for-skia): New variable. > --- > gnu/packages/vulkan.scm | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm > index a2db5511d5..8895d8a5cf 100644 > --- a/gnu/packages/vulkan.scm > +++ b/gnu/packages/vulkan.scm > @@ -74,6 +74,23 @@ (define-public spirv-headers > (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/" > version "/LICENSE"))))) > > +(define-public spirv-headers-for-skia Could you please add a comment here about why we use this commit, and not a release, e.g. ("There is no release; use the latest commit.") > + (let ((commit "814e728b30ddd0f4509233099a3ad96fd4318c07") > + (revision "0")) > + (package > + (inherit spirv-headers) > + (name "spirv-headers-for-skia") > + (version "skia") That's not OK as a version. See if there is a version string in the source, and use that else 0.0.0, combined wih revision and commit via the 'git-version' procedure. Thanks for working on it! -- Thanks, Maxim From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] activating tests for skia 2D graphics library Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Mar 2023 03:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Graves Cc: 60571@debbugs.gnu.org Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.167962804924270 (code B ref 60571); Fri, 24 Mar 2023 03:21:01 +0000 Received: (at 60571) by debbugs.gnu.org; 24 Mar 2023 03:20:49 +0000 Received: from localhost ([127.0.0.1]:39598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfXyz-0006JO-4h for submit@debbugs.gnu.org; Thu, 23 Mar 2023 23:20:49 -0400 Received: from mail-qv1-f41.google.com ([209.85.219.41]:34680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfXyu-0006J2-0o for 60571@debbugs.gnu.org; Thu, 23 Mar 2023 23:20:48 -0400 Received: by mail-qv1-f41.google.com with SMTP id 31so921983qvc.1 for <60571@debbugs.gnu.org>; Thu, 23 Mar 2023 20:20:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679628028; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=LPk7OHUmoQorPs0CyIabDOq7eYT9O7cMl1dBFgvMv9o=; b=qHGfqnq5kUBEDq2uf8FIMpK530PF2hYdDa0ItJcVre1RoH7lSK2SIsxEShZW61Hbdl YkvRffnp2bHS/nuc5EQ4TIFnZNWOvgOmXgmp2cfIqzg+NZeu5aHQ8xDSTJjY4wefKFXJ gpBuXIRMb4yGFnHgEBx4iC2vpHrcSj1w7tv7486hRqul2oCDBVKApKrdqo/7HCaJPTs/ mENOmOK4bs9fGwcxr0HuPCwOHCWcKdY/C3ec9Ufmcu82kvPfxNgAFFh9WYK2zCsRwSUX wH9r8Hbv/fB+FrGHenxwyTyQSaR9PuIyMOXTAiLQUCvQZFd6FzMI2B5daaapxw4p2Fug oVCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679628028; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LPk7OHUmoQorPs0CyIabDOq7eYT9O7cMl1dBFgvMv9o=; b=AzEhpr9Go3x3EvGFmIVty/Q7EE3ZSiY4EL2ABuPBIuac+1i99T86x4180VM9skXNNV jLGI99OTq3SYYYTf8Nq4wak3DevO5EG4fMGs26WSQ3bvobYlAikTjB3lMMmY8B1g5WiE mQVXkW3pa3HzSgxIk+0Lnq8NaewM3v2XpHAYu6cBuU+3FEXT7MZOLtdrxJdF/+0WSkJ6 uGcDbF9KXHzEFjCfyRq51oI4C+SFPWJdjJfL9hLfc4BG4UE+GA7vFa7NYaLa7NK7j7Dm MT4GyM9ZJnKkjuUvd10Qw1det10xBZKeL1+W4W+cyGQ4eeZMxU586EztgHQbths/kiBA XEUw== X-Gm-Message-State: AAQBX9dcRdHVO1ywNw3WN0BBm2b9pb0TA3FXhx8g4MhQmH/sZSGyr9kD rCKINlw2RUp2jHlFBZdzxYStf2xqF7xoYA== X-Google-Smtp-Source: AKy350YXGfiafMN/pyxkGmcrZ1CIIPBdDe2K8hC6zyQFiAv/VzcrWlDpAMG5bq1dFoT5uaS6N7ZMOg== X-Received: by 2002:ad4:5f05:0:b0:56e:fe99:b296 with SMTP id fo5-20020ad45f05000000b0056efe99b296mr1773320qvb.42.1679628027733; Thu, 23 Mar 2023 20:20:27 -0700 (PDT) Received: from hurd (dsl-155-54.b2b2c.ca. [66.158.155.54]) by smtp.gmail.com with ESMTPSA id ct10-20020a056214178a00b005dd8b9345e0sm367924qvb.120.2023.03.23.20.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Mar 2023 20:20:27 -0700 (PDT) From: Maxim Cournoyer References: <20230105121842.18662-1-ngraves@ngraves.fr> <20230105121842.18662-2-ngraves@ngraves.fr> Date: Thu, 23 Mar 2023 23:20:26 -0400 In-Reply-To: <20230105121842.18662-2-ngraves@ngraves.fr> (Nicolas Graves's message of "Thu, 5 Jan 2023 13:18:40 +0100") Message-ID: <87bkki3ked.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Nicolas Graves writes: > * gnu/packages/vulkan.scm (spirv-tools-for-skia): New variable. > --- > gnu/packages/vulkan.scm | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm > index 8895d8a5cf..231fa2e281 100644 > --- a/gnu/packages/vulkan.scm > +++ b/gnu/packages/vulkan.scm > @@ -120,6 +120,31 @@ (define-public spirv-tools > parser,disassembler, validator, and optimizer for SPIR-V.") > (license license:asl2.0))) > > +(define-public spirv-tools-for-skia Same comment as earlier. > + (let ((commit "4b092d2ab81854e61632bdd1e658907f0071c37e") > + (revision "0")) > + (package > + (inherit spirv-tools) > + (name "spirv-tools-for-skia") > + (version "skia") Same comment as earlier. > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0dqdybkxkwjiwwhxf0p3p1408wrqvwysymq7c9rzd1a2220y6lry")))) > + (inputs (list spirv-headers-for-skia)) > + (native-inputs (list pkg-config python-wrapper)) > + (arguments > + (list > + #:configure-flags `(list "-DBUILD_SHARED_LIBS=ON" > + (string-append > + "-DSPIRV-Headers_SOURCE_DIR=" > + (assoc-ref %build-inputs "spirv-headers-for-skia")))))))) Hm. If the base package used somethig like search-input-directory this could be avoided. -- Thanks, Maxim From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v2 1/4] gnu: Add spirv-headers-for-skia. References: <87pmbtfge5.fsf@ngraves.fr> In-Reply-To: <87pmbtfge5.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Aug 2023 12:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr, maxim.cournoyer@gmail.com Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169314084520135 (code B ref 60571); Sun, 27 Aug 2023 12:55:03 +0000 Received: (at 60571) by debbugs.gnu.org; 27 Aug 2023 12:54:05 +0000 Received: from localhost ([127.0.0.1]:44352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaFHI-0005Eb-To for submit@debbugs.gnu.org; Sun, 27 Aug 2023 08:54:05 -0400 Received: from 15.mo561.mail-out.ovh.net ([87.98.150.177]:54683) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaFHF-0005E3-8g for 60571@debbugs.gnu.org; Sun, 27 Aug 2023 08:54:03 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.20.204]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 28F2A23BDD for <60571@debbugs.gnu.org>; Sun, 27 Aug 2023 12:53:53 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-8mqlc (unknown [10.110.103.233]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DE93A1FE44; Sun, 27 Aug 2023 12:53:52 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-6684bf9d7b-8mqlc with ESMTPSA id 1LFbM2BH62S6nQAAD/NV9g (envelope-from ); Sun, 27 Aug 2023 12:53:52 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G006f107ef56-0615-4a96-ae45-2d3b92e2106d, B461FFA8E1F6BE32FDECEAF7525921981C04578F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Sun, 27 Aug 2023 14:53:39 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5143392253311836865 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudefvddgheelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfffhfeeileejueevleelueegteehkefffeetkeevleefkefgudffgeduhfelffehnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpghhoohhglhgvshhouhhrtggvrdgtohhmnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vulkan.scm (spirv-headers-for-skia): New variable. (%vulkan-sdk-skia-version): New variable. --- gnu/packages/vulkan.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1d2e58f1d4..da83417dba 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -46,6 +46,9 @@ (define-module (gnu packages vulkan) ;; Note: Remember to change vulkan-loader version when bumping this. (define %vulkan-sdk-version "sdk-1.3.231.1") +;; Note: The current skia version is lagging behind vulkan's. +;; Use this variable until it has catched up. +(define %vulkan-sdk-skia-version "sdk-1.2.198.0") (define-public spirv-headers (package @@ -79,6 +82,21 @@ (define-public spirv-headers (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/" version "/LICENSE"))))) +(define-public spirv-headers-for-skia + (package + (inherit spirv-headers) + (name "spirv-headers-for-skia") + (version %vulkan-sdk-skia-version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0v6ycgfxh9d2gzhxrnxgrn5gyg2cshg55767qdg46px8412j5lbi")))))) + (define-public spirv-tools (package (name "spirv-tools") base-commit: 5c1be661b988018e3de32a0ce529e1b58209ebb6 -- 2.41.0 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v2 2/4] gnu: Add spirv-tools-for-skia. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Aug 2023 12:55:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr, maxim.cournoyer@gmail.com Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169314085020171 (code B ref 60571); Sun, 27 Aug 2023 12:55:04 +0000 Received: (at 60571) by debbugs.gnu.org; 27 Aug 2023 12:54:10 +0000 Received: from localhost ([127.0.0.1]:44357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaFHN-0005FB-NW for submit@debbugs.gnu.org; Sun, 27 Aug 2023 08:54:10 -0400 Received: from 12.mo550.mail-out.ovh.net ([87.98.162.229]:59783) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaFHH-0005ER-NL for 60571@debbugs.gnu.org; Sun, 27 Aug 2023 08:54:05 -0400 Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.138.56]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 5EB0B24610 for <60571@debbugs.gnu.org>; Sun, 27 Aug 2023 12:53:54 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-8bmxv (unknown [10.110.103.73]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BF2B61FE53; Sun, 27 Aug 2023 12:53:53 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-6684bf9d7b-8bmxv with ESMTPSA id zm1yLGFH62QYIwAA2Tsk6g (envelope-from ); Sun, 27 Aug 2023 12:53:53 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G002e78d4d14-5b7e-4331-be72-ff053fb44f7b, B461FFA8E1F6BE32FDECEAF7525921981C04578F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Sun, 27 Aug 2023 14:53:40 +0200 Message-ID: <2d100ebb4760a7ff7c8cae0bf07176bbfae77b33.1693140822.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5143392251045864129 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudefvddgheekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepffeghfehveeuhfdvudeftefhhfeludeitdelvdeuhfehleeifeehheevveffffetnecuffhomhgrihhnpehgohhoghhlvghsohhurhgtvgdrtghomhdpghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedtheejudesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vulkan.scm (spirv-tools-for-skia): New variable. --- gnu/packages/vulkan.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index da83417dba..9f02b1d235 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -129,6 +129,29 @@ (define-public spirv-tools parser,disassembler, validator, and optimizer for SPIR-V.") (license license:asl2.0))) +(define-public spirv-tools-for-skia + (package + (inherit spirv-tools) + (name "spirv-tools-for-skia") + (version %vulkan-sdk-skia-version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cp1amgylflh36nw3sy0cy7pf9bhhzykk3vxqwmgnxiryr65nhph")))) + (inputs (list spirv-headers-for-skia)) + (native-inputs (list pkg-config python-wrapper)) + (arguments + (list + #:configure-flags `(list "-DBUILD_SHARED_LIBS=ON" + (string-append + "-DSPIRV-Headers_SOURCE_DIR=" + (assoc-ref %build-inputs "spirv-headers-for-skia"))))))) + (define-public spirv-cross (package (name "spirv-cross") -- 2.41.0 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v2 3/4] gnu: Add icu4c-for-skia. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Aug 2023 12:55:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr, maxim.cournoyer@gmail.com Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169314085020179 (code B ref 60571); Sun, 27 Aug 2023 12:55:04 +0000 Received: (at 60571) by debbugs.gnu.org; 27 Aug 2023 12:54:10 +0000 Received: from localhost ([127.0.0.1]:44359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaFHO-0005FI-72 for submit@debbugs.gnu.org; Sun, 27 Aug 2023 08:54:10 -0400 Received: from 17.mo584.mail-out.ovh.net ([46.105.41.16]:48791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaFHI-0005E7-3i for 60571@debbugs.gnu.org; Sun, 27 Aug 2023 08:54:06 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.138.76]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 9706723C2D for <60571@debbugs.gnu.org>; Sun, 27 Aug 2023 12:53:55 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-84g2d (unknown [10.108.20.53]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2E8AB1FE00; Sun, 27 Aug 2023 12:53:55 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-84g2d with ESMTPSA id 9qD8BmNH62RrbwAASGCVQA (envelope-from ); Sun, 27 Aug 2023 12:53:55 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0032a2caf4e-1325-48ac-9f9f-51b38234b767, B461FFA8E1F6BE32FDECEAF7525921981C04578F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Sun, 27 Aug 2023 14:53:41 +0200 Message-ID: <28d93ea0e4bda4dbbc9a653cfefb7e569b827ada.1693140822.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5143955200033743553 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudefvddgheekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhephfejueduiefhieejffekieehgeekkefgudfgudeltdfhffdvudeihffhhfejudetnecuffhomhgrihhnpehgohhoghhlvghsohhurhgtvgdrtghomhenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedtheejudesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/icu4c.scm (icu4c-for-skia): New variable. --- gnu/packages/icu4c.scm | 101 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index ba8b4915f2..eef8bd2cd3 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -27,14 +27,17 @@ (define-module (gnu packages icu4c) #:use-module (gnu packages) + #:use-module (gnu packages cpio) #:use-module (gnu packages java) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system ant) #:use-module (guix build-system gnu)) @@ -240,3 +243,101 @@ (define-public java-icu4j globalisation support for software applications. This package contains the Java part.") (license x11))) + +(define-public icu4c-for-skia + ;; The current version of skia needs commit-precise icu4c + ;; version for its test-dependencies. + (let ((commit "a0718d4f121727e30b8d52c7a189ebf5ab52421f") + (revision "0")) + (package + (inherit icu4c) + (name "icu4c-for-skia") + (version "skia") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/chromium/deps/icu.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qxws2p91f6dmhy7d3967r5ygz06r88pkmpm97px067x0zzdz384")))) + (native-inputs (list python cpio pkg-config)) + (arguments + (list + #:make-flags #~`(,(string-append "DESTDIR=" #$output)) + #:configure-flags #~'(;;"--enable-shared=no" "--enable-static=yes" + "--prefix=" "--exec-prefix=") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir-to-source + (lambda _ (chdir "source"))) + (replace 'configure + (lambda* (#:key inputs parallel-build? configure-flags #:allow-other-keys) + (let ((bash (search-input-file inputs "/bin/sh"))) + ;; Replace bash executable. + (setenv "CONFIG_SHELL" bash) + (substitute* "./configure" + (("`/bin/sh") + (string-append "`" bash))) + ;; Make the static library position-independent. + ;; (substitute* "./icudefs.mk.in" + ;; (("^CFLAGS = ") + ;; "CFLAGS = -fPIC ") + ;; (("^CXXFLAGS = ") + ;; "CXXFLAGS = -fPIC ")) + ;; Update runpath. + (substitute* "./icudefs.mk.in" + (("= -L\\$\\(LIBDIR\\)") + (string-append "= -L$(LIBDIR)" + " -Wl,-rpath=\"" #$output "/lib\""))) + ;; Set prefix and exec-prefix. + (substitute* "./runConfigureICU" + (("^OPTS=") + (string-append "OPTS=\"" + (string-join configure-flags " ") + "\""))) + ;; Configure. + (invoke "./runConfigureICU" "Linux/gcc" + "--disable-layout" "--disable-tests")))) + (add-after 'install 'configure-filtered-data + (lambda* (#:key make-flags configure-flags #:allow-other-keys) + ;; Cleanup. + (with-directory-excursion "data" + `(,invoke "make" "clean" ,@make-flags)) + ;; Set prefix and exec-prefix. + (substitute* "./runConfigureICU" + (("^OPTS=") + (string-append + "OPTS=\"" (string-join configure-flags " ") "\""))) + ;; Configure for common data. + (setenv "ICU_DATA_FILTER_FILE" + (string-append (getcwd) "/../filters/common.json")) + (invoke "./runConfigureICU" "Linux/gcc" + "--disable-layout" "--disable-tests"))) + (add-after 'configure-filtered-data 'build-filtered-data + (lambda* (#:key parallel-build? make-flags #:allow-other-keys) + (let ((job-count (if parallel-build? + (number->string (parallel-job-count)) + "1"))) + `(,invoke "make" "-j" ,job-count ,@make-flags) + (setenv "DESTDIR" #$output) + (invoke "bash" "../scripts/copy_data.sh" "common")))) + (add-after 'build-filtered-data 'install-scripts-and-data + (lambda _ + (let* ((share (string-append #$output "/share")) + (scripts (string-append share "/scripts")) + (data (string-append share "/data/common"))) + ;; Install scripts. + (mkdir-p scripts) + (copy-recursively "../scripts/" scripts) + ;; Install data. + (mkdir-p data) + (copy-recursively "./dataout/common/data/out/tmp" data) + (symlink (string-append data "/icudt69l.dat") + (string-append data "/icudtl.dat"))))) + (add-before 'check 'disable-failing-uconv-test + (lambda _ + (substitute* "extra/uconv/Makefile.in" + (("check: check-local") + "")))))))))) -- 2.41.0 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v2 4/4] gnu: skia: Activate tests. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Aug 2023 12:55:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr, maxim.cournoyer@gmail.com Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169314085120185 (code B ref 60571); Sun, 27 Aug 2023 12:55:05 +0000 Received: (at 60571) by debbugs.gnu.org; 27 Aug 2023 12:54:11 +0000 Received: from localhost ([127.0.0.1]:44361 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaFHO-0005FQ-OI for submit@debbugs.gnu.org; Sun, 27 Aug 2023 08:54:11 -0400 Received: from 12.mo550.mail-out.ovh.net ([87.98.162.229]:40167) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaFHJ-0005Eo-US for 60571@debbugs.gnu.org; Sun, 27 Aug 2023 08:54:07 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.143.146]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id B82CE24116 for <60571@debbugs.gnu.org>; Sun, 27 Aug 2023 12:53:56 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-t95hk (unknown [10.110.115.217]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 833121FD3A; Sun, 27 Aug 2023 12:53:56 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-t95hk with ESMTPSA id 7U2cGWRH62T4PCQAeioZ3w (envelope-from ); Sun, 27 Aug 2023 12:53:56 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G001e819284e-3773-47d2-97cf-dae277d72e33, B461FFA8E1F6BE32FDECEAF7525921981C04578F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Sun, 27 Aug 2023 14:53:42 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5144236677681570497 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudefvddgheekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhephfeikedvtdevveegieeigfelleeihedvgffhuedvveehffevkeeitedtuefhieetnecuffhomhgrihhnpehskhhirgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/graphics.scm (skia): Activate tests. --- gnu/packages/graphics.scm | 144 ++++++++++++++++++++++++++++++++++---- 1 file changed, 132 insertions(+), 12 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 2a94bd51cc..edb0e82a54 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -83,6 +83,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) @@ -2017,10 +2018,6 @@ (define-public skia (build-system gnu-build-system) ;actually GN + Ninja (arguments (list - ;; Running the test suite would require 'dm'; unfortunately the tool - ;; can only be built for debug builds, which require fetching third - ;; party sources. - #:tests? #f #:phases #~(modify-phases %standard-phases (replace 'configure @@ -2085,13 +2082,136 @@ (define-public skia URL: https://skia.org/ Version: ~a Libs: -L${libdir} -lskia -Cflags: -I${includedir}~%" #$output #$version)))))))) - (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper)) - (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib)) - (home-page "https://skia.org/") - (synopsis "2D graphics library") - (description - "Skia is a 2D graphics library for drawing text, geometries, and images. +Cflags: -I${includedir}~%" #$output #$version))))) + (replace 'check + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((icu #$(this-package-native-input "icu4c-for-skia"))) + ;; Configure SPIRV-Tools dependency. + (substitute* "BUILD.gn" + (("deps \\+= \\[ \"\\/\\/third_party\\/externals\\/spirv-tools:spvtools_val\" \\]") + "libs += [ \"SPIRV-Tools\" ]")) + (substitute* "src/sksl/SkSLCompiler.cpp" + (("\"spirv-tools/libspirv.hpp\"") + "")) + ;; Configure ICU dependency. + (substitute* "third_party/icu/BUILD.gn" + (("data_dir = \"\\.\\.\\/externals\\/icu\\/\"") + (string-append "data_dir = \"" icu "/share/data/\"")) + (("script = \"\\.\\.\\/externals\\/icu\\/scripts\\/") + (string-append "script = \"" icu "/share/scripts/")) + (("\\.\\.\\/externals\\/icu\\/common\\/icudtl.dat") + (string-append icu "/share/data/icudtl.dat")) + (("sources = icu_sources") + "") + (("sources \\+= \\[ \"\\$data_assembly\" \\]") + "sources = [ \"$data_assembly\" ]")) + ;; Enable system libraries without is_official_build=true. + ;; Necessary because is_official_build prevents building dm. + (for-each + (lambda (libname) + (let ((snake (string-join (string-split libname #\-) "_"))) + (substitute* + (string-append "third_party/" libname "/BUILD.gn") + (((string-append "skia_use_system_" + snake + " = is_official_build.*")) + (string-append "skia_use_system_" snake " = true"))))) + '("zlib" "libjpeg-turbo" "harfbuzz" "libpng" "libwebp")) + ;; Configure with gn. + (invoke "gn" "gen" "out/Debug" + (string-append + "--args=" + "cc=\"gcc\" " ;defaults to 'cc' + "skia_compile_sksl_tests=false " ; disable some tests + "skia_use_system_expat=true " ; use system expat library + ;; Specify where to locate the includes. + "extra_cflags=[" + (string-join + (map + (lambda (lib) + (string-append + "\"-I" + (search-input-directory + inputs + (string-append "include/" lib)) "\"")) + '("harfbuzz" + "freetype2" + "spirv-tools" + "spirv" + "unicode")) + ",") + "] " + ;; Otherwise the validate-runpath phase fails. + "extra_ldflags=[" + "\"-Wl,-rpath=" #$output "/lib\"" + "] " + ;; Disabled, otherwise the build system attempts to + ;; download the SDK at build time. + "skia_use_dng_sdk=false " + "skia_use_runtime_icu=true ")) + ;; Build dm testing tool. + (symlink + (string-append #$(this-package-native-input "gn") "/bin/gn") + "./bin/gn") + (invoke "ninja" "-C" "out/Debug" "dm") + ;; Test require an X server. + (let ((xvfb (search-input-file (or native-inputs inputs) + "bin/Xvfb")) + (display ":1")) + (setenv "DISPLAY" display) + (system (string-append xvfb " " display " &"))) + ;; Run tests. + (invoke "out/Debug/dm" "-v" + "-w" "dm_output" + "--codecWritePath" "dm_output" + "--simpleCodec" + "--skip" + ;; These tests fail with segmentation fault. + "_" "_" "_" "Codec_trunc" + "_" "_" "_" "AnimCodecPlayer" + "_" "_" "_" "Codec_partialAnim" + "_" "_" "_" "Codec_InvalidImages" + "_" "_" "_" "Codec_GifInterlacedTruncated" + "_" "_" "_" "SkText_UnicodeText_Flags" + "_" "_" "_" "SkParagraph_FontStyle" + "_" "_" "_" "flight_animated_image" + ;; These tests fail because of Codec/Sk failure. + "_" "_" "_" "AndroidCodec_computeSampleSize" + "_" "_" "_" "AnimatedImage_invalidCrop" + "_" "_" "_" "AnimatedImage_scaled" + "_" "_" "_" "AnimatedImage_copyOnWrite" + "_" "_" "_" "AnimatedImage" + "_" "_" "_" "BRD_types" + "_" "_" "_" "Codec_frames" + "_" "_" "_" "Codec_partial" + "_" "_" "_" "Codec_partialWuffs" + "_" "_" "_" "Codec_requiredFrame" + "_" "_" "_" "Codec_rewind" + "_" "_" "_" "Codec_incomplete" + "_" "_" "_" "Codec_InvalidAnimated" + "_" "_" "_" "Codec_ossfuzz6274" + "_" "_" "_" "Codec_gif_out_of_palette" + "_" "_" "_" "Codec_xOffsetTooBig" + "_" "_" "_" "Codec_gif" + "_" "_" "_" "Codec_skipFullParse" + "_" "_" "_" "AndroidCodec_animated_gif" + ;; Other failures + "_" "_" "_" "Gif" + "_" "_" "_" "Wuffs_seek_and_decode" + "_" "_" "_" "Skottie_Shaper_ExplicitFontMgr" + "8888" "skp" "_" "_" + "8888" "lottie" "_" "_" + "gl" "skp" "_" "_" + "gl" "lottie" "_" "_" + "_" "_" "_" "ES2BlendWithNoTexture"))))))) + (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper + spirv-tools-for-skia spirv-headers-for-skia + icu4c-for-skia glu xorg-server-for-tests)) + (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib)) + (home-page "https://skia.org/") + (synopsis "2D graphics library") + (description + "Skia is a 2D graphics library for drawing text, geometries, and images. It supports: @itemize @item 3x3 matrices with perspective @@ -2099,7 +2219,7 @@ (define-public skia @item shaders, xfermodes, maskfilters, patheffects @item subpixel text @end itemize") - (license license:bsd-3)))) + (license license:bsd-3)))) (define-public superfamiconv (package -- 2.41.0 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v2 1/4] gnu: Add spirv-headers-for-skia. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Aug 2023 15:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Graves Cc: 60571@debbugs.gnu.org Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.16932364791914 (code B ref 60571); Mon, 28 Aug 2023 15:28:02 +0000 Received: (at 60571) by debbugs.gnu.org; 28 Aug 2023 15:27:59 +0000 Received: from localhost ([127.0.0.1]:48799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qae9m-0000Uo-Jv for submit@debbugs.gnu.org; Mon, 28 Aug 2023 11:27:58 -0400 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:47508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qae9k-0000Ub-ET for 60571@debbugs.gnu.org; Mon, 28 Aug 2023 11:27:57 -0400 Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-76da239ba16so228882285a.3 for <60571@debbugs.gnu.org>; Mon, 28 Aug 2023 08:27:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693236464; x=1693841264; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=6i3B8CZVFE7tmg6y6khQC5nFkcIz0wYe+BCvWuOlDZY=; b=IgXfMkgFmWGopCgsX9yHwRREbdiqVojXRLJPCknqX4CPa/ZD16J1CzeifOfSoNhNrm gthxSZCFmu1Mni2wytkvZ4lOyDHWtIcKsDbgUN50TC4QmpiMi4ujyhLSlU+NDDtTAlL3 mUEgNsuW5URGmwJ649evR5miKqiA1IJcFkmlyhSqFqQlIIXt3W/H1YlKD8HVjnkkkahB hTFf+jGbj3nIy2+aCeascy0q1wKqr1dxbZ68XwqHGhPg6EIX5gMtSKx6tV/kWQv5Yr+P qXnXnqicS+AsvCBk4ghEfsgkcQ+LjRFLfthYKYqZJe9pbSE+4a9aWCs8l923BR9lNjtA UFGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693236464; x=1693841264; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6i3B8CZVFE7tmg6y6khQC5nFkcIz0wYe+BCvWuOlDZY=; b=fIuQf8tKl6ykZXrSF1WhWxJQtsCEw/RDJRp1VuKATbP5Oz4GT9EHcjPtpEISJKhti+ MvBQgw/0zYNFYiajY4/Lu9uDLvlXNzraSju7NkyVJ7jMw+w/hghB/5VOvYT4LnjeSZy6 2APTGVaIR9WUg8kkCYfERmhRB9fuGy4vKKex1r+On9lBgNV+Kn2Sj71bUYHGXDjJG/TQ HKK/dxTDRQzv5nZDLmZzVEWONqfOYb3YdkNWUoWxQFYV1at5zrjuH7eS9jFMLKVaUMPo 9pfnLpDmlpMlqCdSO1ZwnLOJfKuQsUHLnYSm5yKona515uSISkKsPkJqayhonk6s6HHX pJgQ== X-Gm-Message-State: AOJu0YwCY/ZFh7xyasfQ2lotctxWxouuHX20nMihH2/w6ckZGTYfOqdb ctgKuLzjSDZ5dBCM9zKVj7Jd+o9rJS8= X-Google-Smtp-Source: AGHT+IGvUs2UQRuHlV+zbDcIAXDE31aGn9r4ibpg8nc4MpnM0zyGVuapcWyWw1VU1veibo3Uub8h3w== X-Received: by 2002:ad4:4252:0:b0:647:2bd2:a49 with SMTP id l18-20020ad44252000000b006472bd20a49mr27019381qvq.39.1693236464091; Mon, 28 Aug 2023 08:27:44 -0700 (PDT) Received: from hurd (dsl-10-132-204.b2b2c.ca. [72.10.132.204]) by smtp.gmail.com with ESMTPSA id t18-20020a0cb712000000b0063f78bd525asm2630435qvd.144.2023.08.28.08.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Aug 2023 08:27:43 -0700 (PDT) From: Maxim Cournoyer References: Date: Mon, 28 Aug 2023 11:27:42 -0400 In-Reply-To: (Nicolas Graves's message of "Sun, 27 Aug 2023 14:53:39 +0200") Message-ID: <87edjngpap.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Nicolas Graves writes: > * gnu/packages/vulkan.scm (spirv-headers-for-skia): New variable. > (%vulkan-sdk-skia-version): New variable. > --- > gnu/packages/vulkan.scm | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm > index 1d2e58f1d4..da83417dba 100644 > --- a/gnu/packages/vulkan.scm > +++ b/gnu/packages/vulkan.scm > @@ -46,6 +46,9 @@ (define-module (gnu packages vulkan) > > ;; Note: Remember to change vulkan-loader version when bumping this. > (define %vulkan-sdk-version "sdk-1.3.231.1") > +;; Note: The current skia version is lagging behind vulkan's. > +;; Use this variable until it has catched up. "caught up". > +(define %vulkan-sdk-skia-version "sdk-1.2.198.0") > > (define-public spirv-headers > (package > @@ -79,6 +82,21 @@ (define-public spirv-headers > (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/" > version "/LICENSE"))))) > > +(define-public spirv-headers-for-skia > + (package > + (inherit spirv-headers) > + (name "spirv-headers-for-skia") > + (version %vulkan-sdk-skia-version) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git") > + (commit version))) This like busts the 80 characters limit. You can break it with a backslash (\) followed by a newline, e.g. --8<---------------cut here---------------start------------->8--- (url "https://skia.googlesource.com/external/github.com\ /KhronosGroup/SPIRV-Headers.git") --8<---------------cut here---------------end--------------->8--- I think 'guix lint' warns about this. -- Thanks, Maxim From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v2 2/4] gnu: Add spirv-tools-for-skia. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Aug 2023 15:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Graves Cc: 60571@debbugs.gnu.org Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.16932365872106 (code B ref 60571); Mon, 28 Aug 2023 15:30:02 +0000 Received: (at 60571) by debbugs.gnu.org; 28 Aug 2023 15:29:47 +0000 Received: from localhost ([127.0.0.1]:48804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaeBX-0000Xu-5L for submit@debbugs.gnu.org; Mon, 28 Aug 2023 11:29:47 -0400 Received: from mail-ua1-x92a.google.com ([2607:f8b0:4864:20::92a]:53516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaeBU-0000Xg-Hl for 60571@debbugs.gnu.org; Mon, 28 Aug 2023 11:29:45 -0400 Received: by mail-ua1-x92a.google.com with SMTP id a1e0cc1a2514c-7a4f1e199beso320749241.3 for <60571@debbugs.gnu.org>; Mon, 28 Aug 2023 08:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693236572; x=1693841372; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Z6BIFt3qvpMI1iB/U/hMWG1asE9L6xZm62Fyo8AgPr0=; b=Q1HJdSua6Hx1BuZwPpk20J/2MbtfpnpyOSJYWC1eOVhhV8HfsbrriiYeSNvF1Kx/GN XvmdAtvuP9vwL1sr8j3CPAVS/5vXbwTig5wnjTF8Tr+ZWcyfKKu24z8bimvcYWLnP7bH Ze3xZ6geAdKKYVsY6KwgHHPtCiDGSkKcdwi4809ziRZFCu9lNUNLc9QM2HnmD8OdrxHn e5MBqq+GYX2fYJPzUBEz5db284qd1Y9yea66lXCcOOlxfnXJMZDu887SVMVR3tPmWyD8 BBtqE7YkHwyktYFhE4hQVr+2VeVslm0xagQWkXPf1B0m8RGUzk43GP/TFeBVgd5rk6ks rC0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693236572; x=1693841372; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Z6BIFt3qvpMI1iB/U/hMWG1asE9L6xZm62Fyo8AgPr0=; b=CM1EDUfa1ITHse6LJDc0Ce+c+473sOlMKubinm8UkZ9TbW5KG32JrqxCLk0yJNAByZ 7hlKc1NT31F/MVsSVS45bUUfnKGOFCqVmuvsQphcP6H4W8Rot4bQ0lGe2rfxjfCxPDIk GPuH8BNJs0emGpEU/Qn3uqs7pMWA38QFRlIc2gnuUDdy/3XX9bfr0JHM1nF3tgsextmQ 7wJeQl434XM8guX+CNbjmPioGE9/PV6leoCFXDltyJ6iiqoXxrqpcLyWhXr7bxBJccHl 6Srotb01/H8503qmB8VMBis4CrKlBCZKPfpo7NXIxlTDQooAuR8A/4KyzDvHeMh6/zCV 76ow== X-Gm-Message-State: AOJu0YzvoAJmnGZm8sW+FKNuGW7DlE8s52Yf4vTEtYk4vPBgfIl8iLrr GX0bC3tNvGCeXjCc9eeVOq2nuGgr6FU= X-Google-Smtp-Source: AGHT+IHJ3ma5PVY49KN77gjiZX9O6ruOOMF+3s4/Z0EAkKgUZW0JxWBBEfacvGQXYsjpEOHy9otBVg== X-Received: by 2002:a67:f98d:0:b0:44d:4d7f:bcc2 with SMTP id b13-20020a67f98d000000b0044d4d7fbcc2mr19778750vsq.12.1693236572026; Mon, 28 Aug 2023 08:29:32 -0700 (PDT) Received: from hurd (dsl-10-132-204.b2b2c.ca. [72.10.132.204]) by smtp.gmail.com with ESMTPSA id x10-20020a0ce24a000000b006263a9e7c63sm2586678qvl.104.2023.08.28.08.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Aug 2023 08:29:31 -0700 (PDT) From: Maxim Cournoyer References: <2d100ebb4760a7ff7c8cae0bf07176bbfae77b33.1693140822.git.ngraves@ngraves.fr> Date: Mon, 28 Aug 2023 11:29:30 -0400 In-Reply-To: <2d100ebb4760a7ff7c8cae0bf07176bbfae77b33.1693140822.git.ngraves@ngraves.fr> (Nicolas Graves's message of "Sun, 27 Aug 2023 14:53:40 +0200") Message-ID: <87a5ubgp7p.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Nicolas Graves writes: > * gnu/packages/vulkan.scm (spirv-tools-for-skia): New variable. > --- > gnu/packages/vulkan.scm | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm > index da83417dba..9f02b1d235 100644 > --- a/gnu/packages/vulkan.scm > +++ b/gnu/packages/vulkan.scm > @@ -129,6 +129,29 @@ (define-public spirv-tools > parser,disassembler, validator, and optimizer for SPIR-V.") > (license license:asl2.0))) > > +(define-public spirv-tools-for-skia > + (package > + (inherit spirv-tools) > + (name "spirv-tools-for-skia") > + (version %vulkan-sdk-skia-version) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git") Same line length comment as previously. > + (commit version))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0cp1amgylflh36nw3sy0cy7pf9bhhzykk3vxqwmgnxiryr65nhph")))) > + (inputs (list spirv-headers-for-skia)) > + (native-inputs (list pkg-config python-wrapper)) > + (arguments > + (list > + #:configure-flags `(list "-DBUILD_SHARED_LIBS=ON" > + (string-append > + "-DSPIRV-Headers_SOURCE_DIR=" > + (assoc-ref %build-inputs "spirv-headers-for-skia"))))))) The configure-flags should use a gexp #~(list ...) in which you can then use #$(this-package-native-input "spirv-headers-for-skia"). -- Thanks, Maxim From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v2 3/4] gnu: Add icu4c-for-skia. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Aug 2023 15:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Graves Cc: 60571@debbugs.gnu.org Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.16932377134396 (code B ref 60571); Mon, 28 Aug 2023 15:49:01 +0000 Received: (at 60571) by debbugs.gnu.org; 28 Aug 2023 15:48:33 +0000 Received: from localhost ([127.0.0.1]:48830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaeTg-00018m-HA for submit@debbugs.gnu.org; Mon, 28 Aug 2023 11:48:33 -0400 Received: from mail-oi1-x233.google.com ([2607:f8b0:4864:20::233]:49191) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaeTe-00017y-FL for 60571@debbugs.gnu.org; Mon, 28 Aug 2023 11:48:31 -0400 Received: by mail-oi1-x233.google.com with SMTP id 5614622812f47-3a85b1b7574so2398326b6e.2 for <60571@debbugs.gnu.org>; Mon, 28 Aug 2023 08:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693237698; x=1693842498; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=WrEUEE4BszyllQUtOv0Lo1rJLaAwMp0xG4pWfEOpqPg=; b=pIqpPg9ueXIG7qXpSeLAYRbsuFvpSilW35X4WfahVIE5K0Og/f6O4p0CjkL7/WbLoc WZlrBmxazGW2llFoNLuzpjq8e5n5mWyZro0uJpVxUnz0Wd2d4cpt1lvJeyKiV9xzpHyl 07A4ppbQjfjsR5dejaYjSt0wdoA8+78ULJUK/9ff4tAwvwGpt6I96UWk+v3p5cpPGI+R ISvK/sYVYUc0CH/4iSroR4hYpkbyZoTN+JibG/P5mG+7VNjYdhzE/KWsu4fscS+7uIPN z6LVeMWQCAAgKlSOMZyADMqfPOPeHUQ8swFUXvyUqQM2I2g6OuRaiyiLkx7AoiPw9JEu Qkiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693237698; x=1693842498; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WrEUEE4BszyllQUtOv0Lo1rJLaAwMp0xG4pWfEOpqPg=; b=LTlKOpyMu/Iduc5gv6NOWi1dXMGb4XyveRYynTp6CSHxbEOPtetDztegxrlh9ciO/A 2XBVPbP1HjNUx8tdgt3UitCt9WaJMPtGoOvpo77Qv6xiVaEznWY2fUq94dwIWj8SLzNs 3RldNumZXJPOthTp7aWJ/KNwrUywv10EBLxVMt82UDv7/qOS1B6NJqDWAs/dlOZJaEBH i9byVw8t4wGUYd1AqKeAbPFGvbKWDAKp99kUNWPyO2AhCBqjvmpc+/Sq8362Nzyb/ykB /tfcEZF1gMJo5sGiTdf/XnrfjzL99BfjEfR1xltIrwCEdhfGGAyJ7nSQ5rHXDH7mKFSq SbxA== X-Gm-Message-State: AOJu0Yz607wdlDVgGU11tgbyydILIxZdUG98JS3iYXL14oq2wbFDE5bZ FW/4XfHgG9kugyh743ZD66NMFMtt23U= X-Google-Smtp-Source: AGHT+IHBWv2agMGMsJ9D5B1YgMOj1cHfdF5iPD1JQBEwyfVZIW6HwkKZTMLdfjhFAwKF4u4FQJBRCg== X-Received: by 2002:a05:6358:2806:b0:139:9dda:8344 with SMTP id k6-20020a056358280600b001399dda8344mr29569056rwb.19.1693237696296; Mon, 28 Aug 2023 08:48:16 -0700 (PDT) Received: from hurd (dsl-10-132-204.b2b2c.ca. [72.10.132.204]) by smtp.gmail.com with ESMTPSA id r8-20020ac85e88000000b0040ff1b4b400sm2385022qtx.73.2023.08.28.08.48.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Aug 2023 08:48:15 -0700 (PDT) From: Maxim Cournoyer References: <28d93ea0e4bda4dbbc9a653cfefb7e569b827ada.1693140822.git.ngraves@ngraves.fr> Date: Mon, 28 Aug 2023 11:48:14 -0400 In-Reply-To: <28d93ea0e4bda4dbbc9a653cfefb7e569b827ada.1693140822.git.ngraves@ngraves.fr> (Nicolas Graves's message of "Sun, 27 Aug 2023 14:53:41 +0200") Message-ID: <874jkjgoch.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello! Nicolas Graves writes: > * gnu/packages/icu4c.scm (icu4c-for-skia): New variable. > --- > gnu/packages/icu4c.scm | 101 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 101 insertions(+) > > diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm > index ba8b4915f2..eef8bd2cd3 100644 > --- a/gnu/packages/icu4c.scm > +++ b/gnu/packages/icu4c.scm > @@ -27,14 +27,17 @@ > > (define-module (gnu packages icu4c) > #:use-module (gnu packages) > + #:use-module (gnu packages cpio) > #:use-module (gnu packages java) > #:use-module (gnu packages perl) > + #:use-module (gnu packages pkg-config) > #:use-module (gnu packages python) > #:use-module (guix gexp) > #:use-module (guix licenses) > #:use-module (guix packages) > #:use-module (guix utils) > #:use-module (guix download) > + #:use-module (guix git-download) > #:use-module (guix build-system ant) > #:use-module (guix build-system gnu)) > > @@ -240,3 +243,101 @@ (define-public java-icu4j > globalisation support for software applications. This package contains the > Java part.") > (license x11))) > + > +(define-public icu4c-for-skia > + ;; The current version of skia needs commit-precise icu4c > + ;; version for its test-dependencies. I'd reword to use "needs this exact commit". Also, s/test-dependencies/test dependencies/ (no hyphen). > + (let ((commit "a0718d4f121727e30b8d52c7a189ebf5ab52421f") > + (revision "0")) > + (package > + (inherit icu4c) > + (name "icu4c-for-skia") > + (version "skia") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://chromium.googlesource.com/chromium/deps/icu.git") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "1qxws2p91f6dmhy7d3967r5ygz06r88pkmpm97px067x0zzdz384")))) > + (native-inputs (list python cpio pkg-config)) nitpick: Conventionally, it's more common to put the inputs after the arguments fields. > + (arguments > + (list > + #:make-flags #~`(,(string-append "DESTDIR=" #$output)) It'd be more readable to use the simpler #~(list (string-append ...)). > + #:configure-flags #~'(;;"--enable-shared=no" "--enable-static=yes" > + "--prefix=" "--exec-prefix=") Please drop the dead code (;; ...). > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'chdir-to-source > + (lambda _ (chdir "source"))) > + (replace 'configure > + (lambda* (#:key inputs parallel-build? configure-flags #:allow-other-keys) Too long of a line; you can but #:allow-other-keys on its own line. > + (let ((bash (search-input-file inputs "/bin/sh"))) > + ;; Replace bash executable. > + (setenv "CONFIG_SHELL" bash) > + (substitute* "./configure" > + (("`/bin/sh") > + (string-append "`" bash))) Is just setting CONFIG_SHELL not enough? Since '/bin/sh' here is used strictly at build time (in the configure script), you can use simply (which "sh") in your substitution. Otherwise you'd have to (search-input-file (or native-inputs inputs) ...) to not break cross-compilation. > + ;; Make the static library position-independent. > + ;; (substitute* "./icudefs.mk.in" > + ;; (("^CFLAGS = ") > + ;; "CFLAGS = -fPIC ") > + ;; (("^CXXFLAGS = ") > + ;; "CXXFLAGS = -fPIC ")) All commented out? Drop unless needed. > + ;; Update runpath. The comments are a bit terse; I'd expound them to complete sentences with a tad more context. > + (substitute* "./icudefs.mk.in" > + (("= -L\\$\\(LIBDIR\\)") > + (string-append "= -L$(LIBDIR)" > + " -Wl,-rpath=\"" #$output "/lib\""))) > + ;; Set prefix and exec-prefix. > + (substitute* "./runConfigureICU" > + (("^OPTS=") > + (string-append "OPTS=\"" > + (string-join configure-flags " ") > + "\""))) > + ;; Configure. > + (invoke "./runConfigureICU" "Linux/gcc" > + "--disable-layout" "--disable-tests")))) > + (add-after 'install 'configure-filtered-data > + (lambda* (#:key make-flags configure-flags #:allow-other-keys) > + ;; Cleanup. Ditto. > + (with-directory-excursion "data" > + `(,invoke "make" "clean" ,@make-flags)) It'd be cleaner to use 'apply' here, e.g. (apply invoke "make" "clean" make-flags) > + ;; Set prefix and exec-prefix. > + (substitute* "./runConfigureICU" > + (("^OPTS=") > + (string-append > + "OPTS=\"" (string-join configure-flags " ") "\""))) Mentioning in passage, you could also use (format #f "OPTS=\"~a\"" (string-join ...)), or even the more advanced (ice-9 format). > + ;; Configure for common data. > + (setenv "ICU_DATA_FILTER_FILE" > + (string-append (getcwd) "/../filters/common.json")) > + (invoke "./runConfigureICU" "Linux/gcc" > + "--disable-layout" "--disable-tests"))) I'm confused here; we re-run the configure script post installation? How does that work? If that's really needed it needs a proper explanatory comment. > + (add-after 'configure-filtered-data 'build-filtered-data > + (lambda* (#:key parallel-build? make-flags #:allow-other-keys) > + (let ((job-count (if parallel-build? > + (number->string (parallel-job-count)) > + "1"))) > + `(,invoke "make" "-j" ,job-count ,@make-flags) Please use 'apply', as explained above. > + (setenv "DESTDIR" #$output) > + (invoke "bash" "../scripts/copy_data.sh" "common")))) > + (add-after 'build-filtered-data 'install-scripts-and-data > + (lambda _ > + (let* ((share (string-append #$output "/share")) > + (scripts (string-append share "/scripts")) > + (data (string-append share "/data/common"))) > + ;; Install scripts. > + (mkdir-p scripts) > + (copy-recursively "../scripts/" scripts) > + ;; Install data. > + (mkdir-p data) > + (copy-recursively "./dataout/common/data/out/tmp" data) > + (symlink (string-append data "/icudt69l.dat") > + (string-append data "/icudtl.dat"))))) > + (add-before 'check 'disable-failing-uconv-test > + (lambda _ > + (substitute* "extra/uconv/Makefile.in" > + (("check: check-local") > + "")))))))))) The rest looks good! It's seems a tricky package, well done! Could you please send a v2 with the above suggestions/comments taken into account? -- Thanks, Maxim From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v2 4/4] gnu: skia: Activate tests. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Aug 2023 15:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Graves Cc: 60571@debbugs.gnu.org Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.16932383405431 (code B ref 60571); Mon, 28 Aug 2023 15:59:01 +0000 Received: (at 60571) by debbugs.gnu.org; 28 Aug 2023 15:59:00 +0000 Received: from localhost ([127.0.0.1]:48835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaedo-0001PW-27 for submit@debbugs.gnu.org; Mon, 28 Aug 2023 11:59:00 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:62886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaedl-0001PH-Hr for 60571@debbugs.gnu.org; Mon, 28 Aug 2023 11:58:58 -0400 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-76da819edc7so183213485a.1 for <60571@debbugs.gnu.org>; Mon, 28 Aug 2023 08:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693238325; x=1693843125; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=wxDN7X7Il1IAV3LRKPDI9KygPQ45PHE9LQhV/JqBX1k=; b=SUn0wLVjKJwvrn9rXqMfE9oa4iFhrZJ6ebm/VSwvFa0vAPsEUfQR6JB80S8KGG8PPW +oUetukeZSUBQbUy5BXR/o3m/hG60/EGWxiJsdzemFPE2s8nUQ3JlxV5smVTtYitMdi3 5glkVosiZQVfmntcmL77epxMH2KEwbudxh1WRWKaJJdaMoxbEi1n5wcMTNAU0hU7DBBX s25Z4VA4w8jQs3z10gkz8AO3A/iZU6aDSUs0c0td8fTyBUKWLpIp14qXgKbIYo5nnb3Z CqZV+Ntqff0/FUqAzUcjJKXoc6yqTPSuUJ33YDnFMxjPTzjbTxFzRoqcKNTVv3rp+yAu W9xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693238325; x=1693843125; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wxDN7X7Il1IAV3LRKPDI9KygPQ45PHE9LQhV/JqBX1k=; b=WoRZio3KI4SgY+qemywzY7aqkuR+KkSoFClKN2+SDNaM4pH6gsKtLvhZCrGsIrtOPh JeiMm6gxsMqpdQ9fEGI0YQxmfhVsn+Bh4chtOQy2jqgiYG9lHU6yrKD9LJ8w7E0VS1f/ G9eZ6cTN+Yttri4bl6BabfmZLkLiYtihrvxJsntCJ4AM013kuXyVXqPPg07ue6vH6nX2 BQ+I/w+hsx6W/ku/0XbM2s9Ttm31MNhMjeSeVHqwUYNn7fv2ZZzGKDnnz4fRzYphQn7J 2bYV9hICNZo2N6sz6Cd49oVlriJmEx2wKpUSI6bWedCkpjp/xTFy/XK6cFcRvrZ4achj omeg== X-Gm-Message-State: AOJu0YzJWJ0KC3jRpyXK7pg2xhoiAe+20Y+/BSxtPEcWN0jC1fWxJKL+ Ii4obDHbw6jwJQ5nvACyo6uq3DU9XN8= X-Google-Smtp-Source: AGHT+IFB6aPWRrSmo/17T49jzT0hWsq7HMwbWKbujW1gA7NZXvFlkHWPKFqpfpwph9fmwsCmgx4aMg== X-Received: by 2002:a05:620a:4607:b0:76c:cd15:a8b5 with SMTP id br7-20020a05620a460700b0076ccd15a8b5mr21713qkb.21.1693238325048; Mon, 28 Aug 2023 08:58:45 -0700 (PDT) Received: from hurd (dsl-10-132-204.b2b2c.ca. [72.10.132.204]) by smtp.gmail.com with ESMTPSA id d15-20020a05620a140f00b007671678e325sm2450104qkj.88.2023.08.28.08.58.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Aug 2023 08:58:44 -0700 (PDT) From: Maxim Cournoyer References: Date: Mon, 28 Aug 2023 11:58:43 -0400 In-Reply-To: (Nicolas Graves's message of "Sun, 27 Aug 2023 14:53:42 +0200") Message-ID: <87zg2bf9ak.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Nicolas Graves writes: > * gnu/packages/graphics.scm (skia): Activate tests. Neat! > --- > gnu/packages/graphics.scm | 144 ++++++++++++++++++++++++++++++++++---- > 1 file changed, 132 insertions(+), 12 deletions(-) > > diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm > index 2a94bd51cc..edb0e82a54 100644 > --- a/gnu/packages/graphics.scm > +++ b/gnu/packages/graphics.scm > @@ -83,6 +83,7 @@ (define-module (gnu packages graphics) > #:use-module (gnu packages gstreamer) > #:use-module (gnu packages gtk) > #:use-module (gnu packages haskell-xyz) > + #:use-module (gnu packages icu4c) > #:use-module (gnu packages image) > #:use-module (gnu packages image-processing) > #:use-module (gnu packages imagemagick) > @@ -2017,10 +2018,6 @@ (define-public skia > (build-system gnu-build-system) ;actually GN + Ninja > (arguments > (list > - ;; Running the test suite would require 'dm'; unfortunately the tool > - ;; can only be built for debug builds, which require fetching third > - ;; party sources. > - #:tests? #f > #:phases > #~(modify-phases %standard-phases > (replace 'configure > @@ -2085,13 +2082,136 @@ (define-public skia > URL: https://skia.org/ > Version: ~a > Libs: -L${libdir} -lskia > -Cflags: -I${includedir}~%" #$output #$version)))))))) > - (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper)) > - (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib)) > - (home-page "https://skia.org/") > - (synopsis "2D graphics library") > - (description > - "Skia is a 2D graphics library for drawing text, geometries, and images. > +Cflags: -I${includedir}~%" #$output #$version))))) > + (replace 'check > + (lambda* (#:key inputs native-inputs #:allow-other-keys) > + (let ((icu #$(this-package-native-input "icu4c-for-skia"))) > + ;; Configure SPIRV-Tools dependency. I think what this does is to unbundle these from the source? If that's the case, the comment should explicit that. > + (substitute* "BUILD.gn" > + (("deps \\+= \\[ \"\\/\\/third_party\\/externals\\/spirv-tools:spvtools_val\" \\]") > + "libs += [ \"SPIRV-Tools\" ]")) > + (substitute* "src/sksl/SkSLCompiler.cpp" > + (("\"spirv-tools/libspirv.hpp\"") > + "")) > + ;; Configure ICU dependency. > + (substitute* "third_party/icu/BUILD.gn" > + (("data_dir = \"\\.\\.\\/externals\\/icu\\/\"") > + (string-append "data_dir = \"" icu "/share/data/\"")) > + (("script = \"\\.\\.\\/externals\\/icu\\/scripts\\/") > + (string-append "script = \"" icu "/share/scripts/")) > + (("\\.\\.\\/externals\\/icu\\/common\\/icudtl.dat") > + (string-append icu "/share/data/icudtl.dat")) > + (("sources = icu_sources") > + "") > + (("sources \\+= \\[ \"\\$data_assembly\" \\]") > + "sources = [ \"$data_assembly\" ]")) The forward slashes (/) do not need to be escaped for ERE regexps, which is what Guile uses. This will help keep your above regexps more readable. > + ;; Enable system libraries without is_official_build=true. > + ;; Necessary because is_official_build prevents building dm. Please try to keep your comments full sentences, e.g. "This is necessary because ...". It may be a bit more efforts, but this effort pays off for the next human who'll read these :-). > + (for-each > + (lambda (libname) > + (let ((snake (string-join (string-split libname #\-) "_"))) > + (substitute* > + (string-append "third_party/" libname "/BUILD.gn") > + (((string-append "skia_use_system_" > + snake > + " = is_official_build.*")) > + (string-append "skia_use_system_" snake " = true"))))) > + '("zlib" "libjpeg-turbo" "harfbuzz" "libpng" "libwebp")) > + ;; Configure with gn. > + (invoke "gn" "gen" "out/Debug" > + (string-append > + "--args=" > + "cc=\"gcc\" " ;defaults to 'cc' > + "skia_compile_sksl_tests=false " ; disable some tests > + "skia_use_system_expat=true " ; use system expat library > + ;; Specify where to locate the includes. > + "extra_cflags=[" > + (string-join > + (map > + (lambda (lib) > + (string-append > + "\"-I" > + (search-input-directory > + inputs > + (string-append "include/" lib)) "\"")) > + '("harfbuzz" > + "freetype2" > + "spirv-tools" > + "spirv" > + "unicode")) > + ",") > + "] " > + ;; Otherwise the validate-runpath phase fails. > + "extra_ldflags=[" > + "\"-Wl,-rpath=" #$output "/lib\"" > + "] " > + ;; Disabled, otherwise the build system attempts to > + ;; download the SDK at build time. > + "skia_use_dng_sdk=false " > + "skia_use_runtime_icu=true ")) > + ;; Build dm testing tool. > + (symlink > + (string-append #$(this-package-native-input "gn") "/bin/gn") > + "./bin/gn") > + (invoke "ninja" "-C" "out/Debug" "dm") > + ;; Test require an X server. "The test suite requires ..." > + (let ((xvfb (search-input-file (or native-inputs inputs) > + "bin/Xvfb")) > + (display ":1")) > + (setenv "DISPLAY" display) > + (system (string-append xvfb " " display " &"))) > + ;; Run tests. > + (invoke "out/Debug/dm" "-v" > + "-w" "dm_output" > + "--codecWritePath" "dm_output" > + "--simpleCodec" > + "--skip" > + ;; These tests fail with segmentation fault. Upstream may be interested to know/have a solution. I'd try submitting a ticket to them, and link it here for future reference. > + "_" "_" "_" "Codec_trunc" > + "_" "_" "_" "AnimCodecPlayer" > + "_" "_" "_" "Codec_partialAnim" > + "_" "_" "_" "Codec_InvalidImages" > + "_" "_" "_" "Codec_GifInterlacedTruncated" > + "_" "_" "_" "SkText_UnicodeText_Flags" > + "_" "_" "_" "SkParagraph_FontStyle" > + "_" "_" "_" "flight_animated_image" What are these underscores? I don't know the 'dm' tool; a comment would be nice. > + ;; These tests fail because of Codec/Sk failure. > + "_" "_" "_" "AndroidCodec_computeSampleSize" > + "_" "_" "_" "AnimatedImage_invalidCrop" > + "_" "_" "_" "AnimatedImage_scaled" > + "_" "_" "_" "AnimatedImage_copyOnWrite" > + "_" "_" "_" "AnimatedImage" > + "_" "_" "_" "BRD_types" > + "_" "_" "_" "Codec_frames" > + "_" "_" "_" "Codec_partial" > + "_" "_" "_" "Codec_partialWuffs" > + "_" "_" "_" "Codec_requiredFrame" > + "_" "_" "_" "Codec_rewind" > + "_" "_" "_" "Codec_incomplete" > + "_" "_" "_" "Codec_InvalidAnimated" > + "_" "_" "_" "Codec_ossfuzz6274" > + "_" "_" "_" "Codec_gif_out_of_palette" > + "_" "_" "_" "Codec_xOffsetTooBig" > + "_" "_" "_" "Codec_gif" > + "_" "_" "_" "Codec_skipFullParse" > + "_" "_" "_" "AndroidCodec_animated_gif" > + ;; Other failures "These fail for unknown reasons". It's typically nice to forward these failures to upstream with the ticket URL referenced here. Often upstream can help explain them or find solutions. > + "_" "_" "_" "Gif" > + "_" "_" "_" "Wuffs_seek_and_decode" > + "_" "_" "_" "Skottie_Shaper_ExplicitFontMgr" > + "8888" "skp" "_" "_" > + "8888" "lottie" "_" "_" > + "gl" "skp" "_" "_" > + "gl" "lottie" "_" "_" > + "_" "_" "_" "ES2BlendWithNoTexture"))))))) > + (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper > + spirv-tools-for-skia spirv-headers-for-skia > + icu4c-for-skia glu xorg-server-for-tests)) > + (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib)) > + (home-page "https://skia.org/") > + (synopsis "2D graphics library") > + (description > + "Skia is a 2D graphics library for drawing text, geometries, and images. > It supports: > @itemize > @item 3x3 matrices with perspective > @@ -2099,7 +2219,7 @@ (define-public skia > @item shaders, xfermodes, maskfilters, patheffects > @item subpixel text > @end itemize") > - (license license:bsd-3)))) > + (license license:bsd-3)))) Wooh! That must have taken some time to refine! Thanks a lot for the efforts! I think with the suggestions made above, a v3 would be ready to roll. -- Thanks, Maxim From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v2 3/4] gnu: Add icu4c-for-skia. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Aug 2023 13:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 60571@debbugs.gnu.org Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169331628318431 (code B ref 60571); Tue, 29 Aug 2023 13:39:02 +0000 Received: (at 60571) by debbugs.gnu.org; 29 Aug 2023 13:38:03 +0000 Received: from localhost ([127.0.0.1]:49880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qayux-0004nD-JE for submit@debbugs.gnu.org; Tue, 29 Aug 2023 09:38:03 -0400 Received: from 16.mo550.mail-out.ovh.net ([178.33.104.224]:34777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qayus-0004mi-Lv for 60571@debbugs.gnu.org; Tue, 29 Aug 2023 09:38:02 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.16.43]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 9958B2592A for <60571@debbugs.gnu.org>; Tue, 29 Aug 2023 13:37:49 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-wd6g8 (unknown [10.110.171.117]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 315B21FE07; Tue, 29 Aug 2023 13:37:49 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-6684bf9d7b-wd6g8 with ESMTPSA id yFUUCa307WRKDAAAMskE5A (envelope-from ); Tue, 29 Aug 2023 13:37:49 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R006382a0931-297f-4437-885d-061d30e78ea5, 695B107701F98D61E4548ACF4F2C04F65A801990) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves In-Reply-To: <874jkjgoch.fsf@gmail.com> References: <28d93ea0e4bda4dbbc9a653cfefb7e569b827ada.1693140822.git.ngraves@ngraves.fr> <874jkjgoch.fsf@gmail.com> Date: Tue, 29 Aug 2023 15:37:48 +0200 Message-ID: <87ledunf4j.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 17630748120055079433 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudefiedgieeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvvefujghffffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepveekleeujedthefgffekleekhffhffetgfdvheekleeuhfehueeljedtjefhvdfgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2023-08-28 11:48, Maxim Cournoyer wrote: > Hello! > > Nicolas Graves writes: > > > The comments are a bit terse; I'd expound them to complete sentences > with a tad more context. Will try to expand a bit, but that will be hard, the commits are very old and my memory of this mostly faded. > > I'm confused here; we re-run the configure script post installation? > How does that work? If that's really needed it needs a proper > explanatory comment. IIRC, since we use this version of icu4c to run tests, we needed to also build some "data". It's rather a reconfiguration to build data rather than a re-run of the configuration script post-installation. > > The rest looks good! It's seems a tricky package, well done! Could you > please send a v2 with the above suggestions/comments taken into account? Doing so -- Best regards, Nicolas Graves From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v2 3/4] gnu: Add icu4c-for-skia. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Aug 2023 14:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Graves Cc: 60571@debbugs.gnu.org Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.16933203825730 (code B ref 60571); Tue, 29 Aug 2023 14:47:01 +0000 Received: (at 60571) by debbugs.gnu.org; 29 Aug 2023 14:46:22 +0000 Received: from localhost ([127.0.0.1]:51368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qazz3-0001UL-Jk for submit@debbugs.gnu.org; Tue, 29 Aug 2023 10:46:21 -0400 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:62683) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qazz1-0001U8-Ev for 60571@debbugs.gnu.org; Tue, 29 Aug 2023 10:46:20 -0400 Received: by mail-qt1-x82a.google.com with SMTP id d75a77b69052e-4121788397fso14105951cf.0 for <60571@debbugs.gnu.org>; Tue, 29 Aug 2023 07:46:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693320366; x=1693925166; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=w/gA6EWjgiuYunNR2IOlVdMPunpPG1QvMhaYhtIOPGM=; b=OX565VjwxMh36uUFcFtU9+fh5RwSH971XEaFIAU/YKKPzIdcnwD0E6ixPHX6b8NwPq sCUD466paega/FwNMKNpjJ8fyfCVUK9ldpeUblGbdd6i5ik+1hATCY7pYsi8j520JkCy Ngqdj8q4QVTKyh4A9nGafRBlS/ZfI22DTyGC1qDOmlxFJB7tryexXeg1K6bRiGgc9QTo D1oj6OvWeW//nF2mW/DL7GiOEw8zAJxvVgPnqwTIx6FKXxHK+cg4N9WFMi90MMLgHDml e9h2QjKU2OAO0iYVyaaLtrCqdIrIGQqi1ukn7ClKMPGj0BJ0IN3lhBlQVPvoODxjP4xg IDjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693320366; x=1693925166; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=w/gA6EWjgiuYunNR2IOlVdMPunpPG1QvMhaYhtIOPGM=; b=XccGdXxeWUC3leXAhyDQ57ShxGrn9fSs3gMtoZ8Vvsr7eG/7pRywoP6KEBYhXP7TtZ i0JEoZy2D19AKSJokSsT2VSoob3aPNNVazCnYbHka+dXGJPQFd4jUZTdB7e4QYYWDdmn cH6Z7sFnEv0EW5LfIzhPC2BDiSFCD2Xa5+Kk3XOFtPYpN8pkDVunYnEjBkB/IHRQQfOt YO0MtXrRUwmnammtWVt+ecAzmF5n8B7D8o6VuDN1akkZdCrgAVy8uMzpR0UZF5HoJm8g k4UcILFvFU3bz7EbpojV7Fm7fK9A2K9+TCb1ie3nJ/OuZ1NZSenK+Ls8b4CEhGOdgOkO AbBg== X-Gm-Message-State: AOJu0YwOQbGkbFlGS5gcMPMz0K2qL4cRNIJfz2npkOibDpasL0z96Rw5 q3RRq6Idvndxnt8UBLZk8lFf+AGVwWkGhg== X-Google-Smtp-Source: AGHT+IFMrINe6R1+bi7QOrKfN80i3Lc5jRVXmDcmlZ/zF43EIc37xjrTuJYbCd3+tpcexpoLGZhobQ== X-Received: by 2002:a05:622a:1909:b0:400:9f2c:1211 with SMTP id w9-20020a05622a190900b004009f2c1211mr3343975qtc.29.1693320366565; Tue, 29 Aug 2023 07:46:06 -0700 (PDT) Received: from hurd (dsl-10-132-204.b2b2c.ca. [72.10.132.204]) by smtp.gmail.com with ESMTPSA id iw10-20020a05622a6f8a00b00410929fe3b9sm3016678qtb.58.2023.08.29.07.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 07:46:06 -0700 (PDT) From: Maxim Cournoyer References: <28d93ea0e4bda4dbbc9a653cfefb7e569b827ada.1693140822.git.ngraves@ngraves.fr> <874jkjgoch.fsf@gmail.com> <87ledunf4j.fsf@ngraves.fr> Date: Tue, 29 Aug 2023 10:46:05 -0400 In-Reply-To: <87ledunf4j.fsf@ngraves.fr> (Nicolas Graves's message of "Tue, 29 Aug 2023 15:37:48 +0200") Message-ID: <87cyz5c3f6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Nicolas, Nicolas Graves writes: > On 2023-08-28 11:48, Maxim Cournoyer wrote: > >> Hello! >> >> Nicolas Graves writes: >> >> >> The comments are a bit terse; I'd expound them to complete sentences >> with a tad more context. > > Will try to expand a bit, but that will be hard, the commits are very > old and my memory of this mostly faded. > >> >> I'm confused here; we re-run the configure script post installation? >> How does that work? If that's really needed it needs a proper >> explanatory comment. > > IIRC, since we use this version of icu4c to run tests, we needed to > also build some "data". It's rather a reconfiguration to build data > rather than a re-run of the configuration script post-installation. That would perfect in an explanatory comment :-). >> >> The rest looks good! It's seems a tricky package, well done! Could you >> please send a v2 with the above suggestions/comments taken into account? > > Doing so Super! Thanks for seeing it through. -- Thanks, Maxim From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v3 1/3] gnu: Add icu4c-for-skia. References: <87pmbtfge5.fsf@ngraves.fr> In-Reply-To: <87pmbtfge5.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Aug 2023 21:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr, maxim.cournoyer@gmail.com Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169334352631899 (code B ref 60571); Tue, 29 Aug 2023 21:13:02 +0000 Received: (at 60571) by debbugs.gnu.org; 29 Aug 2023 21:12:06 +0000 Received: from localhost ([127.0.0.1]:51719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qb60M-0008IP-2f for submit@debbugs.gnu.org; Tue, 29 Aug 2023 17:12:06 -0400 Received: from 2.mo560.mail-out.ovh.net ([188.165.53.149]:38035) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qb60G-0008Hh-Mq for 60571@debbugs.gnu.org; Tue, 29 Aug 2023 17:12:04 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.138.246]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 1380725F47 for <60571@debbugs.gnu.org>; Tue, 29 Aug 2023 21:11:52 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-5lk5p (unknown [10.110.103.92]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BA59C1FD1E; Tue, 29 Aug 2023 21:11:51 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-5lk5p with ESMTPSA id 4imFKBdf7mQEBgMAWEbJRA (envelope-from ); Tue, 29 Aug 2023 21:11:51 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R0028f4df2a1-4fb7-40d5-b513-da62bafe345a, 695B107701F98D61E4548ACF4F2C04F65A801990) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Tue, 29 Aug 2023 23:11:37 +0200 Message-ID: <4a4bbbda4ea4bfbf65915cf0ce29be066f0c6916.1693343499.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 6852226835796845249 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudefiedgudehlecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepheduhedtudeijeetheetjeehtdegfeeifeeugeekieelheekvdfhvdehkeeikedunecuffhomhgrihhnpehgohhoghhlvghsohhurhgtvgdrtghomhenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/icu4c.scm (icu4c-for-skia): New variable. --- gnu/packages/icu4c.scm | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index ba8b4915f2..9d1d461d17 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Björn Höfling ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,14 +28,17 @@ (define-module (gnu packages icu4c) #:use-module (gnu packages) + #:use-module (gnu packages cpio) #:use-module (gnu packages java) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system ant) #:use-module (guix build-system gnu)) @@ -240,3 +244,75 @@ (define-public java-icu4j globalisation support for software applications. This package contains the Java part.") (license x11))) + +(define-public icu4c-for-skia + ;; The current version of skia needs this exact commit + ;; for its test dependencies. + (let ((commit "a0718d4f121727e30b8d52c7a189ebf5ab52421f") + (revision "0")) + (package + (inherit icu4c) + (name "icu4c-for-skia") + (version "skia") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/chromium/deps/icu.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qxws2p91f6dmhy7d3967r5ygz06r88pkmpm97px067x0zzdz384")))) + (arguments + (list + #:make-flags #~(list (string-append "DESTDIR=" #$output)) + #:configure-flags #~'("--prefix=" "--exec-prefix=") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir-to-source + (lambda _ (chdir "source"))) + (replace 'configure + (lambda* (#:key inputs parallel-build? configure-flags + #:allow-other-keys) + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "OPTS" (string-join configure-flags)) + (invoke "./runConfigureICU" "Linux/gcc" + "--disable-layout" "--disable-tests"))) + (add-after 'install 'install-cleanup + (lambda* (#:key make-flags #:allow-other-keys) + (with-directory-excursion "data" + (apply invoke "make" "clean" make-flags)))) + (add-after 'install-cleanup 'configure-filtered-data + (lambda* (#:key configure-flags #:allow-other-keys) + (setenv "OPTS" (string-join configure-flags)) + (setenv "ICU_DATA_FILTER_FILE" + (string-append (getcwd) "/../filters/common.json")) + (invoke "./runConfigureICU" "Linux/gcc" + "--disable-layout" "--disable-tests"))) + (add-after 'configure-filtered-data 'build-filtered-data + (lambda* (#:key parallel-build? make-flags #:allow-other-keys) + (let ((job-count (if parallel-build? + (number->string (parallel-job-count)) + "1"))) + (apply invoke "make" "-j" job-count make-flags) + (setenv "DESTDIR" #$output) + (invoke "bash" "../scripts/copy_data.sh" "common")))) + (add-after 'build-filtered-data 'install-scripts-and-data + (lambda _ + (let* ((share (string-append #$output "/share")) + (scripts (string-append share "/scripts")) + (data (string-append share "/data/common"))) + ;; Install scripts. + (mkdir-p scripts) + (copy-recursively "../scripts/" scripts) + ;; Install data. + (mkdir-p data) + (copy-recursively "./dataout/common/data/out/tmp" data) + (symlink (string-append data "/icudt69l.dat") + (string-append data "/icudtl.dat"))))) + (add-before 'check 'disable-failing-uconv-test + (lambda _ + (substitute* "extra/uconv/Makefile.in" + (("check: check-local") + ""))))))) + (native-inputs (list python cpio pkg-config))))) base-commit: cf6abf50dbbbd95fef465ab4bb3b608843ac47e1 prerequisite-patch-id: cccdad83975cbf04d7bd618c2c1a4b4de6fa7fd2 prerequisite-patch-id: 6f28833d2efa054d55126980f87ba4d2fdd13c6d prerequisite-patch-id: afc6cadece838372370f7093f863ce8eaae7bc55 prerequisite-patch-id: b9330c12700355319c104aa3b493eafe03cbb619 prerequisite-patch-id: 46fa9c5a48fcc5b13409049b14b6e7314a6d6956 prerequisite-patch-id: 846f8b50b8de749caaa459b874087d06e15e0a80 prerequisite-patch-id: 023101e5a315951ce9786fb8230955c97001dac9 prerequisite-patch-id: d4b0193f128d8236026e079e746ea0cf6c4c0af0 prerequisite-patch-id: d73442d6d7c88e7375e9de0a9cd655cacb7766f9 prerequisite-patch-id: d8a56dd7bc6c1c3ba3ac0f77b2402b9c6469cfb2 prerequisite-patch-id: 3bc2b2eecd799be8d8b0f96b850ef83a6306dab7 prerequisite-patch-id: 798d4a277eff03a59339af4ebe19406682f361ab prerequisite-patch-id: 3f65e9cdab64edeacfeb5748cd4fb130839b2b30 prerequisite-patch-id: 6f8225b63a1dd1866b05bb91544e49d7c096601c prerequisite-patch-id: ff71ec9bdf6337390a720db4535268af271e32df prerequisite-patch-id: c6b40cc38f5bdfab229ac3d7ed4346c5d9f1b2f7 prerequisite-patch-id: 9ab6dade9e641d5e667ba6a61dbfbb3d32c943a6 prerequisite-patch-id: 4fcae29a8f6dd95716669680141da315acaf6e59 prerequisite-patch-id: 0a5a6da0061188dc9be59bc9829db53288307c58 prerequisite-patch-id: 83c4b7d9d831990e4d37ba89c584d773c872ba6b prerequisite-patch-id: 1c8dddf99041cf399b8836e3ad6721d7bbcebb7c prerequisite-patch-id: 773df13cc85606b205d1d914e59525b7a6820a1d prerequisite-patch-id: 6f8974ce8c0a3a25721a41781f9b0dfd61e96cf4 prerequisite-patch-id: d219948d28923c5ccd34b63f988032df33f2f336 prerequisite-patch-id: 0bd75bb28df9ccf3405caf8217d708afc978047d prerequisite-patch-id: 26476dd782cf8f5e427d4bd36ac85957538a0aa3 prerequisite-patch-id: b5f87c460fd984c41fbb52e7e0dc305c20c46f22 prerequisite-patch-id: 5502b9c6a64abaca6a9921f25cd324869d26aa1e prerequisite-patch-id: a7e84bb368349566e9a6fdbe49a371fdb464bb1e prerequisite-patch-id: a84a766ceef6bedd5da3f9512c87a2c2a11ff33f prerequisite-patch-id: 0175b2b1cbbc15c1c775147821715bca9e3303a3 prerequisite-patch-id: 9c20b408ac8aa275ecba58383d83be5cef7647df prerequisite-patch-id: 836749cd3bd3b86f64de637c3c2df48a3608f09f prerequisite-patch-id: 28ea1ddbef32a1bc9e908f3f9c7466953c60f13d prerequisite-patch-id: 52a78e387e36e6408d7147950195d552e4e41528 prerequisite-patch-id: 87fee01a70d4b8cbfca44cc0a9c9f54471a92d18 prerequisite-patch-id: 8c8cdb345e815fc3332805ca224103f185d4a568 prerequisite-patch-id: 3434c5caf1eba9e9a64c673681e5911d2c1d9232 prerequisite-patch-id: c45bf303726fb3dacee01a66c0ff75105a81164d prerequisite-patch-id: d44a1adb0404f23522aac21fa8a7f26be7ddabdc prerequisite-patch-id: e422fe29bbcef80260b190637faa1a4953c3f1cb prerequisite-patch-id: 285479a1a1e46e6f0f8aba5429edfa400c81b32b prerequisite-patch-id: 30fcff6f8c9328c71d3fca609cddde0b56973bb7 prerequisite-patch-id: 70bb47ccac3375de893e4e640ce7c59369a05a39 prerequisite-patch-id: cc3d79386ca4a93146dc195cd5732764f1ac447f prerequisite-patch-id: 2686866ec4bf08c7faa05b17cb84d9e0c13ec12c prerequisite-patch-id: 369b61e07e3c90151a5414b784513b9ae3d3e978 prerequisite-patch-id: 065651c3a8cee63b725d7f86c080c274b494627e prerequisite-patch-id: 1ee71844f0c9a0112a456e5b76079239906a7fb8 prerequisite-patch-id: c7b3d9c5bff04c16576781eff50ce37f7c49131c prerequisite-patch-id: c8b8fe8dc51fea0b8a2626cf7031f01b6000e023 prerequisite-patch-id: 182e25335d4c357001f4f8bed2b3f89b91d9cae5 prerequisite-patch-id: c0ea00d5f4c6a83642a92c9341f0288fbfe3095a prerequisite-patch-id: 795d31cc33a24a6a57e67af31b65acd8faa8187c prerequisite-patch-id: 358af8aa7fa71b5cb8fbe6dde29d141bb7c57f1e prerequisite-patch-id: b9ab3ee98a9d4ca518a4d99042982d64fbce5d05 prerequisite-patch-id: eb618ab7b10483d917c308a38792af98baa517e2 prerequisite-patch-id: c6bbe6026bfcd2c9ff6e06efc5b8424a6943d1bf prerequisite-patch-id: 5f664cb2fd995a53765c5ffc19a708ac795cc0c4 prerequisite-patch-id: 8e234d0f4d93d2aad499eec8842be3d28da98707 prerequisite-patch-id: 40b6c9f09f27833367a71ec25d77afae4d2a835e prerequisite-patch-id: 45e65ea00ece53f3496251401acd464081f8ca7a prerequisite-patch-id: c3bc83367aa2aab9f121fe3bdbbd9e48dee860ea prerequisite-patch-id: c12968d02d99c253f858586a86b16fa32d41f1c1 prerequisite-patch-id: 09d995d48139f8e61183d5634cda13a01cdb50f7 prerequisite-patch-id: 86baa45ec2aad977c8c8135f7613aa391155de6d prerequisite-patch-id: 3425fbbff6a603d60b4e143ea2141aabf4ddc92c prerequisite-patch-id: c373c01aab5dcba3503a97d51c62a595147a041c prerequisite-patch-id: cda857c790b88c681c4e713c5f71e40291970daf -- 2.41.0 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v3 2/3] gnu: skia: Activate tests. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Aug 2023 21:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr, maxim.cournoyer@gmail.com Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169334352731905 (code B ref 60571); Tue, 29 Aug 2023 21:13:02 +0000 Received: (at 60571) by debbugs.gnu.org; 29 Aug 2023 21:12:07 +0000 Received: from localhost ([127.0.0.1]:51721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qb60M-0008IS-RW for submit@debbugs.gnu.org; Tue, 29 Aug 2023 17:12:07 -0400 Received: from 1.mo583.mail-out.ovh.net ([188.165.57.91]:40791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qb60H-0008Hj-UC for 60571@debbugs.gnu.org; Tue, 29 Aug 2023 17:12:04 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.16.31]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 25DB72591F for <60571@debbugs.gnu.org>; Tue, 29 Aug 2023 21:11:53 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-7cdx6 (unknown [10.110.103.234]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BE9C01FE53; Tue, 29 Aug 2023 21:11:52 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-7cdx6 with ESMTPSA id bTzNKhhf7mTyGAAAUbvt3A (envelope-from ); Tue, 29 Aug 2023 21:11:52 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G005a73c6fe4-ba00-4624-9a22-573a880053e0, 695B107701F98D61E4548ACF4F2C04F65A801990) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Tue, 29 Aug 2023 23:11:38 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <4a4bbbda4ea4bfbf65915cf0ce29be066f0c6916.1693343499.git.ngraves@ngraves.fr> References: <4a4bbbda4ea4bfbf65915cf0ce29be066f0c6916.1693343499.git.ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 6852508310712672961 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudefiedgudehlecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefhieekvddtveevgeeiiefgleelieehvdfghfeuvdevheffveekieettdeuhfeiteenucffohhmrghinhepshhkihgrrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/graphics.scm (skia): Activate tests. --- gnu/packages/graphics.scm | 147 ++++++++++++++++++++++++++++++++++---- 1 file changed, 135 insertions(+), 12 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 2a94bd51cc..207da49e05 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -83,6 +83,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) @@ -2017,10 +2018,6 @@ (define-public skia (build-system gnu-build-system) ;actually GN + Ninja (arguments (list - ;; Running the test suite would require 'dm'; unfortunately the tool - ;; can only be built for debug builds, which require fetching third - ;; party sources. - #:tests? #f #:phases #~(modify-phases %standard-phases (replace 'configure @@ -2085,13 +2082,139 @@ (define-public skia URL: https://skia.org/ Version: ~a Libs: -L${libdir} -lskia -Cflags: -I${includedir}~%" #$output #$version)))))))) - (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper)) - (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib)) - (home-page "https://skia.org/") - (synopsis "2D graphics library") - (description - "Skia is a 2D graphics library for drawing text, geometries, and images. +Cflags: -I${includedir}~%" #$output #$version))))) + (replace 'check + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((icu #$(this-package-native-input "icu4c-for-skia"))) + ;; Unbundle SPIRV-Tools dependency. + (substitute* "BUILD.gn" + (("deps \\+= \\[ \"//third_party/externals/spirv-tools:spvtools_val\" \\]") + "libs += [ \"SPIRV-Tools\" ]")) + (substitute* "src/sksl/SkSLCompiler.cpp" + (("\"spirv-tools/libspirv.hpp\"") + "")) + ;; Configure ICU dependency. + (substitute* "third_party/icu/BUILD.gn" + (("data_dir = \"\\.\\./externals/icu/\"") + (string-append "data_dir = \"" icu "/share/data/\"")) + (("script = \"\\.\\./externals/icu/scripts/") + (string-append "script = \"" icu "/share/scripts/")) + (("\\.\\./externals/icu/common/icudtl\\.dat") + (string-append icu "/share/data/icudtl.dat")) + (("sources = icu_sources") + "") + (("sources \\+= \\[ \"\\$data_assembly\" \\]") + "sources = [ \"$data_assembly\" ]")) + ;; Enable system libraries without is_official_build=true. + ;; This is necessary because is_official_build prevents from + ;; building dm. + (for-each + (lambda (libname) + (let ((snake (string-join (string-split libname #\-) "_"))) + (substitute* + (string-append "third_party/" libname "/BUILD.gn") + (((string-append "skia_use_system_" + snake + " = is_official_build.*")) + (string-append "skia_use_system_" snake " = true"))))) + '("zlib" "libjpeg-turbo" "harfbuzz" "libpng" "libwebp")) + ;; Configure with gn. + (invoke "gn" "gen" "out/Debug" + (string-append + "--args=" + "cc=\"gcc\" " ;defaults to 'cc' + "skia_compile_sksl_tests=false " ; disable some tests + "skia_use_system_expat=true " ; use system expat library + ;; Specify where to locate the includes. + "extra_cflags=[" + (string-join + (map + (lambda (lib) + (string-append + "\"-I" + (search-input-directory + inputs + (string-append "include/" lib)) "\"")) + '("harfbuzz" + "freetype2" + "spirv-tools" + "spirv" + "unicode")) + ",") + "] " + ;; Otherwise the validate-runpath phase fails. + "extra_ldflags=[" + "\"-Wl,-rpath=" #$output "/lib\"" + "] " + ;; Disabled, otherwise the build system attempts to + ;; download the SDK at build time. + "skia_use_dng_sdk=false " + "skia_use_runtime_icu=true ")) + ;; Build dm testing tool. + (symlink + (string-append #$(this-package-native-input "gn") "/bin/gn") + "./bin/gn") + (invoke "ninja" "-C" "out/Debug" "dm") + ;; The test suite requires an X server. + (let ((xvfb (search-input-file (or native-inputs inputs) + "bin/Xvfb")) + (display ":1")) + (setenv "DISPLAY" display) + (system (string-append xvfb " " display " &"))) + ;; Run tests. + (invoke "out/Debug/dm" "-v" + "-w" "dm_output" + "--codecWritePath" "dm_output" + "--simpleCodec" + "--skip" + ;; The underscores are part of the dm syntax for + ;; skipping tests. + ;; These tests fail with segmentation fault. + "_" "_" "_" "Codec_trunc" + "_" "_" "_" "AnimCodecPlayer" + "_" "_" "_" "Codec_partialAnim" + "_" "_" "_" "Codec_InvalidImages" + "_" "_" "_" "Codec_GifInterlacedTruncated" + "_" "_" "_" "SkText_UnicodeText_Flags" + "_" "_" "_" "SkParagraph_FontStyle" + "_" "_" "_" "flight_animated_image" + ;; These tests fail because of Codec/Sk failure. + "_" "_" "_" "AndroidCodec_computeSampleSize" + "_" "_" "_" "AnimatedImage_invalidCrop" + "_" "_" "_" "AnimatedImage_scaled" + "_" "_" "_" "AnimatedImage_copyOnWrite" + "_" "_" "_" "AnimatedImage" + "_" "_" "_" "BRD_types" + "_" "_" "_" "Codec_frames" + "_" "_" "_" "Codec_partial" + "_" "_" "_" "Codec_partialWuffs" + "_" "_" "_" "Codec_requiredFrame" + "_" "_" "_" "Codec_rewind" + "_" "_" "_" "Codec_incomplete" + "_" "_" "_" "Codec_InvalidAnimated" + "_" "_" "_" "Codec_ossfuzz6274" + "_" "_" "_" "Codec_gif_out_of_palette" + "_" "_" "_" "Codec_xOffsetTooBig" + "_" "_" "_" "Codec_gif" + "_" "_" "_" "Codec_skipFullParse" + "_" "_" "_" "AndroidCodec_animated_gif" + ;; These fail for unknown reasons. + "_" "_" "_" "Gif" + "_" "_" "_" "Wuffs_seek_and_decode" + "_" "_" "_" "Skottie_Shaper_ExplicitFontMgr" + "8888" "skp" "_" "_" + "8888" "lottie" "_" "_" + "gl" "skp" "_" "_" + "gl" "lottie" "_" "_" + "_" "_" "_" "ES2BlendWithNoTexture"))))))) + (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper + spirv-tools spirv-headers + icu4c-for-skia glu xorg-server-for-tests)) + (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib)) + (home-page "https://skia.org/") + (synopsis "2D graphics library") + (description + "Skia is a 2D graphics library for drawing text, geometries, and images. It supports: @itemize @item 3x3 matrices with perspective @@ -2099,7 +2222,7 @@ (define-public skia @item shaders, xfermodes, maskfilters, patheffects @item subpixel text @end itemize") - (license license:bsd-3)))) + (license license:bsd-3)))) (define-public superfamiconv (package -- 2.41.0 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v3 3/3] gnu: skia: Update to 110.0.0f3fb7a. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Aug 2023 21:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr, maxim.cournoyer@gmail.com Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169334353431921 (code B ref 60571); Tue, 29 Aug 2023 21:13:03 +0000 Received: (at 60571) by debbugs.gnu.org; 29 Aug 2023 21:12:14 +0000 Received: from localhost ([127.0.0.1]:51723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qb60U-0008Im-EW for submit@debbugs.gnu.org; Tue, 29 Aug 2023 17:12:14 -0400 Received: from 5.mo560.mail-out.ovh.net ([87.98.181.248]:40863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qb60I-0008Hn-Or for 60571@debbugs.gnu.org; Tue, 29 Aug 2023 17:12:05 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.20.202]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id EBB4925F62 for <60571@debbugs.gnu.org>; Tue, 29 Aug 2023 21:11:53 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-krv6n (unknown [10.110.103.4]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BB68D1FD37; Tue, 29 Aug 2023 21:11:53 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-6684bf9d7b-krv6n with ESMTPSA id QiBDKxlf7mQQfQoA6U6/Ag (envelope-from ); Tue, 29 Aug 2023 21:11:53 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G00361331ec4-41ac-4264-b3c0-9a3c45414c3d, 695B107701F98D61E4548ACF4F2C04F65A801990) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Tue, 29 Aug 2023 23:11:39 +0200 Message-ID: <900b9cc724a2894b64d4683d3b44ca70890b20c3.1693343499.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <4a4bbbda4ea4bfbf65915cf0ce29be066f0c6916.1693343499.git.ngraves@ngraves.fr> References: <4a4bbbda4ea4bfbf65915cf0ce29be066f0c6916.1693343499.git.ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 6852508310764249793 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudefiedgudehlecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefhieekvddtveevgeeiiefgleelieehvdfghfeuvdevheffveekieettdeuhfeiteenucffohhmrghinhepshhkihgrrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedtheejudesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/graphics.scm (skia): Update to 110.0.0f3fb7a. [arguments](build-phases): Disable newly introduced libraries wuffs (general performance) and perfetto (running performance tests). --- gnu/packages/graphics.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 207da49e05..9dfd7dd7ed 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2000,9 +2000,9 @@ (define-public skia ;; https://skia.org/docs/user/release/release_notes/. The commit used ;; should be the last commit, as recommended at ;; https://skia.org/docs/user/release/. - (let ((version "98") + (let ((version "110") (revision "0") - (commit "55c56abac381e1ae3f0116c410bed81b05e0a38a")) + (commit "0f3fb7a005fb357962e8b948ff4ec6b37f11e01b")) (package (name "skia") (version (git-version version revision commit)) @@ -2014,7 +2014,7 @@ (define-public skia (file-name (git-file-name name version)) (sha256 (base32 - "1ldns2j1g2wj2phlxr9zqkdgs5g64pisxhwxcrq9ijn8a3jhafr2")))) + "1aqdnx3817hzhy60mc72j6iwaywvd3b5fj3ffpjxnnras38x2jvp")))) (build-system gnu-build-system) ;actually GN + Ninja (arguments (list @@ -2045,7 +2045,10 @@ (define-public skia "extra_ldflags=[\"-Wl,-rpath=" #$output "/lib\"] " ;; Disabled, otherwise the build system attempts to ;; download the SDK at build time. - "skia_use_dng_sdk=false ")))) + "skia_use_dng_sdk=false " + ;; Wuffs is a google language that may improve performance + ;; disabled while unpackaged + "skia_use_wuffs=false ")))) (replace 'build (lambda* (#:key parallel-build? #:allow-other-keys) (let ((job-count (if parallel-build? @@ -2124,6 +2127,8 @@ (define-public skia "--args=" "cc=\"gcc\" " ;defaults to 'cc' "skia_compile_sksl_tests=false " ; disable some tests + "skia_use_perfetto=false " ; disable performance tests + "skia_use_wuffs=false " ; missing performance tool "skia_use_system_expat=true " ; use system expat library ;; Specify where to locate the includes. "extra_cflags=[" -- 2.41.0 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] activating tests for skia 2D graphics library Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Sep 2023 13:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Graves Cc: 60571@debbugs.gnu.org Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169366164429122 (code B ref 60571); Sat, 02 Sep 2023 13:35:02 +0000 Received: (at 60571) by debbugs.gnu.org; 2 Sep 2023 13:34:04 +0000 Received: from localhost ([127.0.0.1]:35509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcQlH-0007Zb-To for submit@debbugs.gnu.org; Sat, 02 Sep 2023 09:34:04 -0400 Received: from mail-qt1-x82f.google.com ([2607:f8b0:4864:20::82f]:54323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcQlD-0007ZG-O3 for 60571@debbugs.gnu.org; Sat, 02 Sep 2023 09:34:01 -0400 Received: by mail-qt1-x82f.google.com with SMTP id d75a77b69052e-4135d72c75bso18731301cf.0 for <60571@debbugs.gnu.org>; Sat, 02 Sep 2023 06:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693661624; x=1694266424; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=7bVJ4xnfLYLIetmIqmaRL3Lu76s6XSCsjtk1FtsAnvU=; b=hCXHRLZfYvjyxh9AGFPJfirBX//vFJ/4rS3wpR7BV9JLn/fLLSNZYsaXR8CMMMqws9 uShbKgMJOPCjHXPjObyqok3iiIYDVrObPv73Q9IajlAfpi1HOhLal9VWKJ7ncfiPpp79 oNB4JK6O1karyqqh+0afU6R3pWniZcND30wKh/olOXckv0OD0i+Ikwr2PSPxvaBlnLaK FGO9rGHzd/RT5Uf4wyBieEOLkjB3iDHKwtprfU5WF8HKgM/C9glIMSSZxkdlh49/Z+q3 P80GcziPPVJ4Js74Ksq2CHbMRAIsGmOzDox2AlBFpSOsJMdeWbDikvCw9ePUl6Qvd8VA IQsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693661624; x=1694266424; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7bVJ4xnfLYLIetmIqmaRL3Lu76s6XSCsjtk1FtsAnvU=; b=OUMLyE3fOAd7pBBbrtTgzTB0J5ZFkjQiy/FuCQgPx8Xz/tq6proqESFtCkoQkSeEfd voirBdfJXwH2zWS5qEFGlYVhcrJwwvxIQw0/8izLZbZ7mbLdwVUEFCraquydSV48JcOG PUtLdkmC7Rd4jarqzIO2nOB6NrQXlC0NoQ4Xyl/K+OfvX7zwaF4ZtY6Dze35W5s5f67s yDD+SBjZOrJ2BPe4ZfmxiEiMWhmVwqfluevXzF+gWNxGIeCzs4E1Jm/u7ok7vUgjgfR4 gXrcyKFZhFvNFI4OXaJua8SDS8kjzoGq2HdpUL5HZGfa2f++b1A3+Y+wE6FrSjrBAHsZ XUdA== X-Gm-Message-State: AOJu0YxA+BpD13ja5dm7nJHfSpUmo+byJFn/TVOEKVdOdJutixsl8I5R eO867io24J4UZu67iSFxrPhUUbBXwvyRdA== X-Google-Smtp-Source: AGHT+IF2yfRFvUf431YPW0Gq8XifAE2TYqw7IVj8gl9zEJFaO/PG+umH6qsFJc4MYIZDSCAfCp0XOg== X-Received: by 2002:a05:622a:1904:b0:403:8de7:4503 with SMTP id w4-20020a05622a190400b004038de74503mr6008041qtc.52.1693661623848; Sat, 02 Sep 2023 06:33:43 -0700 (PDT) Received: from hurd (dsl-154-228.b2b2c.ca. [66.158.154.228]) by smtp.gmail.com with ESMTPSA id do5-20020a05622a478500b0040553dac952sm2171554qtb.28.2023.09.02.06.33.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 06:33:43 -0700 (PDT) From: Maxim Cournoyer References: <4a4bbbda4ea4bfbf65915cf0ce29be066f0c6916.1693343499.git.ngraves@ngraves.fr> <900b9cc724a2894b64d4683d3b44ca70890b20c3.1693343499.git.ngraves@ngraves.fr> Date: Sat, 02 Sep 2023 09:33:41 -0400 In-Reply-To: <900b9cc724a2894b64d4683d3b44ca70890b20c3.1693343499.git.ngraves@ngraves.fr> (Nicolas Graves's message of "Tue, 29 Aug 2023 23:11:39 +0200") Message-ID: <87edjgzolm.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Nicolas, Nicolas Graves writes: > * gnu/packages/graphics.scm (skia): Update to 110.0.0f3fb7a. > [arguments](build-phases): Disable newly introduced libraries wuffs (general > performance) and perfetto (running performance tests). > --- > gnu/packages/graphics.scm | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm > index 207da49e05..9dfd7dd7ed 100644 > --- a/gnu/packages/graphics.scm > +++ b/gnu/packages/graphics.scm > @@ -2000,9 +2000,9 @@ (define-public skia > ;; https://skia.org/docs/user/release/release_notes/. The commit used > ;; should be the last commit, as recommended at > ;; https://skia.org/docs/user/release/. > - (let ((version "98") > + (let ((version "110") > (revision "0") > - (commit "55c56abac381e1ae3f0116c410bed81b05e0a38a")) > + (commit "0f3fb7a005fb357962e8b948ff4ec6b37f11e01b")) > (package > (name "skia") > (version (git-version version revision commit)) > @@ -2014,7 +2014,7 @@ (define-public skia > (file-name (git-file-name name version)) > (sha256 > (base32 > - "1ldns2j1g2wj2phlxr9zqkdgs5g64pisxhwxcrq9ijn8a3jhafr2")))) > + "1aqdnx3817hzhy60mc72j6iwaywvd3b5fj3ffpjxnnras38x2jvp")))) > (build-system gnu-build-system) ;actually GN + Ninja > (arguments > (list > @@ -2045,7 +2045,10 @@ (define-public skia > "extra_ldflags=[\"-Wl,-rpath=" #$output "/lib\"] " > ;; Disabled, otherwise the build system attempts to > ;; download the SDK at build time. > - "skia_use_dng_sdk=false ")))) > + "skia_use_dng_sdk=false " > + ;; Wuffs is a google language that may improve performance > + ;; disabled while unpackaged > + "skia_use_wuffs=false ")))) > (replace 'build > (lambda* (#:key parallel-build? #:allow-other-keys) > (let ((job-count (if parallel-build? > @@ -2124,6 +2127,8 @@ (define-public skia > "--args=" > "cc=\"gcc\" " ;defaults to 'cc' > "skia_compile_sksl_tests=false " ; disable some tests > + "skia_use_perfetto=false " ; disable performance tests > + "skia_use_wuffs=false " ; missing performance tool > "skia_use_system_expat=true " ; use system expat library > ;; Specify where to locate the includes. > "extra_cflags=[" If you try to rebuild skia's dependent packages, you'll find that the upgrade breaks python-skia-pathops, which in turns breaks font-amiri, ... gnome. We should look at what QA says and fix the breakage before merging. -- Thanks, Maxim From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] activating tests for skia 2D graphics library Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Sep 2023 16:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Graves Cc: 60571@debbugs.gnu.org Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169367147925927 (code B ref 60571); Sat, 02 Sep 2023 16:18:02 +0000 Received: (at 60571) by debbugs.gnu.org; 2 Sep 2023 16:17:59 +0000 Received: from localhost ([127.0.0.1]:38321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcTJv-0006k7-2Y for submit@debbugs.gnu.org; Sat, 02 Sep 2023 12:17:59 -0400 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]:50608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcTJs-0006jq-5a for 60571@debbugs.gnu.org; Sat, 02 Sep 2023 12:17:57 -0400 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-76ef27a8e4dso2802685a.1 for <60571@debbugs.gnu.org>; Sat, 02 Sep 2023 09:17:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693671460; x=1694276260; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=QYzsk00H/Vp2m4KMTa3J1e2NlS0xueqOH6E11vklVl4=; b=fMcMgh2/w5OJwfdNIHiJg+2ejxFSYS+m7IVBVy0KBpIYqNxp4YeZAbZYGqTbVORwFp LmVhrIC/xPvsaT7r0QZzJINBkvPpdYLt2zLhyTYkStZnoMWhOWDfppae2dO0KYudndU2 lezTyFPfZizzT4FNSv1qzan0g0AGbqc9WdY5UJggMp/rpj8K764eeQ8XAyeFfauc+DKE HMeMvaw4F6JF362NsCIK7EtWqeYVME4M495WbbLsvVIQpoa7hskQjwQu9iuGnFuBDzgN OQwfRBIroE1fkH+81pEL6n1FOsP1a+hdsY2x94QZoy2QF+NI5BLSc/DfXUQba8pYFsix tO+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693671460; x=1694276260; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=QYzsk00H/Vp2m4KMTa3J1e2NlS0xueqOH6E11vklVl4=; b=Sv/6oRHF3bntlWpWb3gJnEf8rEIvIhx5Wiq6D0GQCkKqF6ldDDV8ajFS0sy5RYvRTM tMwE1G/2kHi3kzcBid9k9uyqyZRcgq6Ue80myJFml7xEEsZFS4sW14ECJw9HEF1x8M6P 4RUhU0IwOyUUrn6GTdoCjKLGVYpdomnUUx9eOe6Lk876WwCspQ51Icm9QVlMlFD3x5uY WzrKsInlE67pxoY6wZ3jZPnPkqR/yOdxBf5UwJjaP0galD9R18/EQ/4nwzClVmh1oFQx xAilP6LQfXnOl9dufO4z29vnOWHFxeVPH0bSaMfgu8B8rfuFjkX+Rqc77T3iSeyt2aYP bolg== X-Gm-Message-State: AOJu0YxyBaxnAVao+5rF3OFn9iY+WmdS4tZt1/WYAyS+dZhpIKdp302K 3gp/NYBx/5bOa8RfxxQkDQ24Df8QQuY= X-Google-Smtp-Source: AGHT+IH9iwTTmrGvFv/X/ZDYe//HIqZmyzGd8z5g4sSJBoldaYfFTuGs9Q1NehAkWQyAzwKDzjQxnw== X-Received: by 2002:a05:620a:4450:b0:76c:8d5f:5954 with SMTP id w16-20020a05620a445000b0076c8d5f5954mr8007379qkp.70.1693671460398; Sat, 02 Sep 2023 09:17:40 -0700 (PDT) Received: from hurd (dsl-154-228.b2b2c.ca. [66.158.154.228]) by smtp.gmail.com with ESMTPSA id c12-20020a05620a11ac00b00767f00a9c67sm2173461qkk.95.2023.09.02.09.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 09:17:39 -0700 (PDT) From: Maxim Cournoyer References: <4a4bbbda4ea4bfbf65915cf0ce29be066f0c6916.1693343499.git.ngraves@ngraves.fr> <900b9cc724a2894b64d4683d3b44ca70890b20c3.1693343499.git.ngraves@ngraves.fr> Date: Sat, 02 Sep 2023 12:17:38 -0400 In-Reply-To: <900b9cc724a2894b64d4683d3b44ca70890b20c3.1693343499.git.ngraves@ngraves.fr> (Nicolas Graves's message of "Tue, 29 Aug 2023 23:11:39 +0200") Message-ID: <875y4szh0d.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Nicolas Graves writes: > * gnu/packages/graphics.scm (skia): Update to 110.0.0f3fb7a. > [arguments](build-phases): Disable newly introduced libraries wuffs (general > performance) and perfetto (running performance tests). I've installed the two first patches of this series, but not this one, as it broke other packages. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 02 12:18:06 2023 Received: (at control) by debbugs.gnu.org; 2 Sep 2023 16:18:06 +0000 Received: from localhost ([127.0.0.1]:38326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcTK2-0006l5-C7 for submit@debbugs.gnu.org; Sat, 02 Sep 2023 12:18:06 -0400 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:53356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcTJz-0006k6-VP for control@debbugs.gnu.org; Sat, 02 Sep 2023 12:18:05 -0400 Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-76ef935abaeso2163185a.2 for ; Sat, 02 Sep 2023 09:17:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693671468; x=1694276268; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=8sfPCqfLgKYQOiGGGB5epWgGr0IudkbgaJ8PEG6+JL4=; b=bmIoEstEgZaOzsGDOv/fYuPx72wxS19ElbJiVWEEBC28fWTG6GG8X17z0PYLdWdDMw L6IK4rnqvUx+aCI74fAPBuTVZvQ5+sWmO848+G4WKfh41V9fmpEQA4r4ehguSjbRLU5t Tn3fANPGAklHNZjYeTiAVM+LqWnYQng/s7k1MLbSMCfcbOn0BVn5fZxsjrPMeFbPBugG tSqSOOv+iGVaP7sV6RmrGlgYNb22yWBOgaV3URSddUgUukNmzgdsiFTR8FM1rPe8uDZu peOszeeLSBj+0dvZyBZJ2G9dhuZ2JuNcabJSMMo0lTrCTzo1p1+fBfkAU4QqiY6lowJq FVeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693671468; x=1694276268; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8sfPCqfLgKYQOiGGGB5epWgGr0IudkbgaJ8PEG6+JL4=; b=MIQ9ijoCo7G5Yz53X0S9BKgVn0Bfx+58omnAS1zidSCA9KB2Zuidajokks1RNigGHG Smlo7brvs4iFFstSZEk5RWBuZyEFgvbq152L1TYEW4CCwrzUDZzeQm1DO6jJ0qGUz62N LHBY5EquR7zkqXpb7T8/gtaR7Rqa9GHI25XYYsGK7+FDoRFJL8xTJXa+hFUEARgg62fL S4xWa8/fNVnRn/4bapRUv7L0eU873lwUK7vIOQXaIUihdwFXaGaSeixIxop1N5k/Sqsp BMHMJL9MWoxzKRObqlSfwJDPk1IEjseMD2iqvZgt5O/yiF0qwKBPGtQ4QqFpfcvoyRpX zchg== X-Gm-Message-State: AOJu0Yyvs3A+U/E5aSPuRMeKA4tQtwv9eRL12mPB6deo1EPQqx/cGtkj Rol1TYm2y/7MnyVCK1ajMItpzj0TU+Q= X-Google-Smtp-Source: AGHT+IG4Es0ONZKUtoy+nMPIa/07gskxbqQ4UH7wmsqWF6N17vGtIHYDEzLaYF9oN30XvIsJFcrzTQ== X-Received: by 2002:a05:620a:284a:b0:76f:20df:f038 with SMTP id h10-20020a05620a284a00b0076f20dff038mr5928411qkp.12.1693671468415; Sat, 02 Sep 2023 09:17:48 -0700 (PDT) Received: from hurd (dsl-154-228.b2b2c.ca. [66.158.154.228]) by smtp.gmail.com with ESMTPSA id c4-20020ae9e204000000b0076eed604793sm2136852qkc.130.2023.09.02.09.17.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 09:17:47 -0700 (PDT) Date: Sat, 02 Sep 2023 12:17:46 -0400 Message-Id: <874jkczh05.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #60571 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 60571 + moreinfo quit From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v4 2/3] gnu: skia: Update to 112.0.6d0b938. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Sep 2023 15:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr, maxim.cournoyer@gmail.com Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169392644824011 (code B ref 60571); Tue, 05 Sep 2023 15:08:01 +0000 Received: (at 60571) by debbugs.gnu.org; 5 Sep 2023 15:07:28 +0000 Received: from localhost ([127.0.0.1]:57772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXeJ-0006FC-6K for submit@debbugs.gnu.org; Tue, 05 Sep 2023 11:07:28 -0400 Received: from 8.mo582.mail-out.ovh.net ([178.33.42.204]:48557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXeD-0006Ex-PW for 60571@debbugs.gnu.org; Tue, 05 Sep 2023 11:07:26 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.20.46]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4B34627BEF for <60571@debbugs.gnu.org>; Tue, 5 Sep 2023 15:07:18 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-25bgl (unknown [10.110.208.139]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B50681FEA8; Tue, 5 Sep 2023 15:07:17 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-25bgl with ESMTPSA id TXkwKCVE92R4xQEAiFNnKA (envelope-from ); Tue, 05 Sep 2023 15:07:17 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S002fc813d87-5e01-44ac-b2ad-98c1f1922376, 9993FFF2090D2781C39498BB7515523824E0E4B2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Tue, 5 Sep 2023 17:07:07 +0200 Message-ID: <7c09055bb21809cc4e2d0ad10e1aad600c5eacce.1693926428.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <69430f9827f09ff181f01055295be457a375a86c.1693926428.git.ngraves@ngraves.fr> References: <69430f9827f09ff181f01055295be457a375a86c.1693926428.git.ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 4910612444262359745 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudehuddgieduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhephfeikedvtdevveegieeigfelleeihedvgffhuedvveehffevkeeitedtuefhieetnecuffhomhgrihhnpehskhhirgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedtheejudesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/graphics.scm (skia): Update to 112.0.6d0b938. --- gnu/packages/graphics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 2182cdeaf2..24ed547782 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1999,9 +1999,9 @@ (define-public skia ;; https://skia.org/docs/user/release/release_notes/. The commit used ;; should be the last commit, as recommended at ;; https://skia.org/docs/user/release/. - (let ((version "110") + (let ((version "112") (revision "0") - (commit "0f3fb7a005fb357962e8b948ff4ec6b37f11e01b")) + (commit "6d0b93856303fcf3021a8b40654d7739fda4dfb0")) (package (name "skia") (version (git-version version revision commit)) @@ -2013,7 +2013,7 @@ (define-public skia (file-name (git-file-name name version)) (sha256 (base32 - "1aqdnx3817hzhy60mc72j6iwaywvd3b5fj3ffpjxnnras38x2jvp")))) + "0g07xlvpbbxqmr9igvy5d1hy11z7dz9nzp2fd3ka9y2jqciniyz6")))) (build-system gnu-build-system) ;actually GN + Ninja (arguments (list @@ -2033,6 +2033,7 @@ (define-public skia "cc=\"gcc\" " ;defaults to 'cc' "is_official_build=true " ;to use system libraries "is_component_build=true " ;build as a shared library + "skia_use_system_zlib=true " ; use system zlib library ;; Specify where locate the harfbuzz and freetype ;; includes. (format #f "extra_cflags=[\"-I~a\",\"-I~a\"] " @@ -2129,6 +2130,7 @@ (define-public skia "skia_use_perfetto=false " ; disable performance tests "skia_use_wuffs=false " ; missing performance tool "skia_use_system_expat=true " ; use system expat library + "skia_use_system_zlib=true " ; use system zlib library ;; Specify where to locate the includes. "extra_cflags=[" (string-join -- 2.41.0 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v4 3/3] gnu: python-skia-pathops: Update to 0.8.0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Sep 2023 15:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr, maxim.cournoyer@gmail.com Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169392645324030 (code B ref 60571); Tue, 05 Sep 2023 15:08:02 +0000 Received: (at 60571) by debbugs.gnu.org; 5 Sep 2023 15:07:33 +0000 Received: from localhost ([127.0.0.1]:57776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXeP-0006FW-58 for submit@debbugs.gnu.org; Tue, 05 Sep 2023 11:07:33 -0400 Received: from 10.mo575.mail-out.ovh.net ([46.105.79.203]:46213) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXeM-0006FK-7E for 60571@debbugs.gnu.org; Tue, 05 Sep 2023 11:07:31 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.146.5]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id BEAFC26CE6 for <60571@debbugs.gnu.org>; Tue, 5 Sep 2023 15:07:21 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-f84dr (unknown [10.110.103.233]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 186211FD3A; Tue, 5 Sep 2023 15:07:21 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-f84dr with ESMTPSA id giRTAylE92S7TAEA/UD8OA (envelope-from ); Tue, 05 Sep 2023 15:07:21 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004f2a9870b-9525-40dd-b353-747de297be5c, 9993FFF2090D2781C39498BB7515523824E0E4B2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Tue, 5 Sep 2023 17:07:08 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <69430f9827f09ff181f01055295be457a375a86c.1693926428.git.ngraves@ngraves.fr> References: <69430f9827f09ff181f01055295be457a375a86c.1693926428.git.ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 4911456872827183809 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudehuddgieduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeehpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/fontutils.scm (python-skia-pathops): Update to 0.8.0. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 153602b4b4..18697cd821 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -841,7 +841,7 @@ (define-public python-sfdlib (define-public python-skia-pathops (package (name "python-skia-pathops") - (version "0.7.2") + (version "0.8.0") (source (origin (method url-fetch) @@ -849,7 +849,7 @@ (define-public python-skia-pathops (modules '((guix build utils))) (snippet '(delete-file-recursively "src/cpp")) ;140+ MiB of stuff (sha256 - (base32 "1456rclfn6a01c2cchlgyn166zppcjcqij0k5gwmm8gvzsd5rn0r")))) + (base32 "1vlwl1w6sn8c78fsh1w549n3lk9v3v9hcp866vrsdr4byb7g2ani")))) (build-system python-build-system) (arguments (list -- 2.41.0 From unknown Thu Aug 14 21:49:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v4 1/3] gnu: skia: Update to 110.0.0f3fb7a. References: <87pmbtfge5.fsf@ngraves.fr> In-Reply-To: <87pmbtfge5.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Sep 2023 15:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr, maxim.cournoyer@gmail.com Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169392645724050 (code B ref 60571); Tue, 05 Sep 2023 15:08:02 +0000 Received: (at 60571) by debbugs.gnu.org; 5 Sep 2023 15:07:37 +0000 Received: from localhost ([127.0.0.1]:57779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXeT-0006Fq-FZ for submit@debbugs.gnu.org; Tue, 05 Sep 2023 11:07:37 -0400 Received: from 5.mo575.mail-out.ovh.net ([46.105.62.179]:45181) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXeQ-0006Fe-T5 for 60571@debbugs.gnu.org; Tue, 05 Sep 2023 11:07:36 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.138.83]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 32AA828655 for <60571@debbugs.gnu.org>; Tue, 5 Sep 2023 15:07:16 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-wz6gg (unknown [10.109.138.190]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C6ECF1FE9E; Tue, 5 Sep 2023 15:07:15 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-6684bf9d7b-wz6gg with ESMTPSA id /Z7hLCNE92RpHQAA0I/y6g (envelope-from ); Tue, 05 Sep 2023 15:07:15 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R0012c3feb40-5f03-4136-9ba7-3fafc98ab966, 9993FFF2090D2781C39498BB7515523824E0E4B2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Tue, 5 Sep 2023 17:07:06 +0200 Message-ID: <69430f9827f09ff181f01055295be457a375a86c.1693926428.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 4910049494569312961 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudehuddgieduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeefvdevkedutdelgeejhfeufeelffegudduueduteduvddvjeeuudeuleeguddunecuffhomhgrihhnpehskhhirgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeehpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/graphics.scm (skia): Update to 110.0.0f3fb7a. [arguments](build-phases): Disable newly introduced libraries wuffs (general performance) and perfetto (running performance tests). --- gnu/packages/graphics.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 346871328c..2182cdeaf2 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1999,9 +1999,9 @@ (define-public skia ;; https://skia.org/docs/user/release/release_notes/. The commit used ;; should be the last commit, as recommended at ;; https://skia.org/docs/user/release/. - (let ((version "98") + (let ((version "110") (revision "0") - (commit "55c56abac381e1ae3f0116c410bed81b05e0a38a")) + (commit "0f3fb7a005fb357962e8b948ff4ec6b37f11e01b")) (package (name "skia") (version (git-version version revision commit)) @@ -2013,7 +2013,7 @@ (define-public skia (file-name (git-file-name name version)) (sha256 (base32 - "1ldns2j1g2wj2phlxr9zqkdgs5g64pisxhwxcrq9ijn8a3jhafr2")))) + "1aqdnx3817hzhy60mc72j6iwaywvd3b5fj3ffpjxnnras38x2jvp")))) (build-system gnu-build-system) ;actually GN + Ninja (arguments (list @@ -2044,7 +2044,10 @@ (define-public skia "extra_ldflags=[\"-Wl,-rpath=" #$output "/lib\"] " ;; Disabled, otherwise the build system attempts to ;; download the SDK at build time. - "skia_use_dng_sdk=false ")))) + "skia_use_dng_sdk=false " + ;; Wuffs is a google language that may improve performance + ;; disabled while unpackaged + "skia_use_wuffs=false ")))) (replace 'build (lambda* (#:key parallel-build? #:allow-other-keys) (let ((job-count (if parallel-build? @@ -2123,6 +2126,8 @@ (define-public skia "--args=" "cc=\"gcc\" " ;defaults to 'cc' "skia_compile_sksl_tests=false " ; disable some tests + "skia_use_perfetto=false " ; disable performance tests + "skia_use_wuffs=false " ; missing performance tool "skia_use_system_expat=true " ; use system expat library ;; Specify where to locate the includes. "extra_cflags=[" base-commit: d010fc6597731a663473b79736766c85d9f7c381 -- 2.41.0 From unknown Thu Aug 14 21:49:03 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nicolas Graves Subject: bug#60571: closed (Re: [PATCH v4 3/3] gnu: python-skia-pathops: Update to 0.8.0.) Message-ID: References: <87cyywds6c.fsf@gmail.com> <87pmbtfge5.fsf@ngraves.fr> X-Gnu-PR-Message: they-closed 60571 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: moreinfo Reply-To: 60571@debbugs.gnu.org Date: Wed, 06 Sep 2023 01:09:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1693962542-18201-1" This is a multi-part message in MIME format... ------------=_1693962542-18201-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #60571: activating tests for skia 2D graphics library which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 60571@debbugs.gnu.org. --=20 60571: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D60571 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1693962542-18201-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 60571-done) by debbugs.gnu.org; 6 Sep 2023 01:08:55 +0000 Received: from localhost ([127.0.0.1]:60193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdh2N-0004jH-9K for submit@debbugs.gnu.org; Tue, 05 Sep 2023 21:08:55 -0400 Received: from mail-qt1-x836.google.com ([2607:f8b0:4864:20::836]:52566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdh2J-0004j2-Ie for 60571-done@debbugs.gnu.org; Tue, 05 Sep 2023 21:08:53 -0400 Received: by mail-qt1-x836.google.com with SMTP id d75a77b69052e-414b3b65e85so19529271cf.1 for <60571-done@debbugs.gnu.org>; Tue, 05 Sep 2023 18:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693962525; x=1694567325; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=eHu51k3tQb4w8MjDoRkRDYrzhEWLVm1sejfeukJ2Vek=; b=qKQkwkGEWYeHognktm1oZ5AQUqLJuaaOF4C/Xx/vskPMhsh5rmdCzGZTlOlNILP4H1 PzLyw3QjPX+wlOzLhIw+KpScYSE4ZHt+8ObFic7qH6d95LbkSFnc48xq0KizpzO4rvbq Xtvs7vBfouGjnVYgY5b7WRbzHYy+MxHPN+d5fQQi85qVMdmertN9mN3Dd8Oiza+55ded IQ9N9CcyeWpbsqewaXhEGyPrDBA5N3d9xa4Rn7aJ4ACN7A8N57RnWIVm3eMp94+mAIID biwv3Twwp8hlXHEqMw2t2liZls9dmXGsXC9Y8kZacydPlvB5yC/c+gAVGzdwD5f8oY3M heyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693962525; x=1694567325; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=eHu51k3tQb4w8MjDoRkRDYrzhEWLVm1sejfeukJ2Vek=; b=WjOVdqN+o0hnM95esmWqBQThmOtQnHDw2/Mfj5kpEcOpcjIQh3qLOpaDwCasEHtfWG 05FhfRmpP+x42f13R9Jn9x2I1dWmcl/dmwuDv3JRVy/xXD0e0h9f5i9UmXHoLTNC8CS0 ugNiBSITPfjhgEguMNv3/UV8yvvethhtNXbG+fwKZeT4M7nrhUUY6CB0wgDyzRnOWs1y CRMDrWlbOZqOV5O8VaZg/aNhP2R2Lzn5oioq4XCj/65vA7yt6+SWgFTQorZeeMVK/vfH ep7OGZrL9p/bCL3FnWugXdm1vZdjFi9S3vU03GQV2NfBNyaPVTlIg11riZkoP6QSBXhO Iymg== X-Gm-Message-State: AOJu0Yyy1uAIqMFWEgZ+24Pv8+4iwSxybqIN9bcWVhJHLTPDf+ScrKy6 LQfyTuEk18rMhk+dhQZbuO6XiXXUqc4YLg== X-Google-Smtp-Source: AGHT+IGvcaqEmDajaBduLCU/N5gFzkn+1wSUpC+HnT6tAkSovq3XU6rOiKbV7UrF/KKwqmGsYB9hVA== X-Received: by 2002:a05:622a:64f:b0:40f:df11:8bf0 with SMTP id a15-20020a05622a064f00b0040fdf118bf0mr20285749qtb.14.1693962524906; Tue, 05 Sep 2023 18:08:44 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id ay22-20020a05622a229600b003eabcc29132sm4798159qtb.29.2023.09.05.18.08.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 18:08:44 -0700 (PDT) From: Maxim Cournoyer To: Nicolas Graves Subject: Re: [PATCH v4 3/3] gnu: python-skia-pathops: Update to 0.8.0. References: <69430f9827f09ff181f01055295be457a375a86c.1693926428.git.ngraves@ngraves.fr> Date: Tue, 05 Sep 2023 21:08:43 -0400 In-Reply-To: (Nicolas Graves's message of "Tue, 5 Sep 2023 17:07:08 +0200") Message-ID: <87cyywds6c.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60571-done Cc: 60571-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Nicolas Graves writes: > * gnu/packages/fontutils.scm (python-skia-pathops): Update to 0.8.0. > --- > gnu/packages/fontutils.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm > index 153602b4b4..18697cd821 100644 > --- a/gnu/packages/fontutils.scm > +++ b/gnu/packages/fontutils.scm > @@ -841,7 +841,7 @@ (define-public python-sfdlib > (define-public python-skia-pathops > (package > (name "python-skia-pathops") > - (version "0.7.2") > + (version "0.8.0") > (source > (origin > (method url-fetch) > @@ -849,7 +849,7 @@ (define-public python-skia-pathops > (modules '((guix build utils))) > (snippet '(delete-file-recursively "src/cpp")) ;140+ MiB of stuff > (sha256 > - (base32 "1456rclfn6a01c2cchlgyn166zppcjcqij0k5gwmm8gvzsd5rn0r")))) > + (base32 "1vlwl1w6sn8c78fsh1w549n3lk9v3v9hcp866vrsdr4byb7g2ani")))) > (build-system python-build-system) > (arguments > (list Applied the series! -- Thanks, Maxim ------------=_1693962542-18201-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 5 Jan 2023 10:03:01 +0000 Received: from localhost ([127.0.0.1]:50322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDN5R-0005Ds-Dr for submit@debbugs.gnu.org; Thu, 05 Jan 2023 05:03:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:58206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDN5P-0005Dk-Hi for submit@debbugs.gnu.org; Thu, 05 Jan 2023 05:03:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDN5P-0003fj-5u for guix-patches@gnu.org; Thu, 05 Jan 2023 05:02:59 -0500 Received: from 17.mo561.mail-out.ovh.net ([87.98.178.58]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDN5N-0002Iy-A0 for guix-patches@gnu.org; Thu, 05 Jan 2023 05:02:58 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.16.164]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id E4A0025192 for ; Thu, 5 Jan 2023 10:02:45 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-kjkrm (unknown [10.110.103.249]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3F3671FF72 for ; Thu, 5 Jan 2023 10:02:44 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-kjkrm with ESMTPSA id 34EHE0SgtmO0HwAASFnOuQ (envelope-from ) for ; Thu, 05 Jan 2023 10:02:44 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002122cea51-c2af-4f68-8aee-b1f100a55b0d, CCCEE37B4F29B2D663A2C00FBFAE6261951393C8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 194.57.247.3 From: Nicolas Graves To: guix-patches@gnu.org Subject: activating tests for skia 2D graphics library Date: Thu, 05 Jan 2023 11:02:42 +0100 Message-ID: <87pmbtfge5.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 11548636820124918522 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeekgdduudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeujeelieeljeffhfelteejtdeljeehveduffelvefgudefkeehgfdvvdevgeevfeenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=87.98.178.58; envelope-from=ngraves@ngraves.fr; helo=17.mo561.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi guix! I have a series of patches to activate tests on the SKIA graphics 2D library. Originally my goal was to add skia as a dependency to libreoffice and remove the --without-skia flag, but I didn't want to do that before being able to test the library change. It took me quite a while since google uses its own tools in a way that is hard to package in guix. There are still some disabled tests that I'm not able to fix myself, but at least it's testable for most tests. Help and review welcome, at least one function fails with segmentation fault, but I'm not able to debug it. -- Best regards, Nicolas Graves ------------=_1693962542-18201-1--