From patchwork Thu May 4 20:12:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49804 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 EB05527BBE9; Thu, 4 May 2023 21:14:07 +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 DEE6B27BBE2 for ; Thu, 4 May 2023 21:14:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pufL1-0008Ap-Md; Thu, 04 May 2023 16:14:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pufL0-00089Z-Q4 for guix-patches@gnu.org; Thu, 04 May 2023 16:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pufL0-0006xD-Gv for guix-patches@gnu.org; Thu, 04 May 2023 16:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pufL0-0008BH-9k for guix-patches@gnu.org; Thu, 04 May 2023 16:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch v3 4/4] gnu: mesa: Update to 23.0.3. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 May 2023 20:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63219@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 63219-submit@debbugs.gnu.org id=B63219.168323118531360 (code B ref 63219); Thu, 04 May 2023 20:14:02 +0000 Received: (at 63219) by debbugs.gnu.org; 4 May 2023 20:13:05 +0000 Received: from localhost ([127.0.0.1]:52159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufK4-00089k-Ql for submit@debbugs.gnu.org; Thu, 04 May 2023 16:13:05 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:11195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufK2-00088Y-IO for 63219@debbugs.gnu.org; Thu, 04 May 2023 16:13:03 -0400 Date: Thu, 04 May 2023 20:12:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1683231176; x=1683490376; bh=Ah9i9X9QyKv5O360atIvzNRcMparYCvvQ2jCkY0eGsk=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=j5yA2SzOPLojadd1srRdM+of3QmoVw7fmDjejH/RMglMMCr12xXvmA7g+8/F0GuzM TSbsGE6ifTWp0DevQqX4IHyD1EF7Wh9bBssus9SH/THFbVdGK7AOqu8wcbHtkkmR5a ST5lzDEd1UWuy8OHRup22PPfurDFhQeJYsvGTRKIZW19cwwIMc9pB8YiZHP1acRYNj 60Qh/oSb/z29qX8umeLidDIW/SMwkTfoUpDaxPD+kRdh+IY5lO1MVpQFBbE2jsy/Kq J5rmoYvFHz97++oonjnWFi95QbC4zrtZmmdur6155E5LqmE7eEUF3MCQOg7zAQTRqN wvhACkdhSDbtw== 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: , 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 Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gl.scm (mesa): Update to 23.0.3. [source]: Remove obsolete patch and update HTTPS url. [arguments]: Enable the crocus gallium driver. * gnu/packages/patches/mesa-fix-sporadic-test-failures.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gl.scm | 14 ++++------ .../mesa-fix-sporadic-test-failures.patch | 27 ------------------- 3 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 gnu/packages/patches/mesa-fix-sporadic-test-failures.patch -- 2.39.2 diff --git a/gnu/local.mk b/gnu/local.mk index 5f5de953d7..9a801f3f3e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1559,7 +1559,6 @@ dist_patch_DATA = \ %D%/packages/patches/mercurial-hg-extension-path.patch \ %D%/packages/patches/mercurial-openssl-compat.patch \ %D%/packages/patches/mesa-opencl-all-targets.patch \ - %D%/packages/patches/mesa-fix-sporadic-test-failures.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mia-fix-boost-headers.patch \ %D%/packages/patches/mia-vtk9.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 5248151a95..235b386dad 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -267,21 +267,17 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "22.2.4") + (version "23.0.3") (source (origin (method url-fetch) - (uri (list (string-append "https://mesa.freedesktop.org/archive/" + (uri (list (string-append "https://archive.mesa3d.org/" "mesa-" version ".tar.xz") (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - version "/mesa-" version ".tar.xz"))) + "mesa-" version ".tar.xz"))) (sha256 (base32 - "1azpr68pdg63yq3igmzwsgn2ypg49m0mp3hfkq0lcyswr99npmv5")) - (patches - (list (search-patch "mesa-fix-sporadic-test-failures.patch"))))) + "1mcjf41x2bhxs6yxars7nh2vfryfw50g6rvbcfbb1wqdv2jn4qrq")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. @@ -330,7 +326,7 @@ (define-public mesa ((or "powerpc64le-linux" "powerpc-linux" "riscv64-linux") '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl")) (_ - '("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,\ + '("-Dgallium-drivers=crocus,iris,nouveau,r300,r600,radeonsi,\ svga,swrast,virgl"))) ;; Enable various optional features. TODO: opencl requires libclc, ;; omx requires libomxil-bellagio diff --git a/gnu/packages/patches/mesa-fix-sporadic-test-failures.patch b/gnu/packages/patches/mesa-fix-sporadic-test-failures.patch deleted file mode 100644 index 50ac5530a2..0000000000 --- a/gnu/packages/patches/mesa-fix-sporadic-test-failures.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 7749599d737d205a88bbb6fa755ba095d9b581fa -Author: Gert Wollny -Date: Mon Aug 15 17:15:43 2022 +0200 - - r600/sfn: Initialize out buffer when printing op - - 79ca456b4837b3bc21cf9ef3c03c505c4b4909f6 - r600/sfn: rewrite NIR backend - - Closes: #7021 - - Signed-off-by: Gert Wollny - Part-of: - -diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp -index 3d40ea1796a..00826ed6457 100644 ---- a/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp -+++ b/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp -@@ -206,7 +206,7 @@ bool WriteScratchInstr::do_ready() const - - void WriteScratchInstr::do_print(std::ostream& os) const - { -- char buf[6]; -+ char buf[6] = {0}; - - os << "WRITE_SCRATCH "; - if (m_address)