From patchwork Thu Mar 28 03:54:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62320 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 B463B27BBE2; Thu, 28 Mar 2024 03:58:05 +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=unavailable 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 7D9AB27BBEC for ; Thu, 28 Mar 2024 03:58:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt5-00017Q-SZ; Wed, 27 Mar 2024 23:57:11 -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 1rpgt1-000131-Pm for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:08 -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 1rpgt1-0008BM-Gr for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt1-0001HY-VO for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 09/13] gnu: vulkan-tools: Update to 1.3.280.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57:07 +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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981964696 (code B ref 69461); Thu, 28 Mar 2024 03:57:07 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:36 +0000 Received: from localhost ([127.0.0.1]:38714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsV-0001Dd-T4 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:36 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:50583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsF-0001BV-Dg for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:20 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.west.internal (Postfix) with ESMTP id 2D48D1C000C1; Wed, 27 Mar 2024 23:56:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 27 Mar 2024 23:56:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :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=fm3; t=1711598172; x= 1711684572; bh=oruVbQJVkJpKInYbi25CUlIpUsdHY/X9f7E89+n9P4I=; b=m pF7RyKIebd5L41dyGvsUi6D3F+7l0Rw7Ey37hTYhTKdfmAcxXUXVWvsB3qgiZVRJ /qsUUlNikh1qgZuabwEnGWX7kJRH9nxOJ2FstvfExQ19LkNCG+M8xL2Z1YE+rdDY l7UJAf3lT8NGU4qKduR/i2UD6qJjEBng2b61asJe9EIAvtygp6DokXHUVUDLMR7l o05L9NkCYwhrDLmJ4okYY8hsfYvxGXDPNH43qfAEVX7M0aC7iG2NXMSfHqmOdy2z +22e0Ziox97e+aggaImJX5v4TIuq4fapWAp07O+L09wW6uNPowdKGcLZiTRYfmK8 zeuqv2GjqGQ1IKl87vdlA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc: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=fm2; t=1711598172; x= 1711684572; bh=oruVbQJVkJpKInYbi25CUlIpUsdHY/X9f7E89+n9P4I=; b=Z k8xMDiLV2abuvc+rYYFvYwkIn2JhsCOFgB8nN0aTjUiU+qLEk6pntNMmSgxgsrI6 4koZVflm3wdeZ/1lR/zckn3e7o9CNggz5oo9+v9Mt1+C/Q1QtNO26G9W7G0MCIIE +iwcpixXLH6pPVHscX60KB6HpGBUfyJyjmAsleWJPe9V9MzBH9mF6Kyq3TXZtEV6 BUPBOAp7xxeYmhg+peafxiTtIIpc09COiL4bv3Gt1/SL3D+na41PLVmwqbOb1hEJ YAZw89o3OmKaI3F6c8Mnv9E3XcFQw3JzyvLc5Yl5IglQ05tLvyeiyEKYwHzYAXdq ALbfL4+eH6z3kb8WqEQPg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:11 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:51 +0800 Message-ID: <28d6db476c6a195925f0b4d2866facacefdec770.1711561863.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 1.3.280.0. [arguments]: Turn on tests. [arguments]<:#configure-flags>: Remove GLSLANG_INSTALL_DIR. [native-inputs]: Add googletest. Change-Id: Iadf98fc95d0d70c3780159992ebc2fdff6a2d108 --- gnu/packages/vulkan.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index c6d3d3d347..dfd8f73d9b 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -326,26 +326,34 @@ (define-public vulkan-loader (define-public vulkan-tools (package (name "vulkan-tools") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Tools") - (commit version))) + (commit (string-append "vulkan-sdk-" 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")))) + "0w0m04vscr4a6vr682g3mn7mfni740cmai9ylzlgfdggb77y58xz")))) (build-system cmake-build-system) (inputs (list glslang libxrandr vulkan-loader wayland wayland-protocols)) (native-inputs - (list pkg-config python vulkan-headers)) + (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"))))) + `(#: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")