From patchwork Sun Oct 16 16:51:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 43447 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 E5E4B27BBEA; Sun, 16 Oct 2022 17:53:09 +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 5E24727BBE9 for ; Sun, 16 Oct 2022 17:53:09 +0100 (BST) Received: from localhost ([::1]:38832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ok6su-000467-IC for patchwork@mira.cbaines.net; Sun, 16 Oct 2022 12:53:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ok6so-00045y-BX for guix-patches@gnu.org; Sun, 16 Oct 2022 12:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ok6so-0006dQ-4H for guix-patches@gnu.org; Sun, 16 Oct 2022 12:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ok6sn-0001T2-UL for guix-patches@gnu.org; Sun, 16 Oct 2022 12:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58566] [PATCH core-updates] gnu: mesa: Update to 22.2.1. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 16:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58566 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58566@debbugs.gnu.org Cc: Kaelyn Takata X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16659391335570 (code B ref -1); Sun, 16 Oct 2022 16:53:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Oct 2022 16:52:13 +0000 Received: from localhost ([127.0.0.1]:45983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ok6s0-0001Rl-L9 for submit@debbugs.gnu.org; Sun, 16 Oct 2022 12:52:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:45078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ok6ry-0001Re-Q0 for submit@debbugs.gnu.org; Sun, 16 Oct 2022 12:52:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ok6ry-00043r-KU for guix-patches@gnu.org; Sun, 16 Oct 2022 12:52:10 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:32577) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ok6rw-0006aB-VF for guix-patches@gnu.org; Sun, 16 Oct 2022 12:52:10 -0400 Date: Sun, 16 Oct 2022 16:51:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1665939120; x=1666198320; bh=5qGgXWEGnAw51893jRLGZBBNOVwYAKwjBZEkZavTbS8=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=W+VZtg7pX+bgu7nEhRfel9yevW7F99iERjb2eSrUzGHSyX2NcpLSZOj0H25Q8a//6 wN+2RWAOEtUst6bSY4MnsQiycN2ThgnW+oJIMxxb6TY2yubTCEEfAQQMfVbFx2T//F 2Z6vU/M+Nd44jFORaiWoi7KuQ8SOPY9bi0kvnAGccLZr5DoyzmNfjr2zBTZ1N8IqjH 22HxaHCEQEaDfB7I7cmkNKl7vMXf3XZuHlB22ztP28v76Y+xXMVwYFwT3AR1iDisih W83BlgspmsQdh6dPGZIDVaYrwJm6ffhgBip14As3Uyf62ByyX8lREjvw0IzEs7K/1I ieZzLyHOsXetw== Message-ID: <20221016165127.23333-1-kaelyn.alexi@protonmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.16; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-4316.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/gl.scm (mesa): Update to 22.1.7. [phases]: Add phase to insert the full store path to the vulkan layer shared libraries into the layer manifests so the vulkan loader can find the layer shared libraries. --- gnu/packages/gl.scm | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) -- 2.37.3 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 7810d1d8ae..895c9c1b54 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -267,7 +267,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "22.1.7") + (version "22.2.1") (source (origin (method url-fetch) @@ -279,7 +279,7 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "12ax6lmshc8aqzw5ca7ab7f7z64n9nyzci4r1s6y1l0iryr8x0ys")))) + "0g5ij57ljh3l04qf7qpildl45g5g7s8ycngc19z5xx1k1anbwy80")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. @@ -488,7 +488,28 @@ (define-public mesa file) (symlink reference file))) others)))) - (delete-duplicates inodes)))))))) + (delete-duplicates inodes))))) + (add-after 'install 'set-layer-path-in-manifests + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (implicit-path (string-append + out + "/share/vulkan/implicit_layer.d/")) + (explicit-path (string-append + out + "/share/vulkan/explicit_layer.d/")) + (fix-layer-path + (lambda (layer-name) + (let* ((explicit (string-append explicit-path layer-name ".json")) + (implicit (string-append implicit-path layer-name ".json")) + (manifest (if (file-exists? explicit) + explicit + implicit))) + (substitute* manifest + (((string-append "\"lib" layer-name ".so\"")) + (string-append "\"" out "/lib/lib" layer-name ".so\""))))))) + (for-each fix-layer-path '("VkLayer_MESA_device_select" + "VkLayer_MESA_overlay")))))))) (home-page "https://mesa3d.org/") (synopsis "OpenGL and Vulkan implementations") (description "Mesa is a free implementation of the OpenGL and Vulkan