From patchwork Thu Sep 1 16:27:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 42127 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 B0C0327BBEA; Thu, 1 Sep 2022 18:22:04 +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 6320A27BBE9 for ; Thu, 1 Sep 2022 18:22:04 +0100 (BST) Received: from localhost ([::1]:42162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTntD-0007BO-JU for patchwork@mira.cbaines.net; Thu, 01 Sep 2022 13:22:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTn2x-0002kf-Um for guix-patches@gnu.org; Thu, 01 Sep 2022 12:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTn2x-0001ds-5v for guix-patches@gnu.org; Thu, 01 Sep 2022 12:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTn2w-0006Oo-Rv for guix-patches@gnu.org; Thu, 01 Sep 2022 12:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57297] [PATCH v2 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: Thu, 01 Sep 2022 16:28: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.166204964324506 (code B ref 57297); Thu, 01 Sep 2022 16:28:02 +0000 Received: (at 57297) by debbugs.gnu.org; 1 Sep 2022 16:27:23 +0000 Received: from localhost ([127.0.0.1]:43979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTn2J-0006NC-HK for submit@debbugs.gnu.org; Thu, 01 Sep 2022 12:27:23 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:31705) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTn2I-0006Mx-DK for 57297@debbugs.gnu.org; Thu, 01 Sep 2022 12:27:22 -0400 Date: Thu, 01 Sep 2022 16:27:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1662049636; x=1662308836; bh=m/fPSnETPDhn0SRdH68+ZD2lh1K16PcnsM5dJKVYQxs=; 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=TgLiOviD/fHLbwf/rS67NJfDJ+LTRoz2DmYjUs2QAWrESmFQ5stW7D9fKs/Ur/VR3 VFNgOoiv0BiV2t2eqO57BJig6AXH5YuHKJ0yiezXYbtttXB8Og+T2G9gshn/aiHoYC bxbrgqMaHRFh/RpSOOqLwXvWxc4zid2k4Su1jsZV/si0dxrLFggpm+ke0b8t7eNcDn SB1gxs/DNgiDgX5MMxO/9sDCtrehbheVqaS8P0MpOyZogrMy3BDva//C0NLYs27iid yPw7FnapL0CDu1IWpbKhobL2ejESMiLo3xOmMzP2LRrjRoT3Ta5tGEvQQa2cfrfvj7 uUNUKtRacG/CQ== Message-ID: <5da294ee2052a5a5d1f1d2ca62c58c988d894c93.1662049085.git.kaelyn.alexi@protonmail.com> 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. [arguments]: Enable tests by removing obsolete build phase 'disable-loader-tests and adjusting configure flags. --- 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)