From patchwork Fri Mar 28 15:27:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 40927 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1A42427BBEA; Fri, 28 Mar 2025 15:28:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C135E27BBE2 for ; Fri, 28 Mar 2025 15:28:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tyBd8-0000QJ-Gb; Fri, 28 Mar 2025 11:28:24 -0400 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 1tyBcv-0000MK-94 for guix-patches@gnu.org; Fri, 28 Mar 2025 11:28:11 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tyBcr-0007jt-0A for guix-patches@gnu.org; Fri, 28 Mar 2025 11:28:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=QUJPTHtC9JIIg7fZG40iceK/Ugc5TZs93nzc2XSwc/o=; b=mtFmqUyDfcAitapQw4cceBjeQbseK+aGEOVqf8IyQbR+K85YG9bPR2U4CUWLLOxIW+0moIXvut2diMAkCu8M21rda1zsl0/BJi8E+73h8ao9FyFX7ZJaarip1BUx6HoVTTYaf/3RXfWBdHDh5eyXPlHFxNv8Xkp7efyyT8aGVtCRpMk0weoM1nSPoKZ28yrMW8n23Fbvc1LVh2iURUANsJdFhqu9ourZm08S3MHyb1lHzSK560kfnRBa6mhe413d8/pUBo0SblCAZale1qhC+DxsQEZO6OwAYvS8J/MxwFLxSP+Rty+aMudMhdPEa3phN99yPNkRTyfN1yldus/+vw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tyBcq-0000Pw-RB for guix-patches@gnu.org; Fri, 28 Mar 2025 11:28:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77339] [PATCH mesa-updates 13/15] gnu: spirv-cross: Update to 1.4.309.0. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Mar 2025 15:28:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77339 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77339@debbugs.gnu.org Cc: John Kehayias Received: via spool by 77339-submit@debbugs.gnu.org id=B77339.17431756701503 (code B ref 77339); Fri, 28 Mar 2025 15:28:04 +0000 Received: (at 77339) by debbugs.gnu.org; 28 Mar 2025 15:27:50 +0000 Received: from localhost ([127.0.0.1]:55199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tyBcc-0000OA-9h for submit@debbugs.gnu.org; Fri, 28 Mar 2025 11:27:50 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:41889) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tyBcZ-0000Nv-9p for 77339@debbugs.gnu.org; Fri, 28 Mar 2025 11:27:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1743175661; x=1743434861; bh=QUJPTHtC9JIIg7fZG40iceK/Ugc5TZs93nzc2XSwc/o=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=p1vWTM4FWJIQAw68Jw9tf+maabSuUZljzLwDj9WnHtbKf0nozXGApqulBqAOnF/8z 5MrwbdRr8YGZaalcBKR0baF+blKJgmjxzF5q1EkBcJtf5JhvvpiUnT+48Tc1lFF5xW 3CKFzm7FM4YtachjcLZENZikmoGCyhMOqy7puinpUG3zK+c+DMLR1AcHFN8ZcGn1ga 3Vk8z1dpXlxkwz2RlBAjGVqfgT1pJVvI+gwkSAim0EOBn/fpjAouvG3XRO0BRsDmc5 jMt4BLco/SVIsX1eAke+McrRwDM87K+e+yvPRUbdjiqQr+tFrddEXENQeDnTV+hG3K dR4yVZ5EpAkhQ== Date: Fri, 28 Mar 2025 15:27:33 +0000 Message-ID: <5c62305f65f4ee60dc351483d8c9facc846d181e.1743174558.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 50ae88e187099aca8ee4fa1d8b06a94d1b7ebaf8 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vulkan.scm (spirv-cross): Update to 1.4.309.0. [arguments]: Disable for now due to upstream issue hit when update-reference-shaders phase is run, which is necessary to run the tests successfully. : Make the update-reference-shaders phase only run if tests are enabled. Change-Id: If496a258595af1bebf214972879ff6b4362e9743 --- gnu/packages/vulkan.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) -- 2.49.0 diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ed6c3d2e04..3fa9dcc785 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -117,7 +117,7 @@ (define-public spirv-tools (define-public spirv-cross (package (name "spirv-cross") - (version "1.3.280.0") + (version "1.4.309.0") (source (origin (method git-fetch) @@ -125,11 +125,15 @@ (define-public spirv-cross (url "https://github.com/KhronosGroup/SPIRV-Cross") (commit (string-append "vulkan-sdk-" version)))) (sha256 - (base32 "1k6fbkradknxis85akzzksz9ipm3v42xvrzaamwj2lrgfm8d6r4d")) + (base32 "1sckwqz67mh48zypgr1r9x101mcq1dlkh8sxi341ynrxzjk8rm3j")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(;; Disable tests for now due to upstream issue hit when running + ;; update-reference-shaders phase: + ;; . + #:tests? #f + #:configure-flags (list "-DSPIRV_CROSS_SHARED=YES") #:phases (modify-phases %standard-phases @@ -142,9 +146,10 @@ (define-public spirv-cross (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") (string-append (assoc-ref inputs "spirv-tools") "/bin"))))) (add-before 'check 'update-reference-shaders - (lambda _ - (with-directory-excursion "../source" - (invoke "./update_test_shaders.sh"))))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "../source" + (invoke "./update_test_shaders.sh")))))))) (inputs (list glslang spirv-headers spirv-tools)) (native-inputs (list python))