From patchwork Thu Jul 8 15:40:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 31236 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 4D8E027BC83; Thu, 8 Jul 2021 17:13:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C3EF127BC81 for ; Thu, 8 Jul 2021 17:13:43 +0100 (BST) Received: from localhost ([::1]:53938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Wek-0007xq-N5 for patchwork@mira.cbaines.net; Thu, 08 Jul 2021 12:13:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1W99-0007l1-Mt for guix-patches@gnu.org; Thu, 08 Jul 2021 11:41:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45754) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1W98-0006i8-H3 for guix-patches@gnu.org; Thu, 08 Jul 2021 11:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m1W98-0003D6-Ex for guix-patches@gnu.org; Thu, 08 Jul 2021 11:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49339] [PATCH core-updates] gnu: mesa: Update to 21.1.4. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Jul 2021 15:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49339 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "49339@debbugs.gnu.org" <49339@debbugs.gnu.org> Received: via spool by 49339-submit@debbugs.gnu.org id=B49339.162575881912246 (code B ref 49339); Thu, 08 Jul 2021 15:41:02 +0000 Received: (at 49339) by debbugs.gnu.org; 8 Jul 2021 15:40:19 +0000 Received: from localhost ([127.0.0.1]:57290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1W8R-0003BS-34 for submit@debbugs.gnu.org; Thu, 08 Jul 2021 11:40:19 -0400 Received: from mail2.protonmail.ch ([185.70.40.22]:10448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1W8N-0003B8-8m for 49339@debbugs.gnu.org; Thu, 08 Jul 2021 11:40:17 -0400 Date: Thu, 08 Jul 2021 15:40:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1625758808; bh=/UF4EoxAFh5SL9F1xSrY5fe3qKKGwf6W2gh+bDdJqfc=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=cJxQdp5P4BVziUVIoedTMlZI153tvulCHak4obdmS0DF7KAbW+PVhHdqNzUNLkLRf Y6pU5ZWmEzQuNtyzuBYt1e0ah/nFk93p+lIPBUSu+DXLLUG6ZyoBdouOKO09qgRaja m1XHw11cFTrdzjzHSdplPu5wIr9YASRrT7UeELEY= Message-ID: In-Reply-To: References: 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 Hello, Here is a patch for just the minimal Mesa version bump. I reverted option changes to match the previous version (and wasn't sure with there being a mesa-opencl package already). All Mesa tests pass for me too (on x86_64), so mesa-skip-tests.patch is not applied, as per original patch here. src/compiler/glsl/tests/cache_test.c has moved to src/util/tests/cache and has changed. However, the test works for me (compiling on foreign distro). The i686 part of the patch can still be applied, but will need someone to test. This is just the Mesa change, it relies on libdrm update in https://issues.guix.gnu.org/49412 I think other than the tests patch, should be good to go, can someone review and check the i686 patch so we can move ahead with this? Thanks, John From a67d3224c13e6a3339865177d3a54489f5d0f582 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Thu, 8 Jul 2021 11:15:48 -0400 Subject: [PATCH] gnu: mesa: Update to 21.1.4. * gnu/packages/gl.scm (mesa): Update to 21.1.4. --- gnu/packages/gl.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index cc5131b28d..70762faefd 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -237,7 +237,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "20.2.6") + (version "21.1.4") (source (origin (method url-fetch) @@ -249,9 +249,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1nw5k2qrlcrp5bljy1lmyybgl525y0h44synkbbirw92qv3a6b7i")) - (patches - (search-patches "mesa-skip-tests.patch")))) + "02z9g6zpkg1p1sm8f84xdi7v2n7x534x9pn565bvcr411527y5qz")))) (build-system meson-build-system) (propagated-inputs `(;; The following are in the Requires.private field of gl.pc. @@ -309,7 +307,7 @@ also known as DXTn or DXTC) for Mesa.") "-Dglx=dri" ;Thread Local Storage, improves performance ;; "-Dopencl=true" ;; "-Domx=true" - "-Dosmesa=gallium" + "-Dosmesa=true" "-Dgallium-xa=enabled" ;; features required by wayland @@ -417,8 +415,8 @@ also known as DXTn or DXTC) for Mesa.") (let ((out (assoc-ref outputs "out")) (bin (assoc-ref outputs "bin"))) ;; Not all architectures have the Vulkan overlay control script. - (mkdir-p (string-append bin "/bin")) - (call-with-output-file (string-append bin "/bin/.empty") + (mkdir-p (string-append out "/bin")) + (call-with-output-file (string-append out "/bin/.empty") (const #t)) (copy-recursively (string-append out "/bin") (string-append bin "/bin")) -- 2.32.0