From patchwork Fri Mar 8 20:27:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 61545 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 5B55E27BBE2; Fri, 8 Mar 2024 20:33:25 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 9A60627BBEA for ; Fri, 8 Mar 2024 20:33:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rigtm-0007jS-N5; Fri, 08 Mar 2024 15:32:58 -0500 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 1rigtM-0007YV-50 for guix-patches@gnu.org; Fri, 08 Mar 2024 15:32:37 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rigtL-0004mf-Kj for guix-patches@gnu.org; Fri, 08 Mar 2024 15:32:31 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rigtr-00039q-QG for guix-patches@gnu.org; Fri, 08 Mar 2024 15:33:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 6/6] gnu: mesa: Update to 24.0.2. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 20:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69637 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69637@debbugs.gnu.org Cc: aurtzy Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.170992994812055 (code B ref 69637); Fri, 08 Mar 2024 20:33:03 +0000 Received: (at 69637) by debbugs.gnu.org; 8 Mar 2024 20:32:28 +0000 Received: from localhost ([127.0.0.1]:59718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigtI-00038N-0a for submit@debbugs.gnu.org; Fri, 08 Mar 2024 15:32:28 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:43428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigtF-00037r-N0 for 69637@debbugs.gnu.org; Fri, 08 Mar 2024 15:32:26 -0500 Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-42efa84f7b5so26966681cf.1 for <69637@debbugs.gnu.org>; Fri, 08 Mar 2024 12:31:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709929847; x=1710534647; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/761jn+s87QT3WKMvsh+7LTqlOvuRajANq6ybzRstIs=; b=HRosX+s84oDRYqLcRi8fYRcXNEZfHpS3OA/5OmMr5fftEvi9f2h2yhzu6cZCGuArF1 8Aha+FusrQXX5TN1QVyncaysCUUewR3eHycf3eL0tXNTyexT0xE9E0+4bS2thBqa4n+z JWi2y/JD9mBVJBNqBVRQROKiuv8BF1cKFjHjQUYdceSBIpzsdnx2rBKrzma7zJ51stTe Td6m+JsAxYRVu0X2SEHC7G3olq4V8QimjnqI5ZAuVDIBlfa9z8Lp2Vt290Wa7pnvUOi0 Ujuf6/EypMvqJILOtjW1syOSnhCLf0/2ukkocxnKqu/jHvZQQzQ26yIRonimxYb4HdoD uGsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709929847; x=1710534647; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/761jn+s87QT3WKMvsh+7LTqlOvuRajANq6ybzRstIs=; b=D5srpvdiVGxEO4qh16WkAhDWwgsTK6diCX4N2YOdYz1WqYgVNEpSIwVM2RPlB2Gc4g 896KWtj7hJzw147XvA+3WoysvMtC8BedijZEP+jz3ajLtaSGzZMDnQD3RcKcNbgL8+QJ sDWH2pyRlqvfIA1an6uEyZ3FQJMfnd2hB9bq04ZzQZCbBnoTcChjU1savsyBrgYxAAr3 qyZj0hR1jHtO/MoGBlVSqqF1B5y+xPkLwgNG/DJglfy4+GF/3pqBuxKVBxyWUuBDUVc9 VKOnJFz8WbW4hkfsL8vU/BTuCxDInHLmLMt6f7kvP31RmLESuT4R7Ra4M7hmYizRdDBl TbwQ== X-Gm-Message-State: AOJu0Yz/vVvWLx4dL8TTsYSCq9JtFkUL53qJ9p+qoWALnHrPWnZR+gpT N/z60AYnPO5YRnz5xVgLioNdxOX6fLrfdqw1g9btRQVj0gEeC2kNWWWXYZv9 X-Google-Smtp-Source: AGHT+IEMYNeNyODDr/e4kRC7hiXGge1X4GXaJn5vLUxY+VmGyw63Wxe5IyPUK1JzGuQYWb6paxmETg== X-Received: by 2002:a05:622a:215:b0:42f:2008:f8cb with SMTP id b21-20020a05622a021500b0042f2008f8cbmr548775qtx.17.1709929847191; Fri, 08 Mar 2024 12:30:47 -0800 (PST) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id h4-20020ac846c4000000b0042ed2e8add6sm104963qto.75.2024.03.08.12.30.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 12:30:46 -0800 (PST) From: aurtzy Date: Fri, 8 Mar 2024 15:27:16 -0500 Message-ID: <45e5551106c45c40822f85a9e5e26276a23cb24d.1709899566.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gl.scm (mesa): Update to 24.0.2. Change-Id: Ic4176f8a747bcb4c5210af6ccb4569589192e4a7 --- gnu/packages/gl.scm | 68 +++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f8dc8c1d9d..156c7cacbe 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Liliana Marie Prikler +;;; Copyright © 2024 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,8 +41,10 @@ (define-module (gnu packages gl) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) + #:use-module (gnu packages build-tools) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crates-io) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) #:use-module (gnu packages flex) @@ -55,6 +58,7 @@ (define-module (gnu packages gl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages rust) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) @@ -297,17 +301,17 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "23.3.2") + (version "24.0.2") (source - (origin - (method url-fetch) - (uri (list (string-append "https://archive.mesa3d.org/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - "mesa-" version ".tar.xz"))) - (sha256 - (base32 - "1p4swrbmz3kb1805kdj973hf8virgmix4m9qprmcb2bgl4gviz1w")))) + (origin + (method url-fetch) + (uri (list (string-append "https://archive.mesa3d.org/" + "mesa-" version ".tar.xz") + (string-append "ftp://ftp.freedesktop.org/pub/mesa/" + "mesa-" version ".tar.xz"))) + (sha256 + (base32 + "1s69asdh7cz10abr63q8qdiamdcy7cjkzd9yp398wvfhva78mqll")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. @@ -340,15 +344,22 @@ (define-public mesa python-mako python-wrapper (@ (gnu packages base) which) - (if (%current-target-system) - (list cmake-minimal-cross - pkg-config-for-build - wayland - wayland-protocols) - '()))) + (append + (if (%current-target-system) + (list cmake-minimal-cross + pkg-config-for-build + wayland + wayland-protocols) + '()) + (if (target-x86-64?) + (list clang-15 + rust-bindgen-cli-0.69 + rust) + '())))) (outputs '("out" "bin")) (arguments (list + #:meson meson-1.3 #:configure-flags #~(list #$@(cond @@ -381,7 +392,9 @@ (define-public mesa ;; Explicitly enable Vulkan on some architectures. #$@(cond - ((or (target-x86-32?) (target-x86-64?)) + ((target-x86-64?) + '("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast,nouveau-experimental")) + ((target-x86-32?) '("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast")) ((or (target-ppc64le?) (target-ppc32?)) '("-Dvulkan-drivers=amd,swrast")) @@ -478,6 +491,27 @@ (define-public mesa (("'lp_test_arit', ") "")))) (_ '((display "No tests to disable on this architecture.\n")))))) + (add-after 'unpack 'change-subproject-sources + ;; Subproject source URLs are patched to point to the store, + ;; which avoids an attempt to download them mid-build. + (lambda _ + (for-each + (lambda (subproject) + (let ((file (car subproject)) + (input (cdr subproject))) + (substitute* file + (("https.*/download") + (string-append "file://" input))))) + '#$(if (target-x86-64?) + #~(("subprojects/syn.wrap" + . #$(package-source rust-syn-2.0.39)) + ("subprojects/unicode-ident.wrap" + . #$(package-source rust-unicode-ident-1)) + ("subprojects/quote.wrap" + . #$(package-source rust-quote-1.0.33)) + ("subprojects/proc-macro2.wrap" + . #$(package-source rust-proc-macro2-1.0.70))) + '())))) (add-before 'configure 'fix-dlopen-libnames (lambda _ (let ((out #$output))