From patchwork Thu Mar 28 03:54:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62321 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 802EB27BBEA; Thu, 28 Mar 2024 03:58:07 +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 B86E427BBE2 for ; Thu, 28 Mar 2024 03:58:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt3-000142-FK; Wed, 27 Mar 2024 23:57:09 -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 1rpgt0-00012X-WA for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:07 -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 1rpgt0-0008B7-N6 for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt1-0001HI-5E 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 07/13] gnu: vulkan-loader: 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.17115981904667 (code B ref 69461); Thu, 28 Mar 2024 03:57:07 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:30 +0000 Received: from localhost ([127.0.0.1]:38708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsP-0001D9-U5 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:30 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:43945) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs9-0001Al-WD for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:14 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 7F16818000DC; Wed, 27 Mar 2024 23:56:07 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:07 -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=1711598167; x= 1711684567; bh=jDywyIHbhA2arnXlo+d8GWHtLaAU6N8wrOk8lVAr1mc=; b=h 3tqkvfeZiapzuRtIrDrzOsvoL35XF/3iaytDfMCwBItMBblociSAKRgL3SNgt8qn NUmUtEtTUsfS9omahMLICW4KUVaNj2NL5b9va6AEvOqzchT5/u3ZZMytlmaWPg5g /4w14MACXkap8fSb0VAl5NmAtWNyMQ0bAsav9iJ0XOHIglFFFpyDRA4eahRbdSiq wQoni7GrionJ5FAtDZ0cfQVJEbPmC+cyiaGqKu87XtlIdQhzb/h+ennXB1WTGz5W dLBRkOUNPTep4DgjqkLmM70oK+zZvIr74slm28uo4ZhQHh0yBtozKQymC+pc1Gn4 8AF9LFCD/pu71l/3rwSeA== 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=1711598167; x= 1711684567; bh=jDywyIHbhA2arnXlo+d8GWHtLaAU6N8wrOk8lVAr1mc=; b=j wQGdwcXCncIj31+2A8Ct2jikeJOwpZe4wFxkOKT/wbwRPKvlqZnkI1QWczZ4wlUp 9OmKI5edT1OFbCCUIIxtc8/S7XJg1MIa7o4LQkquULE487c1e607Jbr8+Qa4tGZG ZoiKMffzs35OHiFWGBqaxc6N7qFpJaEl9PQPE20dlEfHGcrnF+Cc4DFx0D83Ys0q 7Rx9NA1fzeNDnST2lb1UJ5WdhJ5vak9MUn0zeEZX8DiV2VQh+PjQy5nENFgUbfQb VtzIaZPBhu/wW5O8EmutG3iZyNqqBcoadSl2E+K+kgzZ4WheolCY5siTg9cKsI6/ 7wgCnWjD1+I5MJO+hysXQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:05 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:49 +0800 Message-ID: <18e4585ccf2c39b8905de5e679be296c7cc3bde1.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-loader): Update to 1.3.280.0. [arguments]<#:phases>: Change the place setting system googletest. [native-search-paths]: export XDG_DATA_DIRS. Change-Id: Ib270eeeea6500691a75c36612104c7ddb1c28dfb --- gnu/packages/vulkan.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 3324e8bf45..14e50c59c6 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -251,19 +251,17 @@ (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 "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Loader") - (commit "v1.3.232"))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2")))) + "0glix3clqkdbi9kqcp8abmglqpgjd2r2bjqvi11r8sair0z54hnf")))) (build-system cmake-build-system) (arguments (list @@ -291,11 +289,9 @@ (define-public vulkan-loader (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)"))) + (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 ") @@ -308,6 +304,10 @@ (define-public vulkan-loader 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")