From patchwork Wed Feb 28 17:31:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61227 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 093F427BBEA; Wed, 28 Feb 2024 17:33:59 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 3AC0427BBE2 for ; Wed, 28 Feb 2024 17:33:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNoM-0005mE-GB; Wed, 28 Feb 2024 12:33:42 -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 1rfNoI-0005is-09 for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:38 -0500 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 1rfNoG-0002Fx-SJ for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNoh-0007Io-Eu for guix-patches@gnu.org; Wed, 28 Feb 2024 12:34:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 09/13] gnu: vulkan-tools: Update to vulkan-sdk-1.3.275.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914159027870 (code B ref 69461); Wed, 28 Feb 2024 17:34:03 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:10 +0000 Received: from localhost ([127.0.0.1]:56362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnp-0007FM-Rg for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:10 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:33665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnh-0007DB-Rr for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:02 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailfout.west.internal (Postfix) with ESMTP id 802FA1C00090 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:29 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 28 Feb 2024 12:32:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141549; x= 1709227949; bh=c/4ySSE17nbkcXoGuvRjP9rZZqEn6Vfq/zjwdX6g/tU=; b=C EFLQWQfXQw7lAEG2HsCxJ+0caJ8gzycttnbKgbKv1FCcFoHs5AieAVo+sGu2+vnd uJsH4z1orVC+fcxHptxCn+E38QirK/BQfOfjtJtb1EnbEApjd2E3Mr6N9GPqWwux F3nDetvAP+yD613bfzN2S69kBSqhuJGV9lgvw+WcIyy1O7kCMMil3ZPdhgsLhllH RhslgEYaruXb0IEDy37nAd76Q/8d6PHjSC4cK9FA3qxmxEE75yeMsWB5OaZsNUTy MZq3txPJl358Eb0QMgE8HQQfN0Z0FfllheodKIH6pmiWrrw+9jq74QkAOUSAxq3k JS51/4QlKilMozYnQL14Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141549; x=1709227949; bh=c/4ySSE17nbkc XoGuvRjP9rZZqEn6Vfq/zjwdX6g/tU=; b=PmIKDbfopXl5MJGTiVdK1PpLoz5BY unY0RNVkJ+B8Ldepu0fiZgVY1c4Hvm650CCKnMmQhd7Urj4irqf3ZahQO4XW26xj C52nX3SU2MEWZlIeDvCbV6IVIKieE8xCOeN4i7lzkVc3nOxhtCqzrZagmyDBKxNj tO8eJ54M30q+OT6Nne74W2oR1Rc9t1ZHuiVZfidesTdL0r0brCes1kt5Npf/qdiF euVS5472jMSeI5QLcv0u8uBM9mcji7RsSQaTkQ98zKmHxug6AbXdU0mLgpnz+T6G 7wnCAZDRQC8v6rIKarMzQTv/J2gkCN9U0G4J75qAtpKpWdhF1ispccKcg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:27 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:42 +0800 Message-ID: <617d4147db2b9bb37b94514cb79aaebf1fb5d5d5.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , 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 (vulkan-tools): Update to vulkan-sdk-1.3.275.0. [arguments]: Turn on tests. [arguments]<:#configure-flags>: Remove GLSLANG_INSTALL_DIR. [native-inputs]: Add googletest. Change-Id: I607c7ce414f8c0c8ee25ad0701d91771f5c4a7fc --- gnu/packages/vulkan.scm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 807b0be8af..82bc87dcd6 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -316,20 +316,24 @@ (define-public vulkan-tools (url "https://github.com/KhronosGroup/Vulkan-Tools") (commit version))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet #~(substitute* "tests/icd/mock_icd_tests.cpp" + ;; Disable driver info test since it relies on git branch info + (("ASSERT_EQ\\(std::string\\(driver_properties\\.driverInfo\\)") + "// ASSERT_EQ(std::string(driver_properties.driverInfo)"))) (sha256 - (base32 - "0jzwjfx4c7y15wkwfhhc64rzljpi47bxrm5jw5blfsqjh8zsd27a")))) + (base32 "0g604gzzlqibnkjd18iss6iwn852nnsfrrgfnwn97khpr0xk1h6j")))) (build-system cmake-build-system) - (inputs - (list glslang libxrandr vulkan-loader wayland wayland-protocols)) - (native-inputs - (list pkg-config python vulkan-headers)) + (inputs (list glslang libxrandr vulkan-loader wayland wayland-protocols)) + (native-inputs (list googletest pkg-config python volk vulkan-headers)) (arguments - `(#:tests? #f ;no tests - #:configure-flags (list (string-append "-DGLSLANG_INSTALL_DIR=" - (assoc-ref %build-inputs "glslang"))))) - (home-page - "https://github.com/KhronosGroup/Vulkan-Tools") + `(#:configure-flags (list "-DBUILD_TESTS=ON") + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./tests/vulkan_tools_tests"))))))) + (home-page "https://github.com/KhronosGroup/Vulkan-Tools") (synopsis "Tools and utilities for Vulkan") (description "Vulkan-Tools provides tools and utilities that can assist development by