From patchwork Sun Aug 14 15:52:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacob Hrbek X-Patchwork-Id: 41671 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 2CC3027BBEA; Sun, 14 Aug 2022 16:53:47 +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,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 AB5E827BBE9 for ; Sun, 14 Aug 2022 16:53:46 +0100 (BST) Received: from localhost ([::1]:41088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oNFvt-000187-Rk for patchwork@mira.cbaines.net; Sun, 14 Aug 2022 11:53:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNFvN-00016L-57 for guix-patches@gnu.org; Sun, 14 Aug 2022 11:53:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oNFvE-0007AL-8W for guix-patches@gnu.org; Sun, 14 Aug 2022 11:53:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oNFvE-0000MW-4J for guix-patches@gnu.org; Sun, 14 Aug 2022 11:53:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57206] [PATCH 3/3] mesa: Bump 21.3.8->22.1.3 * Needed to use newer DXVK Resent-From: Jacob Hrbek Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Aug 2022 15:53:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57206@debbugs.gnu.org Cc: Jacob Hrbek X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16604923531327 (code B ref -1); Sun, 14 Aug 2022 15:53:03 +0000 Received: (at submit) by debbugs.gnu.org; 14 Aug 2022 15:52:33 +0000 Received: from localhost ([127.0.0.1]:39551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNFuj-0000LL-86 for submit@debbugs.gnu.org; Sun, 14 Aug 2022 11:52:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:56538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNFuh-0000LE-Rc for submit@debbugs.gnu.org; Sun, 14 Aug 2022 11:52:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNFuh-00012D-ME for guix-patches@gnu.org; Sun, 14 Aug 2022 11:52:31 -0400 Received: from mail-0201.mail-europe.com ([51.77.79.158]:57622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNFuf-0006xL-Px for guix-patches@gnu.org; Sun, 14 Aug 2022 11:52:31 -0400 Date: Sun, 14 Aug 2022 15:52:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rixotstudio.cz; s=protonmail; t=1660492342; x=1660751542; bh=gWfPt3nEbGwDq89qakh6vqJ75pSWF+INjcrwvDBXum0=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=BzcLR8B9gK4ekm9/pSZjh7f1WpBL78JkzY9z2CVJZ/VxdqjfTHZbzzk+czKSmoH9E y8gVyXHUm+3u5wjAw/ObBV03W9oOeRy4Ve4olt5H4DOqJaiRv5Jy9t4o6fjQzq+eu7 zpuFbQKfB6qSA5h4w2XU8rvEXGnJavJSQYoLs3LyDo71Nwt0khKs4dOy/VUn1W74Wb 2rB7goPsfnXD2e4vJRfeoY5on3CWuDly/hHEEabJ259lA3UkxPOMC3pF96xUb63dEM G1cm7LOEJKcCcwCB0krz4Dn63ULp6Bwuv2pJcaMalyjMDwmiQqrCkp1C/kdmnR8LvQ FqRSgU6bDACMA== From: Jacob Hrbek Message-ID: <20220814155121.19195-3-kreyren@rixotstudio.cz> In-Reply-To: <20220814155121.19195-1-kreyren@rixotstudio.cz> References: <20220814155121.19195-1-kreyren@rixotstudio.cz> Feedback-ID: 30491181:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=51.77.79.158; envelope-from=kreyren@rixotstudio.cz; helo=mail-0201.mail-europe.com 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-To: Jacob Hrbek Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Signed-off-by: Jacob Hrbek --- gnu/packages/gl.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) -- 2.37.1 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c740c087dd..b47b8564eb 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 John Kehayias ;;; Copyright © 2022 Petr Hodina +;;; Copyright © 2022 Jacob Hrbek ;;; ;;; This file is part of GNU Guix. ;;; @@ -261,7 +262,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "21.3.8") + (version "22.1.3") (source (origin (method url-fetch) @@ -273,12 +274,11 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "19wx5plk6z0hhi0zdzxjx8ynl3lhlc5mbd8vhwqyk92kvhxjf3g7")) - (patches - (search-patches "mesa-skip-tests.patch")))) + "1qwky31vdqh3y6i0mxqnrbq7jc39kjcyndpv4mbzz8d2gax353xr")))) (build-system meson-build-system) (propagated-inputs - (list ;; The following are in the Requires.private field of gl.pc. + (list ;; The following are in the Requires.private field of gl.pc. + ;; NOTE(Krey): Since version 22.1.3 it requires libdrm_amdgpu[>=2.4.110] libdrm libvdpau libx11 @@ -295,6 +295,7 @@ (define-public mesa libxrandr libxvmc wayland + ;; NOTE(Krey): Since 22.1.3 requires wayland-protocols[>=1.24] wayland-protocols) ;; TODO: Resort alphabetically. ;; Note: update the 'clang' input of mesa-opencl when bumping this. @@ -355,17 +356,7 @@ (define-public mesa "-Dvulkan-layers=device-select,overlay" ;; 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 + "-Dbuild-tests=true") ;; XXX: 'debugoptimized' causes LTO link failures on some drivers. The ;; documentation recommends using 'release' for performance anyway.