From patchwork Fri Aug 19 14:51:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 41774 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 4E57927BBE9; Fri, 19 Aug 2022 15:52:25 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 B538627BBED for ; Fri, 19 Aug 2022 15:52:17 +0100 (BST) Received: from localhost ([::1]:49448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oP3M8-0004jM-TO for patchwork@mira.cbaines.net; Fri, 19 Aug 2022 10:52:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP3Lu-0004ao-Ta for guix-patches@gnu.org; Fri, 19 Aug 2022 10:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oP3Lu-00072n-Kh for guix-patches@gnu.org; Fri, 19 Aug 2022 10:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oP3Lu-0000Zk-HI for guix-patches@gnu.org; Fri, 19 Aug 2022 10:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57297] [PATCH 4/7] gnu: vulkan-loader: Update to 1.2.202. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Aug 2022 14:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57297 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57297@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 57297-submit@debbugs.gnu.org id=B57297.16609206792109 (code B ref 57297); Fri, 19 Aug 2022 14:52:02 +0000 Received: (at 57297) by debbugs.gnu.org; 19 Aug 2022 14:51:19 +0000 Received: from localhost ([127.0.0.1]:59072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oP3LD-0000Xx-HT for submit@debbugs.gnu.org; Fri, 19 Aug 2022 10:51:19 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:13467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oP3LB-0000Xe-Kd for 57297@debbugs.gnu.org; Fri, 19 Aug 2022 10:51:18 -0400 Date: Fri, 19 Aug 2022 14:51:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1660920671; x=1661179871; bh=2rUsiImT2tkEPykYIgaQZ4YXSTe57Mi2CwjTCWhDr/U=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=ieS1NdXowT/59Z8CZNwHxuLYRUHgWO4ShteREP0fdxbwZEuQo0MLQiaiKK8e+3q5w 0TVEIWH/rEum/c2tijN7o1uQMRehpcp3LQqHlgYM2n/bDlaE5r/YF0UnJgRNuTnlVQ 0v9T9c6gu8n6Vp+au0JGR3MC62RS50c9NvG9huPg52DaHqzeJdG/Q2um23GrR/3U8x HrXSTXAhdwe0c7/E7IV9zbjEFswcRamd7/muWhqrUDnLZWihjQf5Fp24rh6kSTCRF2 BL4rmFxfp1//Awwso85Rv1O5ErmP+weTRzf+TCzr/S/8/eF0odGznjzOCgcvjBblA1 8O1c3OVt1gKbA== Message-ID: In-Reply-To: References: 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.2.202. --- gnu/packages/vulkan.scm | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) -- 2.37.2 diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 61cbcf8411..74432298f8 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -207,7 +207,7 @@ (define-public vulkan-headers (define-public vulkan-loader (package (name "vulkan-loader") - (version "1.2.162") + (version "1.2.202") (source (origin (method git-fetch) @@ -217,32 +217,23 @@ (define-public vulkan-loader (file-name (git-file-name name version)) (sha256 (base32 - "15gx9ab6w1sjq9hkpbas7z2f8f47j6mlln6p3w26qmydjj8gfjjv")))) + "1vsaa16clncz19lihgj39rdg4dspkxjay1ii6pkf6fpl1vkw1dh2")))) (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))))) + #t)))))) (native-inputs `(("googletest:source" ,(package-source googletest)) ("libxrandr" ,libxrandr)