From patchwork Fri Mar 22 07:24:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 2389 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 6163127BBE9; Fri, 22 Mar 2024 07:30:45 +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 8339127BBE9 for ; Fri, 22 Mar 2024 07:30:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnZM8-00049j-Mj; Fri, 22 Mar 2024 03:30:24 -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 1rnZM6-00049O-2K for guix-patches@gnu.org; Fri, 22 Mar 2024 03:30:22 -0400 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 1rnZM5-0000FF-QD for guix-patches@gnu.org; Fri, 22 Mar 2024 03:30:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rnZMk-0004xP-56 for guix-patches@gnu.org; Fri, 22 Mar 2024 03:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 0/5] gnu: mesa: Update to 24.0.3. References: In-Reply-To: Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 07:31:02 +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: john.kehayias@protonmail.com, aurtzy , efraim@flashner.co.il Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171109263418956 (code B ref 69637); Fri, 22 Mar 2024 07:31:02 +0000 Received: (at 69637) by debbugs.gnu.org; 22 Mar 2024 07:30:34 +0000 Received: from localhost ([127.0.0.1]:55544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZMH-0004vc-JN for submit@debbugs.gnu.org; Fri, 22 Mar 2024 03:30:33 -0400 Received: from mail-qv1-f42.google.com ([209.85.219.42]:47555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZMF-0004v9-2g for 69637@debbugs.gnu.org; Fri, 22 Mar 2024 03:30:32 -0400 Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-690cd7f83cdso11160406d6.3 for <69637@debbugs.gnu.org>; Fri, 22 Mar 2024 00:29:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711092524; x=1711697324; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=wjA84B5KkaD0XxvZlxEL/T7LyU5cQqwSpAVZAKrC/dA=; b=hL162j4dXCJWdNjelto46Sw3FD1Ajorb0Ym1X+g+hu/r4tRXgkyNZHsCX1KQ3U+9PM bVyhXkTXQZ0NImv/XlShp2ZIIx3CWdreNf1cJl4tryshQgja0+qZ6gJt4WyCRhzulRNN QHU1PaYeaB2OV2gYArbNc0UEsthNgpEMFT39WFjYlMmMwCPoNVraKsfVJ1uok7JvLYoy fRzWTSawJFweENO6nSSDzz+ApiAWnV3Zv1ETL33TDJuiE66hOObuh1nY4NkplihZ2w0T col5fII3CJyzRj7qeNaKtmh73MKC9EL0DTPuVpma7/rwhkA3qJ/sLe2VEwfPw7cjnP4u zFQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711092524; x=1711697324; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wjA84B5KkaD0XxvZlxEL/T7LyU5cQqwSpAVZAKrC/dA=; b=afPN/Eq0mL/Nz4VD06gmWffjclBrHcoI0vQnXOA6NabIesGggYTEADvHY6Y4DjIYjW 8y8a4OkVrR6alYqYxfXuoVE5wqzLex0OoN4Anj/ZSJPkrmK5uxiXmOBO/m4IMzSOsXLZ +Hp2yu82PJNxNYEMFkcAv7w/RUZjks5A0KAgaXprR/nGtyZ9A1kQYABJF86U0D14xFt8 B28SfZPzlk1gSQ4FfbsSZcB886F85OUDY3D9ZD35fozE6VlDxD6xwMRjeQ97+pZ/ZWqt ZKhib/YF/QOqn4IFU7ADqLX4iBrv0kPt/XorJ8/JBB3a2WioP14oqrFrpyYMvaCBvBxN 83sQ== X-Gm-Message-State: AOJu0YxVeqInwCuu0pJN5Az1ERhIGWQAqoINewocKo924wRa+n6usFqo 31MigDc6v3Lbsfnp4e29RZiEDWhsguVikQYgQczdvt7fhNcmCMyU+MyRqAwK X-Google-Smtp-Source: AGHT+IEEjo1hxftAIP651tWX6dqpRPMkhLoSauN4onoPT31HIbOOwElPl8FNUKXDcLHgIY1uZns7mw== X-Received: by 2002:a05:6214:2685:b0:696:533b:dac0 with SMTP id gm5-20020a056214268500b00696533bdac0mr1502626qvb.3.1711092524217; Fri, 22 Mar 2024 00:28:44 -0700 (PDT) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id q14-20020ad4574e000000b00690f9ea30aesm807048qvx.26.2024.03.22.00.28.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:28:43 -0700 (PDT) From: aurtzy Date: Fri, 22 Mar 2024 03:24:17 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 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 New patchset coming in. Mesa has been updated to 24.0.3, and I've added TODO comments for future work as suggested. > I would like to get the build farm cranking on the updates I have > queued for mesa-updates (cairo, libdrm, mesa, vulkan). We could also > do just the version update of mesa to start, or just NVK on x86_64, > leaving future changes for the next round. I don't have a preference > myself, other than wanting to get this branch moving with these > updates. NVK on 24.0.3 is also still considered experimental, so if that's a concern we could save this work for 24.1 when it's planned to move out of this stage. > I also tried a couple of different options. The one that I most want > involved using with-output-to-file to rewrite the wrap file and > replacing all the fields. I borrowed the file-sha256 function from > guix/build/cargo-utils.scm to get the source_hash. In the end I wasn't > able to get the gexp and un-gexp bits working to actually get the file > written. > > When I kept a failed build I saw that the 'directory' field is the > directory into which meson writes the meson.build file, which is why > using a different version of the rust crate caused problems with > src/lib.rs not existing. I suppose we could start from your patch and > then, after running substitute, extract the tarball into either a > hardcoded path (determined after manually reading the sources) or we can > extract the 'directory' field by reading the sources and then untar the > source there. Noted, thanks Efraim! I'll keep looking into this. Best, aurtzy aurtzy (5): gnu: Add meson-1.3. gnu: Add rust-syn-2.0.39. gnu: Add rust-proc-macro2-1.0.70. gnu: Add rust-quote-1.0.33. gnu: mesa: Update to 24.0.3. gnu/packages/build-tools.scm | 14 +++++++ gnu/packages/crates-io.scm | 42 +++++++++++++++++++ gnu/packages/gl.scm | 80 ++++++++++++++++++++++++++++-------- 3 files changed, 118 insertions(+), 18 deletions(-) base-commit: 3d2966e0b7dbf15a5cb497037ace73d1be92febf