From patchwork Wed Jun 22 15:34:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 40248 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 115D627BBEA; Wed, 22 Jun 2022 16:37:38 +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 800A727BBE9 for ; Wed, 22 Jun 2022 16:37:37 +0100 (BST) Received: from localhost ([::1]:37300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o42QC-0004Xg-MQ for patchwork@mira.cbaines.net; Wed, 22 Jun 2022 11:37:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o42No-0003M7-SQ for guix-patches@gnu.org; Wed, 22 Jun 2022 11:35:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42459) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o42Nj-0008KM-Nj for guix-patches@gnu.org; Wed, 22 Jun 2022 11:35:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o42Nj-0004Sg-L4 for guix-patches@gnu.org; Wed, 22 Jun 2022 11:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56150] [PATCH 1/2] gnu: mesa: Update to 22.1.2. References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jun 2022 15:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56150@debbugs.gnu.org" <56150@debbugs.gnu.org> Received: via spool by 56150-submit@debbugs.gnu.org id=B56150.165591209017098 (code B ref 56150); Wed, 22 Jun 2022 15:35:03 +0000 Received: (at 56150) by debbugs.gnu.org; 22 Jun 2022 15:34:50 +0000 Received: from localhost ([127.0.0.1]:36350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o42NM-0004RY-7B for submit@debbugs.gnu.org; Wed, 22 Jun 2022 11:34:50 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:59651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o42NJ-0004R9-IU for 56150@debbugs.gnu.org; Wed, 22 Jun 2022 11:34:38 -0400 Date: Wed, 22 Jun 2022 15:34:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1655912071; x=1656171271; bh=SdhgiQSbBZlFDggWxYrxLX/5oFSqALU1O3JTfQNS4Jk=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=K9meRX1viavxKCWqXglf2xRscxtYgdMg24wlFdDPdoxfKIVmri9mq6cY59rt5BvJJ MagzXqATT+6kzHY21X0PIqGz9XffONvr2w0yKRGsZWY4mHYts/T+7lnsf6uN1NBqjd lvO1PV6OOCkFjJlyQbs8zRFxLfmkK7TLXW7l04W7QRuoxq3zsabSYG7oI9dtuJAM5t of8wJoUbSsy6lSHlw+LR7pzDWl7d2nlUdE99XrlgBf1kkRNXH2woj4qcMmnHVChclh W/S8Y1W8rnQOWMqsfDEUZQVseRTlhZ2sSWqfBcAiO2PSGOKwvmIv+uQIx7JcN1woF7 zUYPtwUTANuww== Message-ID: <1OKhnGPP9yskCkMkUJ566lQQ0kPPm4zVMBtCdFxvPKMEeixjYGwu2Yt-0ZJdfmolGuIq-qPXn-pJe7xdgz9AuNrTdYeZEJfuLzcROMSWoAI=@protonmail.com> Feedback-ID: 7805494: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: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From e89039567166f84f14aab61fa2c0982ac9f40543 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 22 Jun 2022 11:09:33 -0400 Subject: [PATCH 1/2] gnu: mesa: Update to 22.1.2. * gnu/packages/gl.scm (mesa): Update to 22.1.2. [configure-flags]: Remove dri-drivers as from v22.0 the Mesa classic OpenGL drivers were removed. [phases]: Re-enable test that previously failed on i686. * gnu/packages/patches/mesa-skip-tests.patch: Update patch for current version. --- gnu/packages/gl.scm | 20 ++++---------------- gnu/packages/patches/mesa-skip-tests.patch | 19 +++++++++---------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c740c087dd..6c4594a9a1 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -261,7 +261,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "21.3.8") + (version "22.1.2") (source (origin (method url-fetch) @@ -273,7 +273,7 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "19wx5plk6z0hhi0zdzxjx8ynl3lhlc5mbd8vhwqyk92kvhxjf3g7")) + "1smrvvh8l7xcccwfbccx9k0ihzh1whrnnwsmqb7i0gba99mj4w89")) (patches (search-patches "mesa-skip-tests.patch")))) (build-system meson-build-system) @@ -357,15 +357,8 @@ (define-public mesa ;; Also enable the tests. "-Dbuild-tests=true" - ;; on non-intel systems, drop i915 and i965 - ;; from the default dri drivers - ,@(match (%current-system) - ((or "x86_64-linux" "i686-linux") - '("-Ddri-drivers=i915,i965,nouveau,r200,r100")) - (_ - '("-Ddri-drivers=nouveau,r200,r100"))) - - "-Dllvm=enabled") ; default is x86/x86_64 only + ;; Enable LLVM; default is x86/x86_64 only. + "-Dllvm=enabled") ;; XXX: 'debugoptimized' causes LTO link failures on some drivers. The ;; documentation recommends using 'release' for performance anyway. @@ -413,11 +406,6 @@ (define-public mesa ;; This test times out and receives SIGTERM. (substitute* "src/amd/common/meson.build" (("and not with_platform_windows") "and with_platform_windows")))) - ("i686-linux" - ;; Disable new test from Mesa 19 that fails on i686. Upstream - ;; report: . - `((substitute* "src/util/tests/format/meson.build" - (("'u_format_test',") "")))) ("aarch64-linux" ;; The ir3_disasm test segfaults. ;; The simplest way to skip it is to run a different test instead. diff --git a/gnu/packages/patches/mesa-skip-tests.patch b/gnu/packages/patches/mesa-skip-tests.patch index 7ff571dcf5..af61ea1658 100644 --- a/gnu/packages/patches/mesa-skip-tests.patch +++ b/gnu/packages/patches/mesa-skip-tests.patch @@ -5,15 +5,14 @@ completely with this patch: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4091 diff --git a/src/util/meson.build b/src/util/meson.build -index 319b22d9bf7..93790c72675 100644 +index 2a1028f0d3a..0d31f38b671 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -344,7 +344,7 @@ if with_tests - ) - endif - -- foreach t: ['bitset', 'register_allocate', 'u_debug_stack', 'u_qsort'] -+ foreach t: ['bitset', 'register_allocate', 'u_qsort'] - test( - t, - executable( +@@ -330,7 +330,6 @@ if with_tests + 'tests/set_test.cpp', + 'tests/sparse_array_test.cpp', + 'tests/u_atomic_test.cpp', +- 'tests/u_debug_stack_test.cpp', + 'tests/u_printf_test.cpp', + 'tests/u_qsort_test.cpp', + 'tests/vector_test.cpp', -- 2.36.1 From patchwork Wed Jun 22 15:34:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 40247 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 A97FF27BBEA; Wed, 22 Jun 2022 16:35:50 +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 364E327BBE9 for ; Wed, 22 Jun 2022 16:35:50 +0100 (BST) Received: from localhost ([::1]:35792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o42OT-0003O5-A0 for patchwork@mira.cbaines.net; Wed, 22 Jun 2022 11:35:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o42No-0003M8-SJ for guix-patches@gnu.org; Wed, 22 Jun 2022 11:35:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o42Nk-0008N9-6p for guix-patches@gnu.org; Wed, 22 Jun 2022 11:35:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o42Nk-0004So-4T for guix-patches@gnu.org; Wed, 22 Jun 2022 11:35:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56150] [PATCH 2/2] gnu: mesa: Update configure flags. References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jun 2022 15:35:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56150@debbugs.gnu.org" <56150@debbugs.gnu.org> Received: via spool by 56150-submit@debbugs.gnu.org id=B56150.165591210017122 (code B ref 56150); Wed, 22 Jun 2022 15:35:04 +0000 Received: (at 56150) by debbugs.gnu.org; 22 Jun 2022 15:35:00 +0000 Received: from localhost ([127.0.0.1]:36354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o42Ng-0004S4-Fr for submit@debbugs.gnu.org; Wed, 22 Jun 2022 11:35:00 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:37051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o42Nd-0004Rr-Io for 56150@debbugs.gnu.org; Wed, 22 Jun 2022 11:34:58 -0400 Date: Wed, 22 Jun 2022 15:34:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1655912091; x=1656171291; bh=PgNFBrJ1fBP9RudDzXCgJ9LMGyZ2L+JsGC3ngw+NDTk=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=h7r5efPJSwq7/n0EPe9XquQiDJFEQ1RTqAxVrPtokkvcCjW0hA8HUu2IW8ZVY97uj HYvlniNsdtCHWi3/3520n/hRAgqHmv0HIFJPg5Fv7rvzASH1sMHCMb8DZVguibmhKy 9njCZbviwsH/15v6w05VMWdNh9lUAXkTKmACU0PE++LPrHR7HMcfe0zefjXFU0bLma c5ZH8/nWhHFnbPnUk73KhL2vXNcHaCgRVvr2a8wKaPdWofXw8fsj8yAWUuVx7CFpx3 ulj0udLWsW/oOf9SyBPC1FM8orIlUsRNbrwL5adWbkOe/PfpIikPKFr1PdAC89i+dI 4x25JjR/gWfRQ== Message-ID: Feedback-ID: 7805494: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: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From e18f9c4c1a1875b3ce7a1c5e5585eb4512e7e468 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 22 Jun 2022 11:19:39 -0400 Subject: [PATCH 2/2] gnu: mesa: Update configure flags. * gnu/packages/gl.scm (mesa)[configure-flags]: Adjust the gallium-drivers and vulkan-drivers flags to use "auto" where it is available and enables at least the previously listed drivers. --- gnu/packages/gl.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 6c4594a9a1..a46e06827d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2020 Kei Kebreau ;;; Copyright © 2021 Ivan Gankevich -;;; Copyright © 2021 John Kehayias +;;; Copyright © 2021, 2022 John Kehayias ;;; Copyright © 2022 Petr Hodina ;;; ;;; This file is part of GNU Guix. @@ -320,10 +320,10 @@ (define-public mesa ("armhf-linux" ;; Freedreno FTBFS when built on a 64-bit machine. '("-Dgallium-drivers=etnaviv,kmsro,lima,nouveau,panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl")) - ((or "powerpc64le-linux" "powerpc-linux" "riscv64-linux") + ((or "powerpc64le-linux" "powerpc-linux") '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl")) (_ - '("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) + '("-Dgallium-drivers=auto"))) ;; Enable various optional features. TODO: opencl requires libclc, ;; omx requires libomxil-bellagio "-Dplatforms=x11,wayland" @@ -340,14 +340,10 @@ (define-public mesa ;; Explicitly enable Vulkan on some architectures. ,@(match (%current-system) - ((or "i686-linux" "x86_64-linux") - '("-Dvulkan-drivers=intel,amd")) ((or "powerpc64le-linux" "powerpc-linux") '("-Dvulkan-drivers=amd,swrast")) ("aarch64-linux" '("-Dvulkan-drivers=freedreno,amd,broadcom,swrast")) - ("riscv64-linux" - '("-Dvulkan-drivers=amd,swrast")) (_ '("-Dvulkan-drivers=auto"))) -- 2.36.1