From patchwork Wed Feb 28 17:31:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61221 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 3830927BBEA; Wed, 28 Feb 2024 17:33:02 +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 6307E27BBE2 for ; Wed, 28 Feb 2024 17:32:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNnP-0005DW-Ei; Wed, 28 Feb 2024 12:32:43 -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 1rfNnL-0005Cr-BM for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:39 -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 1rfNnK-00022A-OM for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNnl-0007Ef-Ak for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 07/13] gnu: vulkan-loader: 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:33:05 +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.170914158027760 (code B ref 69461); Wed, 28 Feb 2024 17:33:05 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:00 +0000 Received: from localhost ([127.0.0.1]:56337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnf-0007DS-4E for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:00 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:50943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnb-0007Ce-Ql for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:56 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfout.west.internal (Postfix) with ESMTP id 7C76C1C00084 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:23 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 28 Feb 2024 12:32:23 -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=1709141543; x= 1709227943; bh=hCu+MciDf/k7Xb8B2H//k+erTsR2Ap65+g2nJu1lEBU=; b=T /AfM3eaS2xc3c9OEQHcX5Udb7zohplvFVojH2GQT0+uPBnDCaOKEbozBRK7LAyDj U/soO8tssDzVehC+plewM2zG0NEshX+sUAqXxNgKP8GvB/ULOn6FhzOKadgH+6vr i2OUvjcw/ekWjeyB9F/tKgYNU2CCu/zR0Kkz5pY2pE8rPC/iiVBsafcJbckQC1R8 Cx+eH893M/tppBue11tZLfJh7SIfg1vnV7F+bUvnjpPl2X1P/CwphrJCBAf+j0Ie 6TAJIJK94DZX71PxPwfSgYGN8QtKY36lOJq4RpLR6U5akHrLre+8b+g8aysOjDSe Tvgmd7GG9eISdN5CAyTTw== 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=1709141543; x=1709227943; bh=hCu+MciDf/k7X b8B2H//k+erTsR2Ap65+g2nJu1lEBU=; b=CDsDoZUcRIeANC1cFtiTKSMj9Ry6k v/HGjqfDDiO2cKdZO2cNHlMcZ2CMR3EmtYFs7YeFOOUfUEUB8lafc9kZuTab/ZAo yn96hRZZOhO6MC7xq38+soxtyCOVOcvjlX8fJaIT1CE4PPJW14WToN+LXuPA5zdh tK3o4hbuTsABfkkrkhtbHYtlCAxryL+1h+RXrb1tbcxT3zl6MFSFy9HRreNhftmR rZrWad27pmPZFbEdkP9RFxd7KZV4RCqsAl55imQ6ANjs9Ub1ykvaqbA1gPPvBLxZ LYGF8eb5IsuS7vRykh1FzKE/LDmd+ezqOOnic9d37o1d94TzT9uLhM1lw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepudekheduvdejjeduhedtgeelveffledvuddvkeehhffftdelhedvkeekveegve einecuffhomhgrihhnpehgihhthhhusgdrtghomhdpphgtrdhinhenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs 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:21 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:40 +0800 Message-ID: <8f806fbbb811debf1f63899fc8a882b4ac8ec723.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-loader): Update to vulkan-sdk-1.3.275.0. [arguments]<#:phases>: Change the place setting system googletest. [native-search-paths]: export XDG_DATA_DIRS. Change-Id: Ibd74e303a2be4f972917c2e88367eca7db6fbc5b --- gnu/packages/vulkan.scm | 86 ++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 49 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ea02d9887b..8e162402fa 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -46,7 +46,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 "vulkan-sdk-1.3.275.0") (define-public spirv-headers @@ -245,19 +244,16 @@ (define-public vulkan-headers (define-public vulkan-loader (package (name "vulkan-loader") - ;; XXX: Take a slightly newer commit to fix a test failure on i686: - ;; https://github.com/KhronosGroup/Vulkan-Loader/pull/1036 - (version "sdk-1.3.232") + (version %vulkan-sdk-version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Loader") - (commit "v1.3.232"))) + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2")))) + (base32 "0kcq6xsm151mk08vvqjlhj5mfxv4zgq35a2yi4f7yax20mfd8wz7")))) (build-system cmake-build-system) (arguments (list @@ -265,45 +261,38 @@ (define-public vulkan-loader ;; Limit the tests to those architectures tested upstream. #:tests? (and (%current-system) (target-x86?)) - #:configure-flags - #~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs "include/vulkan")))) - #$@(if (%current-target-system) - #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF") - #~("-DBUILD_TESTS=ON"))) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-pkg-config-file - (lambda* (#:key inputs #:allow-other-keys) - (let ((vulkan-headers (dirname (search-input-directory - inputs "include/vulkan")))) - ;; Ensure the pkg-config file refers to vulkan-headers. - (substitute* "loader/vulkan.pc.in" - (("^includedir=.*") - (string-append "includedir=" vulkan-headers "\n")))))) - (add-after 'unpack 'use-system-googletest - (lambda _ - ;; Inform the build system that googletest is already built. - (substitute* "CMakeLists.txt" - ((".*if\\(TARGET gtest\\)") - (string-append " find_package(GTest REQUIRED)\n" - " if(true)"))) - ;; Use the namespaced variable. - (substitute* "tests/framework/CMakeLists.txt" - (("PUBLIC gtest ") - "PUBLIC GTest::gtest "))))))) - (native-inputs - (list googletest - libxrandr - pkg-config - python - wayland)) - (inputs - (list vulkan-headers libxrandr)) - (home-page - "https://github.com/KhronosGroup/Vulkan-Loader") + #:configure-flags #~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" + (dirname (dirname (search-input-directory + %build-inputs + "include/vulkan")))) + #$@(if (%current-target-system) + #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF") + #~("-DBUILD_TESTS=ON"))) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-pkg-config-file + (lambda* (#:key inputs #:allow-other-keys) + (let ((vulkan-headers (dirname (search-input-directory + inputs "include/vulkan")))) + ;; Ensure the pkg-config file refers to vulkan-headers. + (substitute* "loader/vulkan.pc.in" + (("^includedir=.*") + (string-append "includedir=" vulkan-headers "\n")))))) + (add-after 'unpack 'use-system-googletest + (lambda _ + (substitute* "tests/CMakeLists.txt" + (("message\\(FATAL_ERROR \"Could not find googletest directory. See BUILD.md\"\\)") + "find_package(GTest REQUIRED)")) + ;; Use the namespaced variable. + (substitute* "tests/framework/CMakeLists.txt" + (("PUBLIC gtest ") + "PUBLIC GTest::gtest "))))))) + (native-inputs (list googletest libxrandr pkg-config python wayland)) + (inputs (list vulkan-headers libxrandr)) + (native-search-paths + (list (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))))) + (home-page "https://github.com/KhronosGroup/Vulkan-Loader") (synopsis "Khronos official ICD loader and validation layers for Vulkan") (description "Vulkan allows multiple @dfn{Installable Client Drivers} (ICDs) each @@ -313,9 +302,8 @@ (define-public vulkan-loader and the ICD.") ;; This software is mainly Apache 2.0 licensed, but contains some components ;; covered by other licenses. See COPYRIGHT.txt for details. - (license (list license:asl2.0 ;LICENSE.txt - (license:x11-style "file://COPYRIGHT.txt") - license:bsd-3)))) + (license (list license:asl2.0 ;LICENSE.txt + (license:x11-style "file://COPYRIGHT.txt") license:bsd-3)))) (define-public vulkan-tools (package