From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id MIFoGPMYUGNTEwAAbAwnHQ (envelope-from ) for ; Wed, 19 Oct 2022 17:34:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iAUZGPMYUGPlXgAAauVa8A (envelope-from ) for ; Wed, 19 Oct 2022 17:34:11 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E87B91104B for ; Wed, 19 Oct 2022 17:34:10 +0200 (CEST) Received: from localhost ([::1]:36546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olB57-0005Qy-Lo for larch@yhetil.org; Wed, 19 Oct 2022 11:34:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olB42-0005JT-Jm for guix-patches@gnu.org; Wed, 19 Oct 2022 11:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olB42-0004fR-7w for guix-patches@gnu.org; Wed, 19 Oct 2022 11:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1olB42-0000pf-1w for guix-patches@gnu.org; Wed, 19 Oct 2022 11:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58566] [PATCH core-updates v2 1/1] gnu: mesa: Update to 22.2.1. References: <20221016165127.23333-1-kaelyn.alexi@protonmail.com> In-Reply-To: <20221016165127.23333-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 15:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58566 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58566@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 58566-submit@debbugs.gnu.org id=B58566.16661935553158 (code B ref 58566); Wed, 19 Oct 2022 15:33:02 +0000 Received: (at 58566) by debbugs.gnu.org; 19 Oct 2022 15:32:35 +0000 Received: from localhost ([127.0.0.1]:59768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olB3b-0000os-0w for submit@debbugs.gnu.org; Wed, 19 Oct 2022 11:32:35 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:63289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olB3W-0000oa-AJ for 58566@debbugs.gnu.org; Wed, 19 Oct 2022 11:32:33 -0400 Date: Wed, 19 Oct 2022 15:32:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1666193544; x=1666452744; bh=AxDX7/UCVvdoeBCoA1Er2pNC7OlOtsOMzPQvXx6YZv0=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=pTCu9MIPyMWJqJzGIUSCcq1gTHKSLy/uVq4gKnvh0jkxBolOGnXNeWTb2s48oWKgJ 5X4IgHespR0Klr9p1Rg+5LIVOPaxFUhk+rECLQcV+gQ6pKV3Qz1vumgEqK5m7cPBoK 7pEK7iXSzxI/Bw9Ut/mmV7+LTCUCxGm5YXyE5JO3DE12j43RS6aurDNELaVyXvIRWY 6gPVpCb9Ysz/1XeW4NUUqBF3dbBMHOpOvcLIhc45yVb3SsYaAvbg7FrKAIsp5OgSSh VK4DRt/af+gE9MSzhluU18Z5m+1hQi6aHKr9hQjd4RU8XYKnn3i/75HfkoIR4ZJB9I KCTe4oZ2LDRyw== Message-ID: <20221019153158.26970-2-kaelyn.alexi@protonmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches From: Kaelyn Takata via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1666193651; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=AxDX7/UCVvdoeBCoA1Er2pNC7OlOtsOMzPQvXx6YZv0=; b=Lcao0NnXLCv2528kpvqSHF8C+XNw14ViMN2BNCAKzo4cW3chXZq4n4PSn5RxNcIZVAkQgt zJ0XwAUX6Cg4k7T4l9J3cubJoGAOFDnxLZIhVSptjMJzQgELgyXMzVZV/8XtkQIASQwn+l Ts90dya/WLeDGKU2AJr0F82Hc5ZTNdvj5H9fwF4K1LXpthFmLXTjQMYmYhyUbt6xKNGYgc 7PxSB4BaWUqEzT4F+A0r5XOv8ofR82ZWPqhPKdgaY7ePlzY+eo0Pnwzp+S8V4ztaT3u3ei 4Z3JLfDLa92qfB5Q95yHMOK8szc7ibLL08nR7VKAlkQpDa5NKX7Nk6xltroM7Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1666193651; a=rsa-sha256; cv=none; b=NqQSQN2XLdSq0HwHs3sKz7WJ4kzCLFGKfpVuSfRc+kq819w9HASXAs9+qjkYbT1B5ucGsf /93vaxF6j+TAogNLdrILbPo89OZChiEPZFnBlmQtsVXE/ejUAfqLqlwFWf+YCxkq1nt9WI 19S6iHoxylg05tE7xKI8QKklTPIYxl0C9W/kcPsJLl1n1ruwQKrZYMRrnG0tHE8b8TaBle t7umsorMtgEeqPJjMwHW5npEsnKkEtClRdaiv2MmwCbFAxRnHVOpnH5+rKMGvZsViMzBQX uhqhfE6sK68CaIR8ghOOm5jUtx/limT64aDVEabUfIyOFbaB7f7W9ZCepXzlGA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=pTCu9MIP; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.93 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=pTCu9MIP; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: E87B91104B X-Spam-Score: -1.93 X-Migadu-Scanner: scn1.migadu.com X-TUID: TEilmLjKTdVC * gnu/packages/gl.scm (mesa): Update to 22.2.1. [phases]{fix-instrfromstring-test}: New phase. Fix the instrfromstring test which fails on i686 using the upstream change. [phases]{set-layer-path-in-manifests}: New phase. Insert the full store path to libVkLayer_MESA_overlay.so into the manifest VkLayer_MESA_overlay.json so that the vulkan layer can be used without special workarounds. --- gnu/packages/gl.scm | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 7810d1d8ae..b89510c476 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -17,6 +17,7 @@ ;;; Copyright =C2=A9 2021 Ivan Gankevich ;;; Copyright =C2=A9 2021, 2022 John Kehayias ;;; Copyright =C2=A9 2022 Petr Hodina +;;; Copyright =C2=A9 2022 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. ;;; @@ -267,7 +268,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 +280,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. @@ -426,6 +427,15 @@ (define-public mesa (("'lp_test_arit', ") "")))) (_ '((display "No tests to disable on this architecture.\n"= )))))) + ,@(if (string=3D? (%current-system) "i686-linux") + '((add-after 'disable-failing-test 'fix-instrfromstring-tes= t + (lambda _ + ;; The instrfromstring test fails on i686, which has = been already + ;; fixed upstream but not in 22.2.1. + ;; TODO: remove on update + (substitute* "src/gallium/drivers/r600/sfn/sfn_instr_= export.cpp" + (("buf\\[6\\]") "buf[6] =3D {0}"))))) + '()) (add-before 'configure 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -488,7 +498,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 -- 2.37.3