From patchwork Thu Mar 28 03:54:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62323 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 4A2EC27BBE2; Thu, 28 Mar 2024 03:58:16 +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 EE74A27BBE9 for ; Thu, 28 Mar 2024 03:58:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt6-00017u-6C; Wed, 27 Mar 2024 23:57:12 -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 1rpgt3-00013r-8a for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:09 -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 1rpgt2-0008Bf-WE for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt3-0001Hu-6y for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 12/13] gnu: vulkan-validationlayers: 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:09 +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.17115981974718 (code B ref 69461); Thu, 28 Mar 2024 03:57:09 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:37 +0000 Received: from localhost ([127.0.0.1]:38720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsX-0001Dv-6y for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:37 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:50529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsN-0001CR-JI for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:28 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 580EC180006E; Wed, 27 Mar 2024 23:56:21 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:21 -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=1711598180; x= 1711684580; bh=XL3gg5y/HeEpA/3Y0Tg+TxSOxipFLlyExq+vnrczhVk=; b=N YhUsnHY0INC6/5prhC9p4LoBmKGyZHmCxZowdO0VJGi2GSqyOa6nLTvhbdwNDwaC 6m96MFlosBfTDZEYLEWQB2a1MaSrCdMkYOwL6Wd/C7evr+ijuY6xgJuUKWudP0p9 Ns37R14M+MezFJLR/XPahjmsS2HD9Vn0tj5c02BgvKUeowhlnJwPVoOacU7mBgcX 9fklOAFpA2JQLMlmZtT/53nR5kgaukPZosXfCIz0JG4Mk6gA8l/UkBjW58RT+Ve/ HEZjh72bN9aO7Qy/lzJhMSS6Z6E3cpaFql4r9fgq7N+Wp8bt8r0taD90kkus1NIU 50WG5VINwG3OvuNFLPTeA== 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=1711598180; x= 1711684580; bh=XL3gg5y/HeEpA/3Y0Tg+TxSOxipFLlyExq+vnrczhVk=; b=x 96VTf59uSAR3pAiXoP84PC9D2ny2qHjLykVw3yjuhUC3aUjcsYLeSfW/ATJOlVu3 4N4rO2Vw/yFJrfmiFWdwpshkLUe1+/MYW2GwI4XclYw+VEIUpFOxa8t1sBhJxFtm 7JImfaAqmj7NlOSHC5mn96Ls9EIDWlSTx/MSiD/AUkBo5uIfHMH0HhU6JYVXlixU Lvd8JtJP5kFBRuuHugLlwW8HRMDH1x64+/d3GtytobOdF6mDhv2cJnV6SIgx51jF sRBfy6Q8sVguwYypCVIRYrZLNPmtJ6V2nOI5GqQQlqnNXGaPm8IslsFLk+gL7Awu Dmk9/MROAm6FlEw+jk8eg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv peegnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:19 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:54 +0800 Message-ID: <435c72f590aa854b9072c5967eabfd1cbc6c8bcb.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-validationlayers): Update to 1.3.280.0. [source]: Add snippet. [inputs]: Add robin-hood-hashing and vulkan-utility-libraries. [arguments]: Remove configure-flags, replace check step, and update reason why disabling tests. Change-Id: I80ca002d8dbe71cad57f859ee34ac8f10e175907 --- gnu/packages/vulkan.scm | 55 ++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6239f7ea4d..1016e9db36 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -47,9 +47,6 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages wine) #:use-module (gnu packages xorg)) -;; Note: Remember to change vulkan-loader version when bumping this. -(define %vulkan-sdk-version "sdk-1.3.231.1") - (define-public spirv-headers (package (name "spirv-headers") @@ -478,51 +475,37 @@ (define-public vkd3d (define-public vulkan-validationlayers (package (name "vulkan-validationlayers") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-ValidationLayers") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + ;; We don't build static libraries in SPIRV-Tools. + (snippet '(substitute* "tests/CMakeLists.txt" + (("-static") + ""))) (sha256 (base32 - "07djrk6yym4vl2b52wr09r8y649v5lark5hnr5rwvlxwxdmd9g75")))) + "1w6fsaicrgnzkj5vz2v86a2gk1n7478q6n66ac2920avnin9a64c")))) (build-system cmake-build-system) (inputs (list glslang libxrandr mesa + robin-hood-hashing shaderc spirv-tools vulkan-loader + vulkan-utility-libraries wayland)) - (native-inputs (list pkg-config python spirv-headers vulkan-headers)) + (native-inputs (list googletest pkg-config python spirv-headers vulkan-headers)) (arguments - (list #:tests? #f ;no tests + (list #:tests? #f ; test crashed #:configure-flags - #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF" - (string-append "-DGLSLANG_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/glslang")))) - (string-append "-DSPIRV_HEADERS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/spirv")))) - (string-append "-DSPIRV_TOOLS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/spirv-tools")))) - (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/vulkan")))) - "-Wno-dev") + #~(list "-DBUILD_TESTS=ON") #:phases #~(modify-phases %standard-phases (add-after 'install 'set-layer-path-in-manifest (lambda _ @@ -532,7 +515,17 @@ (define-public vulkan-validationlayers (substitute* manifest (("\"libVkLayer_khronos_validation.so\"") (string-append "\"" #$output - "/lib/libVkLayer_khronos_validation.so\""))))))))) + "/lib/libVkLayer_khronos_validation.so\"")))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "VK_LAYER_PATH" (string-append (getcwd) "/layers")) + (setenv "LD_LIBRARY_PATH" + (string-append #$(this-package-input "vulkan-loader") "/lib")) + (setenv "MESA_SHADER_CACHE_DIR" + (string-append (getcwd) "/shader-cache")) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (invoke "./tests/vk_layer_validation_tests"))))))) (home-page "https://github.com/KhronosGroup/Vulkan-ValidationLayers") (synopsis "Khronos official validation layers for Vulkan") (description