From patchwork Wed Oct 19 00:42:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 43699 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 C7FAF27BBEA; Wed, 19 Oct 2022 01:43:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 8C8D827BBE9 for ; Wed, 19 Oct 2022 01:43:35 +0100 (BST) Received: from localhost ([::1]:40814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okxBG-00078a-Mk for patchwork@mira.cbaines.net; Tue, 18 Oct 2022 20:43:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okxAm-000750-9D for guix-patches@gnu.org; Tue, 18 Oct 2022 20:43:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okxAm-0000rF-1O for guix-patches@gnu.org; Tue, 18 Oct 2022 20:43:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1okxAl-000569-RY for guix-patches@gnu.org; Tue, 18 Oct 2022 20:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58617] [PATCH core-updates 5/8] gnu: vulkan-loader: Update to 1.3.224.1. References: <20221019003957.31382-1-kaelyn.alexi@protonmail.com> In-Reply-To: <20221019003957.31382-1-kaelyn.alexi@protonmail.com> Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Oct 2022 00:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58617 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58617@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 58617-submit@debbugs.gnu.org id=B58617.166614016319524 (code B ref 58617); Wed, 19 Oct 2022 00:43:03 +0000 Received: (at 58617) by debbugs.gnu.org; 19 Oct 2022 00:42:43 +0000 Received: from localhost ([127.0.0.1]:55174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okxAR-00054p-83 for submit@debbugs.gnu.org; Tue, 18 Oct 2022 20:42:43 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:38817) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okxAP-00054c-D7 for 58617@debbugs.gnu.org; Tue, 18 Oct 2022 20:42:41 -0400 Date: Wed, 19 Oct 2022 00:42:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1666140155; x=1666399355; bh=JoW57lwro6x3ByCVSY6gX7CJUKQywW0mxouiX6MqsNQ=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=BCAC28rMzZvMkJCO9hx59Kqtf13v/l1+SUuDHZF53ZYUu+Gn2zY51a0C4Ng70F4Oo 3JY/fsFk9lVhDN9Ajx3pYFa2M+2JGAu3e+7Pm4+rWjwrE0hCZQeh9g/l0/TN6Pggv5 7K/eQDjwLxtxGqqmp6BzzVufd66aVCborjxRBylYCmT4zIIR7S9nN3PMpWE3uYcii0 ngs+r/JYr9+azv4Af/0OdOrl1aIJkCcmlwnyY2lrSBtgpC2kSbJCCPpIaJaK31STmw z0PAq2HkB/gKwiBLpr89k9Cr9UgLSys7O+DeI25JVGhnxm4D68ISSb8ffwS1gbARFd 7w5MkoS/K9TnA== Message-ID: <20221019004136.32677-5-kaelyn.alexi@protonmail.com> Feedback-ID: 34709329:user:proton 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" Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vulkan.scm (vulkan-loader): Update to 1.3.224.1. [arguments]: Enable tests by removing the obsolete build phase 'disable-loader-tests and adjusting configure flags. --- gnu/packages/vulkan.scm | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) -- 2.37.3 diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 976e43456b..560475c273 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -208,42 +208,32 @@ (define-public vulkan-headers (define-public vulkan-loader (package (name "vulkan-loader") - (version "1.2.162") + (version "1.3.224.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Loader") - (commit (string-append "v" version)))) + (commit (string-append "sdk-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "15gx9ab6w1sjq9hkpbas7z2f8f47j6mlln6p3w26qmydjj8gfjjv")))) + "1xqhqd37y1msaq6bz0ksc7z36sgm19p5bkscdk07dc58yyc4hrwn")))) (build-system cmake-build-system) (arguments `(#:configure-flags ,#~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" #$(this-package-input "vulkan-headers")) - (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" - #$(this-package-input "vulkan-headers") - "/include")) + (string-append "-DGOOGLETEST_INSTALL_DIR=" + (getcwd) "/source/external/googletest") + "-DBUILD_TESTS=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-googletest (lambda* (#:key inputs #:allow-other-keys) (let ((gtest (assoc-ref inputs "googletest:source"))) (when gtest - (copy-recursively gtest "external/googletest")) - #t))) - (add-after 'unpack 'disable-loader-tests - (lambda _ - ;; Many tests require a Vulkan driver. Skip those. - (substitute* "tests/loader_validation_tests.cpp" - ((".*= vkCreateInstance.*" all) - (string-append "GTEST_SKIP();\n" all)) - (("TEST_F.*InstanceExtensionEnumerated.*" all) - (string-append all "\nGTEST_SKIP();\n"))) - #t))))) + (copy-recursively gtest "external/googletest")))))))) (native-inputs `(("googletest:source" ,(package-source googletest)) ("libxrandr" ,libxrandr)