From patchwork Wed Feb 28 17:31:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61231 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 B790327BBEA; Wed, 28 Feb 2024 17:42:48 +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 E35D727BBE2 for ; Wed, 28 Feb 2024 17:42:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNx0-00006P-J0; Wed, 28 Feb 2024 12:42:38 -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 1rfNwx-000062-QL for guix-patches@gnu.org; Wed, 28 Feb 2024 12:42:36 -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 1rfNwx-0005Og-Hh for guix-patches@gnu.org; Wed, 28 Feb 2024 12:42:35 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNxO-0007js-5a for guix-patches@gnu.org; Wed, 28 Feb 2024 12:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 12/13] gnu: vulkan-validationlayers: 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:43:02 +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.170914212229608 (code B ref 69461); Wed, 28 Feb 2024 17:43:02 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:42:02 +0000 Received: from localhost ([127.0.0.1]:57057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNwP-0007hN-KK for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:42:02 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:54747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNwJ-0007gc-KY for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:42:00 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfout.west.internal (Postfix) with ESMTP id CF30C1C00096 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:37 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 28 Feb 2024 12:32:37 -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=1709141557; x= 1709227957; bh=ZriR4D8hQpB9fMFAQVvQLaNs4FH7aHEUf+eFWcsSVbI=; b=X ZKLY2dm4Rz6ROPJXA8rkuhOPmg/aY2x8wgfHDHm/pzfS3k4NcRcoVFA39UJBrE3I Vh2sryyMzw34YGm3GTQc/fvT0tW7QJ0ftpFuause3LWYiA+gkcGtgjNNT9nJTNTi wRnPbpzV2IH78/SIdUyF1R3zyQz5KXLZYQGRkCcE5OHpmfVRit9uANdWL24sWedP aommH0E5XneiWgfJyaYtwlgCnKf9D+wPgRXlLFPJYFfk/tMVk3Nc5rlx2RabFJ8u ikAd5dQ2zvroTVUyEWMtpT/O8oUaym2g7Dk7vM/8iw4SZesgErwibiBDrwyK6en5 AQBSy/Sx97Gz5aUV6TmaA== 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=1709141557; x=1709227957; bh=ZriR4D8hQpB9f MFAQVvQLaNs4FH7aHEUf+eFWcsSVbI=; b=nwDRS5/O0AIGH+PcYScmMJSqZ2sMI lzAvqT07H462psGbbiooxP7d6EslTZqfE4sDgePoWjcoXsHFOZDrP6qE7yFj9Ss+ ezN9GMo3JAHd2q0G3Sbiz7udPdzTzp6TlTpphvHWMLWuhoUumH4WlChFMBhSyBdU wDrfx41oPQj+IGV/blWVEHGZ2NZD5zECQxbbH9mHxHHyCIFuA5jzP1/A6/bwsiyh 1LhntqQ7015j5slvJR0t5Au7gkyz456l30+kQ11mZJ+SING7ziuLXhkP3donZK4u XsW5X4rUMqhRsub1OfuutxjPwqNND8O/Ri5n3ZlKC7/cLdbSDDDSiqL8w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedu 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:35 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:45 +0800 Message-ID: <0af764f02fe999685998050a65aa66c341238d50.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-validationlayers): Update to vulkan-sdk-1.3.275.0. [source]: Add snippet. [inputs]: Add robin-hood-hashing and vulkan-utility-libraries. [arguments]: Remove configure-flags and update the reason why disable tests. Change-Id: I01e25a974a0d4b4c672a621e07c46bdb17baab42 --- gnu/packages/vulkan.scm | 74 +++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 44 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f8ffcddff3..599b0a47d3 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -37,6 +37,7 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages cmake) + #:use-module (gnu packages cpp) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -453,60 +454,45 @@ (define-public vulkan-validationlayers (package (name "vulkan-validationlayers") (version %vulkan-sdk-version) - (source (origin - (method git-fetch) - (uri (git-reference - (url - "https://github.com/KhronosGroup/Vulkan-ValidationLayers") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "07djrk6yym4vl2b52wr09r8y649v5lark5hnr5rwvlxwxdmd9g75")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/Vulkan-ValidationLayers") + (commit 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 "0j39j43siz6jwqai8miy0hgcz5b4lln9xfhk1vzds21kgn17r744")))) (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)) (arguments - (list #:tests? #f ;no tests - #: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") - #:phases #~(modify-phases %standard-phases - (add-after 'install 'set-layer-path-in-manifest - (lambda _ - (let ((manifest (string-append #$output - "/share/vulkan/explicit_layer.d" - "/VkLayer_khronos_validation.json"))) - (substitute* manifest - (("\"libVkLayer_khronos_validation.so\"") - (string-append "\"" #$output - "/lib/libVkLayer_khronos_validation.so\""))))))))) + (list + #:tests? #f ;Tests requires GPU driver + #:phases #~(modify-phases %standard-phases + (add-after 'install 'set-layer-path-in-manifest + (lambda _ + (let ((manifest (string-append #$output + "/share/vulkan/explicit_layer.d" + "/VkLayer_khronos_validation.json"))) + (substitute* manifest + (("\"libVkLayer_khronos_validation.so\"") + (string-append "\"" + #$output + "/lib/libVkLayer_khronos_validation.so\""))))))))) (home-page "https://github.com/KhronosGroup/Vulkan-ValidationLayers") (synopsis "Khronos official validation layers for Vulkan") (description