From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 0/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 12:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69637 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69637@debbugs.gnu.org Cc: john.kehayias@protonmail.com, aurtzy X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170990152420131 (code B ref -1); Fri, 08 Mar 2024 12:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Mar 2024 12:38:44 +0000 Received: from localhost ([127.0.0.1]:57001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riZUp-0005Ed-Vq for submit@debbugs.gnu.org; Fri, 08 Mar 2024 07:38:44 -0500 Received: from lists.gnu.org ([209.51.188.17]:54982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riZUm-0005EU-4F for submit@debbugs.gnu.org; Fri, 08 Mar 2024 07:38:42 -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 1riZUE-0005Ei-Hi for guix-patches@gnu.org; Fri, 08 Mar 2024 07:38:07 -0500 Received: from mail-qv1-xf36.google.com ([2607:f8b0:4864:20::f36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1riZUC-0005J8-8m for guix-patches@gnu.org; Fri, 08 Mar 2024 07:38:06 -0500 Received: by mail-qv1-xf36.google.com with SMTP id 6a1803df08f44-690578e13c4so9622696d6.1 for ; Fri, 08 Mar 2024 04:38:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709901482; x=1710506282; darn=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=o/i2d6hdYkiA72/+oGrbnyjbR3UKqkDELfdVfbLh3ck=; b=cicge8TMSxGtwKj4nNSs1SlyIC9VigTOcoAZbyjV0+bwCbI4PgmgqJ4Sy9GVmsTHYO pHNL7XJUjGAM6au3oH6wsfQNfDISABx41Ff5UYrnVWCm6JvZczA1rAQOTf9q9mGIY+Hi xVsBDQQFICspQZ4nIQtpqgLAQKzM4KwI/RnoCXE++FJro63Tsmrf6cgmxMxSVHV2k2LW z94rwwwwbivYKGF/QCNwzNNnXfJuf8rvTWLXHLkfmHcdIU5YwPa8+vBBBoy3B7vlU0xB S87mi5sCAHqqVwN7q0EBF4xRaNqR6Q+yXTMjYW9ECZZlHFyXCz0SN8m6Rb0qGUMOLE41 fK3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709901482; x=1710506282; 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=o/i2d6hdYkiA72/+oGrbnyjbR3UKqkDELfdVfbLh3ck=; b=tjFgEjhFozFd7twWCM977wWuysab7n9cAonopDmgQZKFRo2pYBhAZc6IAfcQprEOGj Say3+rtY1LVNzxtmdhKZLCUZBFpRW6NdgYGozlP2Q2iyLVYBeFSjazifI2AGhMxx6f6s rskzuDS6TkhJ/sHIutqprI0cz8NsiJgY2auDDO8zleBUXNE11qDl7LzTH+nEh3gH102U qUrKxP6QGQ4177A+nMwsb/Lqs7IP046BCKcE5ZsI1cal2eqxoO2S7K5vfycFqxa517JZ r76iQuJTL85VYxdevYSn0Mjk4/CoXTfzVcirvcvKO9cS31pUyCt3c0Cw3MSwqG5nA5No Hn1g== X-Gm-Message-State: AOJu0Yxh35G7PFFMRagb1E57vHyrCeXYZJj+HvN+rUQa03SDyW34HEgi xzBjow1syG9biPBl9QoCCPoXhnmqsuKnPOaAhXKqsze18LNAZUqbeSxUyPoc X-Google-Smtp-Source: AGHT+IFqETqbG6dCX9wSXMaDGzUJF3ZjSsMBUAIp2Etv5lF3odA7pvmrMNOSrp1/kaxTH3qOO6BdWQ== X-Received: by 2002:a0c:eed3:0:b0:68f:cd2c:ee9f with SMTP id h19-20020a0ceed3000000b0068fcd2cee9fmr11108908qvs.29.1709901481980; Fri, 08 Mar 2024 04:38:01 -0800 (PST) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id op29-20020a056214459d00b0068fa815b517sm9763048qvb.6.2024.03.08.04.38.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 04:38:01 -0800 (PST) From: aurtzy Date: Fri, 8 Mar 2024 07:32:39 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::f36; envelope-from=aurtzy@gmail.com; helo=mail-qv1-xf36.google.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello! This series of patches updates Mesa to the latest stable version with the NVK Vulkan driver for NVIDIA GPUs enabled for x86_64 systems. Mesa 24.0.2 depends on a newer version of libdrm (>= 2.4.119), which is pending in another issue (https://issues.guix.gnu.org/68845). Some packages (rust-syn-2.0.39, rust-proc-macro2-1.0.70, rust-quote-1.0.33) were added specifically to be used as sources that satisfy explicit versions of dependencies required by Mesa (for NVK). Would it be better to inline origins in the change-subproject-sources phase? The same question also applies for the rust-unicode-ident-1 source. Currently, the Rust dependencies are found in the build by substituting the fallback https://* URLs in the relevant ./subprojects/*.wrap files with file://*, then relying on the fallback to "download" from the store. It seemed a bit hacky doing it this way, but I'm not aware of a better solution. A newer Meson version is also required for NVK (>= 1.3.0), which this patch series adds a new variable for. x86_64-linux and i686-linux have been tested to successfully build. Cheers, aurtzy aurtzy (6): 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: Add rust-bindgen-cli-0.69. gnu: mesa: Update to 24.0.2. gnu/packages/build-tools.scm | 14 ++++++ gnu/packages/crates-io.scm | 95 ++++++++++++++++++++++++++++++++++++ gnu/packages/gl.scm | 68 +++++++++++++++++++------- 3 files changed, 160 insertions(+), 17 deletions(-) base-commit: 0b5cbca689b2f91949e191ca256ffc9bb48c1141 -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 1/6] gnu: Add meson-1.3. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 20: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: aurtzy Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.170992983011705 (code B ref 69637); Fri, 08 Mar 2024 20:31:02 +0000 Received: (at 69637) by debbugs.gnu.org; 8 Mar 2024 20:30:30 +0000 Received: from localhost ([127.0.0.1]:59692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigrN-00032f-NQ for submit@debbugs.gnu.org; Fri, 08 Mar 2024 15:30:30 -0500 Received: from mail-qt1-f181.google.com ([209.85.160.181]:59453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigrK-00032C-7x for 69637@debbugs.gnu.org; Fri, 08 Mar 2024 15:30:27 -0500 Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-42f07863137so12335961cf.2 for <69637@debbugs.gnu.org>; Fri, 08 Mar 2024 12:29:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709929727; x=1710534527; 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=BDLLJ1s1p+qiCUbLUcPFLPm8K/Tszug6A/5puu/IdgE=; b=Fta06YujHE+dQ/mJjKvvrjvKSRLIynuWYWkXa9SxboNQ9MqYbYyE+zk6sDfxhYbPiG Q/77UXIgmH6l1nxc4deD9FPEEQjsRoQ87jtoc/c44UcwY3mFb29PL2VTc6RYQqeu2bl7 uNr/lCH4Zb5UdjQtYwrYwtU4By6J5DVBVhUA/5guQMAxgYaqtmXLiS7WK5cj8la6wNZH pwrX6tWTK7SX/UAaK/0nwM+PkExiVf1F47C01xS90ANlm6DmwX6+SPUvvB1IQ3/FLP/7 OQBTT8w46u1sS9Qrj1QjX5Q+Rb2dAfCxeIZ+3j0yfSRm20p4pd+2i9cAPvKiB86cEl6l gDnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709929727; x=1710534527; 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=BDLLJ1s1p+qiCUbLUcPFLPm8K/Tszug6A/5puu/IdgE=; b=PzFexr/0DjHYP+t6WVSjNT4K+F9aKYEhTtGQCa+AkCyT8cj/kgm0ZB1PhOT78E5GIq 9ElqJtAEuoOjotldfoeYUvvIEGjaiIyylTCbrnO2zYqU0aHNwnOy7bDBXmRdWz2P627E fqmO+x44YofzgKfSTjxdIgqb7XRYMXEI8iTBuCxxJ8Lu6O1CM4m0egfHp/zqHI/macwt xNEII0mgIPeyCim9ZtdTUzIfvUsCTwSfFuc+GLpvtNBfOAPI423XEmzIlbiA9wvGpsC9 qM2lRhlDP+eGFZJuhZJ0i8gSIwYPK33pp7GA1EssFCz1BkQNylId6SNPFWJmO9Knt7IX zF/Q== X-Gm-Message-State: AOJu0YyR4SYn7U2eLMDcnu3FYIuEsaoOm11OjY/Q2fxiYv+HcW040aQ6 a2kyoPCzwbn8+JVHCblbKfy08lE8alL+v1kkvlaQxpkL9TXx46XhvTjLI6aD X-Google-Smtp-Source: AGHT+IGJuewMEGvKm9amrSfANiMwW7QOy6kNwx+XUtAtHQrDfSDWgQadjgJjAuWJLytFLlHKAq9KfQ== X-Received: by 2002:a05:622a:590:b0:42f:2074:2747 with SMTP id c16-20020a05622a059000b0042f20742747mr245063qtb.18.1709929727270; Fri, 08 Mar 2024 12:28: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.28.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 12:28:46 -0800 (PST) From: aurtzy Date: Fri, 8 Mar 2024 15:27:11 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/build-tools.scm (meson-1.3): New variable. Change-Id: I3c280851d0ecd116572e982db7a0e90045bcd682 --- gnu/packages/build-tools.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 15d88ded80..e25266820f 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 qblade ;;; Copyright © 2021, 2023 Maxim Cournoyer ;;; Copyright © 2022, 2023 Juliana Sims +;;; Copyright © 2024 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -343,6 +344,19 @@ (define-public meson/newer (base32 "073vf8059nzs6p5aaqr5wva4pgl81540szdb5yw9yhyajwgm8jyh")))))) +(define-public meson-1.3 + (package + (inherit meson/newer) + (version "1.3.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mesonbuild/meson/" + "releases/download/" version "/meson-" + version ".tar.gz")) + (sha256 + (base32 + "1ajvkcyly1nsxwjc2vly1vlvfjrwpfnza5prfr104wxhr18b8bj9")))))) + (define-public meson-python (package (name "meson-python") -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 2/6] gnu: Add rust-syn-2.0.39. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 20:31: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 , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.170992983511725 (code B ref 69637); Fri, 08 Mar 2024 20:31:03 +0000 Received: (at 69637) by debbugs.gnu.org; 8 Mar 2024 20:30:35 +0000 Received: from localhost ([127.0.0.1]:59695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigrT-000332-1w for submit@debbugs.gnu.org; Fri, 08 Mar 2024 15:30:35 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:44492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigrR-00032X-IQ for 69637@debbugs.gnu.org; Fri, 08 Mar 2024 15:30:34 -0500 Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-42ee984152cso14418011cf.1 for <69637@debbugs.gnu.org>; Fri, 08 Mar 2024 12:30:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709929735; x=1710534535; 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=eTYoofEc6+66Vj9zN1tH+OO7CI59McArTvU2fc3+WO0=; b=Dl1k2kpfjiWGfHjX0l6nWhoXlEfT6xFWl5bNWjlYPZv//+xpJtUp0Euk8v9tXM/bD4 GzqFg1T2fJ+zA0DNk2AwaSMoEEGlEQlVcYXPfj6AQVbMyYVrH3Jdf6uD7j5L8k5/Siwm He7P+wobJJGqmRBqHWWIQGLIeLSzxwY0X9fRv7c9Z/+I0qenzB9GG0oxHmrVgdyRmEZ/ 4mKuTfPKNQcJTqrFavDDfLh9OcA12dpayoTEbqn5J5AoYrWgPhGoqveV8GCxcB6pK8q8 BIMCcQxC/a6ITwDwJhmPZvcF3X9AggWq67Opkjzr6XNR5hUAti2lwzrA/6llNmDMPpnH SAtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709929735; x=1710534535; 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=eTYoofEc6+66Vj9zN1tH+OO7CI59McArTvU2fc3+WO0=; b=lGU535f1u7ko8hYuQO0HIJbgAoRfWtA8p7g7kbNQCqhPswOTe4DlpAQi/Co1PMGfEn 5VAOBOM9WQq9+EXHfSdrc94oi+OM+UcUaw8KF8/PRTO95dSam9xwPcHss1jGrb5ZkXyj 7zk5jKY5q7kmmRsKJzu7G9x4mNpitxougOwkWLGVQRzXOBUk5lP28z85t35/RWFOiVYD vncr9dODqWnvrMT/gQok6Ptvfu6bSUAqZnTM0v2JDLszYDY2t7nrZlNgyC9KwMcXOoB6 yPQJDRyB0IEaeDyYNQTjC+Z8UB3LgU6gyl2O8A+GLcfrm1mSQ9e8MDvkxpN7RCnWJq5l OPuA== X-Gm-Message-State: AOJu0YyBc9xRoktkM8W5qMcINlfZx6JsIDifJ7UN+MnN+aT/6XTFPzf5 AlvjD8Pxks/XC5w5j7qposu0CWrs/kT5ngKsJ1EWqQ3axpp9YejgBe29QYr1 X-Google-Smtp-Source: AGHT+IGYur8YxbVKIIkk61rEKaDIyEhH9wGyJtF2kL1Efav+NqmnTQ3CGqX+JEelWspyFH9X2hd7wQ== X-Received: by 2002:a05:622a:44:b0:42e:eb29:91ba with SMTP id y4-20020a05622a004400b0042eeb2991bamr259302qtw.63.1709929735091; Fri, 08 Mar 2024 12:28:55 -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.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 12:28:54 -0800 (PST) From: aurtzy Date: Fri, 8 Mar 2024 15:27:12 -0500 Message-ID: <497c6f4e446c987388767ae86b1108bc533c8454.1709899566.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-syn-2.0.39): New variable. Change-Id: I148a87e6927adb897da410c29edec28cc0d5687d --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a08748392..9be241da4b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2024 Herman Rimm ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; Copyright © 2024 Suhail Singh +;;; Copyright © 2024 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -66817,6 +66818,20 @@ (define-public rust-syn-2 a syntax tree of Rust source code.") (license (list license:expat license:asl2.0)))) +(define-public rust-syn-2.0.39 + (package + (inherit rust-syn-2) + (name "rust-syn") + (version "2.0.39") + (source + (origin + (method url-fetch) + (uri (crate-uri "syn" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ymyhxnk1yi4pzf72qk3lrdm9lgjwcrcwci0hhz5vx7wya88prr3")))))) + (define-public rust-syn-1 (package (name "rust-syn") -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 3/6] gnu: Add rust-proc-macro2-1.0.70. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 20:31: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 , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.170992984611751 (code B ref 69637); Fri, 08 Mar 2024 20:31:03 +0000 Received: (at 69637) by debbugs.gnu.org; 8 Mar 2024 20:30:46 +0000 Received: from localhost ([127.0.0.1]:59698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigre-00033T-GL for submit@debbugs.gnu.org; Fri, 08 Mar 2024 15:30:46 -0500 Received: from mail-qv1-f49.google.com ([209.85.219.49]:46281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigrd-00033G-5L for 69637@debbugs.gnu.org; Fri, 08 Mar 2024 15:30:45 -0500 Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-690bba32309so2939766d6.0 for <69637@debbugs.gnu.org>; Fri, 08 Mar 2024 12:30:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709929746; x=1710534546; 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=InoKqoTBrJFjaFJtiEerxFYHE1CuAJYYON1WRLjPqc8=; b=iNgBmNoLJ5idN7crHdpUkfjWp0yaon6PPDOcBCoIpz6O5h2IiEDBP9VNIolpbSS9t0 3Cxv0vHsiBkY4GbGUr67vghNAN8Dle0wNfuD1Ogsb5qbT4Vhwj/QT8jrQ9xm83PTNVpk 40WoyN3sc9bvp0Jv4y1DQbyDI+5d8ZNjsXOMI2yB28dmNaVhYhIw8l+4atdXufrJTWr0 5BslCs0jrp9/j0fwE6l06odILKxhOuH0u2w4Zb25h9+1Fp5YTtKPo5cta/XxNAaNcC8T 0ZlNOxKnrepPNZ2NVKsSnJtP1sNPFhpm9JxrAANjX+2qbmAOWNwfSu6C8cbR4IuXrCLP Md/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709929746; x=1710534546; 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=InoKqoTBrJFjaFJtiEerxFYHE1CuAJYYON1WRLjPqc8=; b=fgIZp6UkTty9599zS93DdY525EB36ZZRcOQ/d+WQvQajaW/JGgC9JEuDCB/KIzVOE4 Wo3UIzhhd8JibkKDr6bZy13znqxSdNVzmVShsVZsTx7hb0JmWgXl2MO60hrp/wS4DiVy MM2Qyh1iXBkUsMYZMfHLo5kN1ZkreG0o7EB7q3wBwJBY3tXRE2B3xulsf0OGBcclq4yG Y5e1XwINW+Xflk+yA6NKJgSKPav9PG1a/YAiViA4TKGi/oVWEhzQWgibXjmsa9NouVNv zH/Olx27lX8CBwzbaq9Fpm9mJTvey4EaNn5ZNxvgsMk1yj/VrLTBnfhdrsFfNYgimmas heOw== X-Gm-Message-State: AOJu0Ywax9kASVCn9IsEmt24nYdkLa8mFEGSfoi62Pu7xw5pOtCvQK02 61acIFlvcROt9nuMWSLeEDEJph1LixxiSNylEq746WWRyb7tfHTV6jT/qbWC X-Google-Smtp-Source: AGHT+IHoWQzIpduoEYtDcJY78nOvGLjnM5n4A9hoQZxbgCYMJFzPYlGIxAvqBXAj1dswVZVm9KNA6Q== X-Received: by 2002:a05:622a:14cb:b0:42e:c3d7:3035 with SMTP id u11-20020a05622a14cb00b0042ec3d73035mr296183qtx.66.1709929746620; Fri, 08 Mar 2024 12:29:06 -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.29.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 12:29:06 -0800 (PST) From: aurtzy Date: Fri, 8 Mar 2024 15:27:13 -0500 Message-ID: <3a952dcb0a2e3d00ec5660e7aac12c0e8469b09e.1709899566.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-proc-macro2-1.0.70): New variable. Change-Id: I4b567bee92c789cb189df2a6e022c2cdcd11bcdb --- gnu/packages/crates-io.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9be241da4b..bf2ea0ff6b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49651,6 +49651,20 @@ (define-public rust-proc-macro2-1 in terms of the upstream unstable API.") (license (list license:asl2.0 license:expat)))) +(define-public rust-proc-macro2-1.0.70 + (package + (inherit rust-proc-macro2-1) + (name "rust-proc-macro2") + (version "1.0.70") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fzxg3dkrjy101vv5b6llc8mh74xz1vhhsaiwrn68kzvynxqy9rr")))))) + (define-public rust-proc-macro2-0.4 (package (inherit rust-proc-macro2-1) -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 4/6] gnu: Add rust-quote-1.0.33. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 20:33: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: aurtzy , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.170992993412008 (code B ref 69637); Fri, 08 Mar 2024 20:33:02 +0000 Received: (at 69637) by debbugs.gnu.org; 8 Mar 2024 20:32:14 +0000 Received: from localhost ([127.0.0.1]:59712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigt4-00037a-7m for submit@debbugs.gnu.org; Fri, 08 Mar 2024 15:32:14 -0500 Received: from mail-oi1-f180.google.com ([209.85.167.180]:48305) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigt1-00037E-Sx for 69637@debbugs.gnu.org; Fri, 08 Mar 2024 15:32:12 -0500 Received: by mail-oi1-f180.google.com with SMTP id 5614622812f47-3c213690558so497636b6e.0 for <69637@debbugs.gnu.org>; Fri, 08 Mar 2024 12:31:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709929833; x=1710534633; 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=Zngz0Qwdg5g8qA0rfMpLWRbCJGQLIbdBhdmr1AdcfbA=; b=cFg1v80Cs+EPhALDGAB/iNZKxt6k8Kx9vvmnfDNNzoZQpzK9JL6Zg5P+q3vSquqOOR iEG24iXhU9bu+xq8STTqMksk6zpwd840XO5FF7tZSZLtBI9u39QwJS18OSkheDI7vy2d wZSxH4h4/A8uJ0N41owGsevaTj4rmBjROONk24TNpHRIKSCLqDdEHOi44BzdyZabeP/o w1MtNnGnYySJbjafTCKAV+WveeYyw8wuK5fSKxyNgPHD68PO4e+bTkYuehyI6I2ZZq0X 5hD4cZAxcTcErDjxBHPFGY4/FoxHVAZbV7B1g1WFtBxDAerXZtA9ktIx1WO7xKWr6tTR xhww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709929833; x=1710534633; 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=Zngz0Qwdg5g8qA0rfMpLWRbCJGQLIbdBhdmr1AdcfbA=; b=qVHPJ9ghDTPm4ZhsgFRr3l2GbyVttdJ8CHZGeLsfE/B/ZpTaPDu83jR/9RE700P6v+ hfRgAWNLLJUATCgwQbUgdzBfuv66xxzK9Pn5KO/8x2QQF/UJ44Tlsr/Wwz7ocXfgEHoN cfaxT//mTxqTHxuCNkZR4AttK2impj5dGaf3Hnv++/lhUuhKbT6drViTJyYiPIjMoNUz JzmL0Dwj43vcuMoCc4ebhU81MgZXU5yUPZK7apCVK7L2W7qbgWuTd2bxQwLJCVmcAd6y DDHe3wjs23EQ5vOeiltHoWoxRQjD/UxPicGSff1SpaJuUrimxEcZEyUaXBU+NZRKHqXU qH1Q== X-Gm-Message-State: AOJu0YywZ+1zfN+8m1SFbfQJOA/2IbaEqzJqtihlV4YKqX1LA8mCEaiw 1hvcbY+S8hFKCHA7SsbxBnvt4Qu5KVuJNlSjbJg6yZqtxMJbrJhFiqPNQH5C X-Google-Smtp-Source: AGHT+IGkxKQ2bDeuzPiNGAQGr3IMne4jddIgbUDpMW1SROZS2ajSISbhGwasO0dA0SSnpmgsdIKkpw== X-Received: by 2002:a05:6808:1a82:b0:3c1:e580:12a with SMTP id bm2-20020a0568081a8200b003c1e580012amr211840oib.38.1709929832980; Fri, 08 Mar 2024 12:30:32 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 12:30:32 -0800 (PST) From: aurtzy Date: Fri, 8 Mar 2024 15:27:14 -0500 Message-ID: <4baeb5b7aaeccf009b60aebd5bac3492695600d3.1709899566.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-quote-1.0.33): New variable. Change-Id: I45591530fe0644ded11bd0048519ac59de82eec9 --- gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bf2ea0ff6b..97dfc03525 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52524,6 +52524,19 @@ (define-public rust-quote-1 (description "Quasi-quoting macro quote!(...)") (license (list license:asl2.0 license:expat)))) +(define-public rust-quote-1.0.33 + (package + (inherit rust-quote-1) + (name "rust-quote") + (version "1.0.33") + (source (origin + (method url-fetch) + (uri (crate-uri "quote" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1biw54hbbr12wdwjac55z1m2x2rylciw83qnjn564a3096jgqrsj")))))) + (define-public rust-quote-0.6 (package (inherit rust-quote-1) -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 5/6] gnu: Add rust-bindgen-cli-0.69. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, 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 , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.170992994212030 (code B ref 69637); Fri, 08 Mar 2024 20:33:03 +0000 Received: (at 69637) by debbugs.gnu.org; 8 Mar 2024 20:32:22 +0000 Received: from localhost ([127.0.0.1]:59715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigtB-00037x-Iu for submit@debbugs.gnu.org; Fri, 08 Mar 2024 15:32:21 -0500 Received: from mail-qk1-f170.google.com ([209.85.222.170]:42108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rigt9-00037c-JM for 69637@debbugs.gnu.org; Fri, 08 Mar 2024 15:32:20 -0500 Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-788455430easo192169585a.0 for <69637@debbugs.gnu.org>; Fri, 08 Mar 2024 12:31:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709929841; x=1710534641; 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=84iXmy94fdY7RGSmzx2h7HTzAz3CFX8kBGaHiomYZJ8=; b=Uw4cdQAhZdG5MplFBFMX+10D9/RarYAOeT+t5PMKPUYmFEs9Nb/S/84Ix0cyLEt19K XlyVif80r8CyZeawcQ0E+9VAoccDbiVk/woV6U7GZqjogfbynpLgdD/jaF3Uz3U545ND GhAzDGtpMUM4uQ7Mnj1DubwLoTM3AcAAL6ku6kB8nTHy9IjRuyYMHOXbgYJm87uod0s/ uYWmPQYKV2oHFqx/LpN/EtlkMCl9HV0Gmr5gFJadp/Qv38PkaX56iNHxNwSxsnyUicOD n6bITQwSO8KcTTqxnuSsiwu5ytydvv/EM8OrhgHUi3Lu6j/bRc76eAcRyaQfxQm0em/C ZCrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709929841; x=1710534641; 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=84iXmy94fdY7RGSmzx2h7HTzAz3CFX8kBGaHiomYZJ8=; b=lZNPz0iwL/P7lA8qYTi0Zeg+7hbBs5yqYR0lgwEZP5eMHMSK7Ka/QqI5hUnvkil4vU D5lFxTzBMEV2rtv+FrQxlL9UWSqFcherCOW08HtnfI+ZKlx4cuZ4buOpOSCbMSb2sO88 c3jt6qPGwE0D9Mc8co8pJ6TAv21jSXkIBO6f9Hx4gI8VA6i8GlBxW/M0xFXvqlGS7cWT IFMd80+7gXIr6LEEHJSHgAzGb2vP4n7WtGcNF/BwywHF3Eb8Za7/OMqAL1jH8JQ+eeSI UV91DK0oFPGEB5ZXeDbJ+EhB0npxEBeaUKMJnN7K31yJ0lLAnGCBOysCKR28EdD9EPOF yomA== X-Gm-Message-State: AOJu0YxldtONF+jabSK+oe3OKTv3HmROx+EmIVfM72U73BiUun6T+Lqw gjsyNAbt0d2mLcp8CkqBvSBm9E/htf4cjl7Lh4CuC7l1kSD+PtQ/vK+84vje X-Google-Smtp-Source: AGHT+IGpGhDsQXlVFeRJNtLwB5Y9aILBou2JvnqY0fkS9jCRIJdKULRT6woNeGV6Ft0uOd9MfIP7Jg== X-Received: by 2002:a05:620a:1921:b0:788:5c79:9ce with SMTP id bj33-20020a05620a192100b007885c7909cemr623332qkb.8.1709929840979; Fri, 08 Mar 2024 12:30:40 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 12:30:40 -0800 (PST) From: aurtzy Date: Fri, 8 Mar 2024 15:27:15 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-bindgen-cli-0.69): New variable. Change-Id: I0841f34d73acf4e161c9f0ba0c6543d7f0d03092 --- gnu/packages/crates-io.scm | 53 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 97dfc03525..150b8884b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6182,6 +6182,59 @@ (define-public rust-bindgen-0.69 bindings to C and C++ libraries.") (license license:bsd-3))) +(define-public rust-bindgen-cli-0.69 + (package + (inherit rust-bindgen-0.69) + (name "rust-bindgen-cli") + (version "0.69.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rust-lang/rust-bindgen.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mksvspqymdypgflgx6xqfxdr9a5wwx534imgcnn3mk7ffz0sqlm")))) + (arguments + (cons* + ;; 1 test case fails (header_ptr32_has_different_size_h); related issue: + ;; https://github.com/rust-lang/rust-bindgen/issues/2638 + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (bindgen (string-append bin "/bindgen")) + (llvm-dir (string-append + (assoc-ref inputs "clang") + "/lib"))) + (mkdir-p bin) + (copy-file "target/release/bindgen" bindgen) + (wrap-program bindgen + `("LIBCLANG_PATH" = (,llvm-dir))))))) + (substitute-keyword-arguments (package-arguments rust-bindgen-0.69) + ((#:skip-build? _) + #f) + ((#:cargo-inputs original-inputs) + `(("rust-bindgen" ,rust-bindgen-0.69) + ("rust-block" ,rust-block-0.1) + ("rust-clap" ,rust-clap-complete-4) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-objc" ,rust-objc-0.2) + ("rust-owo-colors" ,rust-owo-colors-3) + ("rust-prettyplease" ,rust-prettyplease-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.4) + ("rust-similar" ,rust-similar-2) + ,@original-inputs))))) + (native-inputs + (modify-inputs (package-native-inputs rust-bindgen-0.69) + (prepend clang))))) + (define-public rust-bindgen-0.66 (package (inherit rust-bindgen-0.69) -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)) -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 0/6] gnu: mesa: Update to 24.0.2. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Mar 2024 08:14: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: aurtzy Cc: john.kehayias@protonmail.com, 69637@debbugs.gnu.org Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.17102312138351 (code B ref 69637); Tue, 12 Mar 2024 08:14:02 +0000 Received: (at 69637) by debbugs.gnu.org; 12 Mar 2024 08:13:33 +0000 Received: from localhost ([127.0.0.1]:41746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjxGP-0002Ad-0g for submit@debbugs.gnu.org; Tue, 12 Mar 2024 04:13:33 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:42257) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjxGK-0002AL-MW for 69637@debbugs.gnu.org; Tue, 12 Mar 2024 04:13:31 -0400 Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-413383969efso1637695e9.1 for <69637@debbugs.gnu.org>; Tue, 12 Mar 2024 01:12:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710231108; x=1710835908; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=A1N1RTHNbuHhvXHhH8PePgurre6GNSZtH804dWG4NbQ=; b=kOhDIPswTrnczTxXoM2uUxQkHQLjcC6cZRXCwb7Z7uubyh3Vf0ueNprjcL//lBj5zZ G5AeFdG0rDzt4X9hOTj7fTbE28q5IfI4+RKyY12+WeLJ/mCjMxc/zLjhuDVeeSqqfci5 A2bdk9cR/i7gmG9aY/S4kCaFoTSQyfwviPDcigBGMZ4nkCNrOS6CdWL8q8lWtVhLt1a0 2PoocmzoYIhufHf+8ml+Y+ZEramIhoF6sFiGMGb9j5QzT4qa72YAcc13sFGat8XX/Dcd Dyirbz7gclERFTCFFtkccIByHz3zsBbud3YydT0e8GSIjxsBALVmTYG+qQ5NjB4ofOa4 Qabw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710231108; x=1710835908; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=A1N1RTHNbuHhvXHhH8PePgurre6GNSZtH804dWG4NbQ=; b=j+mq011JoMSshUD4w5ZNA52OY+AVxJeevGiFo2FzOD6HvPLtjN/eqEnc0lT3iXOfr9 HT/vKKXKY42XgzVEd7r5+g6/0A7uM4vURrf+oacL7H4DiqDL6B8GR2pDRr8QDNl3Cpnv F39MnHNhi/tFOGgYssRdJGV3idI8w/+PnC+5mmuJoQFY7glPbfAiMmcsd2PY+L3sZChl Jbv2sa7Uxwuax2ZSVuneIa3/GiFxMUSYcn3NDQpfRrSV6GmoE7nuEJBOEyHJFml+0lHS Pnq1mlrh2iwt7GTZuViXeHQKGxFMgMmVZTAOcNW0GM8eNdx3kRbTQ56qbamtXBySzXKA N71Q== X-Gm-Message-State: AOJu0YxtZ8tIwlc6UOUn/91Nvf14erJPOpD2KzwVQMNpQVahQAWO9XMm m3Hnw5Rfnk8uoN0thE6wXzBRy4fRVBhwjR34F7Ji/MxGFyTwzqQI X-Google-Smtp-Source: AGHT+IFFK6ShhDyjGKo9LehZ6hMKzRtlCZP6Pwl5LUv/4oHdPnJ1qn9IRigtISMwvaOeO8oLXOtcsg== X-Received: by 2002:a05:600c:358a:b0:413:88a:4265 with SMTP id p10-20020a05600c358a00b00413088a4265mr8270250wmq.12.1710231107888; Tue, 12 Mar 2024 01:11:47 -0700 (PDT) Received: from localhost ([141.226.12.177]) by smtp.gmail.com with ESMTPSA id r11-20020a05600c35cb00b004127057d6b9sm18215277wmq.35.2024.03.12.01.11.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 01:11:47 -0700 (PDT) Date: Tue, 12 Mar 2024 10:11:45 +0200 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , aurtzy , 69637@debbugs.gnu.org, john.kehayias@protonmail.com References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4Qh6okBXqSpG673t" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --4Qh6okBXqSpG673t Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 08, 2024 at 07:32:39AM -0500, aurtzy wrote: > Hello! >=20 > This series of patches updates Mesa to the latest stable version with the= NVK > Vulkan driver for NVIDIA GPUs enabled for x86_64 systems. >=20 > Mesa 24.0.2 depends on a newer version of libdrm (>=3D 2.4.119), which is > pending in another issue (https://issues.guix.gnu.org/68845). >=20 > Some packages (rust-syn-2.0.39, rust-proc-macro2-1.0.70, rust-quote-1.0.3= 3) > were added specifically to be used as sources that satisfy explicit versi= ons > of dependencies required by Mesa (for NVK). Would it be better to inline > origins in the change-subproject-sources phase? The same question also > applies for the rust-unicode-ident-1 source. Are there other architectures which have rust based drivers? x86_64 isn't the only architecture which has rust building on it. > Currently, the Rust dependencies are found in the build by substituting t= he > fallback https://* URLs in the relevant ./subprojects/*.wrap files with > file://*, then relying on the fallback to "download" from the store. It > seemed a bit hacky doing it this way, but I'm not aware of a better solut= ion. The crates are also available in %output/share/cargo/registry/name-version.crate, although I can't think of a good way to address them by name without using find-files. I would personally replace the versions requested by mesa with whatever version we happen to have in guix so that we don't have to add special versions just for mesa. > A newer Meson version is also required for NVK (>=3D 1.3.0), which this p= atch > series adds a new variable for. >=20 > x86_64-linux and i686-linux have been tested to successfully build. >=20 > Cheers, >=20 > aurtzy >=20 > aurtzy (6): > 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: Add rust-bindgen-cli-0.69. > gnu: mesa: Update to 24.0.2. >=20 > gnu/packages/build-tools.scm | 14 ++++++ > gnu/packages/crates-io.scm | 95 ++++++++++++++++++++++++++++++++++++ > gnu/packages/gl.scm | 68 +++++++++++++++++++------- > 3 files changed, 160 insertions(+), 17 deletions(-) >=20 >=20 > base-commit: 0b5cbca689b2f91949e191ca256ffc9bb48c1141 > --=20 > 2.41.0 >=20 >=20 >=20 >=20 --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --4Qh6okBXqSpG673t Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmXwDkEACgkQQarn3Mo9 g1HtHw//cIa+VDIBim9wckA82Q/Gbz+gt5KU9Gw3UYwbXIC6CtvJSu9GeOsQ8XL3 PPst+DFO5v9f/VrX8QSzWlKutWt3nV7mNrscaJfzWYHzNpkHgJuR3U7L/yYkoU1q jlYwMCe60VjhT8kD5qNJIwHo2uUl2dUAVytUBEy6gsEMNlB1V9sJCxYp30bfZ1j2 krV0ySREy8kLbOKh/XrT2L5KxOo6v6vKuwV3I+/M8/p+eTiNs8kNtmBjbxJm6wK5 gc1WPw4S+2+s4FSupc55pHMbxfd5tBpE0VaWitxmoCgJ4w4O+scamO7rgaOXabqe sb405Sr6UyZJ0dJV1ofGMNNO3K5hyZ+kxFAT0+9nAAhBlskjczXzhWasyDi+3P9F eDIP3e8MQ/Z5X/CI1WlMe21yg7ZyFJLx8PNQ39GHIwQIs71zv7iCmyWB5OC3OYCV GbnWgZYfJ7pBVK7jwVVS5UNlRVEGXWAA3PaMUI4pQCesqThMHC4POdRzR+iJtn0F RT6zhFHFPVBz/2rV+OumIfkMezMxlcxrj8iPynSsPgpZogPWo8bpeKv/bn/IMUlT BUCRcCaiCx9qgVxSrCiY5PQ+4nYTafk1FXp9BXDoK/Tqv+XJbz4Fg+eqGo66zF87 zmErSf8gRKnhndYOvZ7hdys+53omEnlai84TUTbT2+q11pxG+SM= =cl3g -----END PGP SIGNATURE----- --4Qh6okBXqSpG673t-- From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 5/6] gnu: Add rust-bindgen-cli-0.69. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Mar 2024 11:56:01 +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: aurtzy Cc: 69637@debbugs.gnu.org Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171024455012750 (code B ref 69637); Tue, 12 Mar 2024 11:56:01 +0000 Received: (at 69637) by debbugs.gnu.org; 12 Mar 2024 11:55:50 +0000 Received: from localhost ([127.0.0.1]:41946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk0jV-0003JZ-UL for submit@debbugs.gnu.org; Tue, 12 Mar 2024 07:55:50 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:43023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk0jR-0003JH-MP for 69637@debbugs.gnu.org; Tue, 12 Mar 2024 07:55:48 -0400 Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-33eaafc4419so262668f8f.0 for <69637@debbugs.gnu.org>; Tue, 12 Mar 2024 04:55:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710244445; x=1710849245; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=UF7oYm4rQWC0GCcYGRONebAFR8waiLi3hl+tTSkrnN8=; b=bqBQ92br3k6RQr5KvMatGzVtiSwg1HLckOh0t4D035mxn1lrJ0GOmvxv2y8z4einse 8yi7wXOiZ3pzQWWjE6LkubKvfIlazvluJtisPqk3mBu41MxOb/nPNQgHDIv3kZFW+GxX xq1JKFVgZr+EefZuBE6DFcAEbtJsccXKqRy23FNYh5dfHIpE/PzfJ7sz9EG1Pb4/axLk ISYhcTKYVHmshV00i60PMjCXjrKBlpJtI+5CRIL9o8PY6PZ7gSTGZkAmR++SWmFa459A XCq2rgULjToVs3WErYlY0VZo6VqBPgbLRJaSjzTdySFAWchQbNflUeZ695mJarLlDZaA 2jnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710244445; x=1710849245; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UF7oYm4rQWC0GCcYGRONebAFR8waiLi3hl+tTSkrnN8=; b=cpVQwzOPvcAQT23erc4ViIg95RTRCZYFMEDHBfcrnTUs1ejSyVyHGYXMI3jp5nO2rS aiIRe8nJxbSqK+voAhDmsRNCEHNpcj5Cy07Ig2ZVryLNPSYv0QDb1IbTo2Et2V0yLtyd IwOBU4azksdgwmAtvB1zCaJE6vBN/7OZy+Zd67pZCSkpCeZk4jgoigY8xFheqRbKI6Ci 96+I3rwXvjESTE6vdsijgd7f5I6j9A7iB8fMmW7a+FUu0ur1lEA2dWUuJWGmLia/nnDo wAWkH58XjCP0gSeohorxtyePz2e/R7rENmV5hN09lr+QwvT+YAHa5YsoZYvnfJlPv8h9 BqyQ== X-Gm-Message-State: AOJu0Yz6uOdDMFvpLDE1bQ+WBZUn7PWZOCFMlXWwUeFceCvTTUo7RdI0 7HKVuJm6YTz+eD9zwwh/IhSvKOROVsY0o2VEXMDLxY1UUwB0Ug3c X-Google-Smtp-Source: AGHT+IEoDVVOKE4EnrwmfRmkMef8huZqxaxKJI6833gSkJasq5vELc2dM8CHLb4dGwH9goCLYoZ15w== X-Received: by 2002:a05:6000:22e:b0:33e:7b39:6739 with SMTP id l14-20020a056000022e00b0033e7b396739mr9649420wrz.0.1710244445017; Tue, 12 Mar 2024 04:54:05 -0700 (PDT) Received: from localhost ([141.226.12.177]) by smtp.gmail.com with ESMTPSA id n2-20020adfe782000000b0033e7715bafasm8873787wrm.59.2024.03.12.04.54.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 04:54:04 -0700 (PDT) Date: Tue, 12 Mar 2024 13:54:02 +0200 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , aurtzy , 69637@debbugs.gnu.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="J7m1MhcaYfdD1gwo" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --J7m1MhcaYfdD1gwo Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I've applied rust-bindgen-cli to the master branch. I renamed it to remove the version at the end and I switched to the crate-uri since there's no tests in the bindgen-cli folder of the bindgen git repo. I also moved it to the rust-apps module and added the shell completions. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --J7m1MhcaYfdD1gwo Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmXwQloACgkQQarn3Mo9 g1GjHQ//eTbXe3bhmHtVXjKCFjBYk0kXhrewzQT2/d/EtqyZtHGfKortYrdpkS1h tcXR9obc0ovx2Xa4+39QzZNG6d4aJr4hsA2gcjMidHomuunzgv4AvLkJAG1qOeiu c4kYDXlYrRCnO++xkyE28I9JBRZAVKwzQaqm9bslPThcFZ6qVaa1ahS04VMGDlSj dkgY9oFjloyK4hzoqSdAs9MXImFYYzGk/XxEOn/45XcxLtukW9sxvijv7XOnLDVY F/3eoV9xS6XQEi+CJ1c7ip4yffIo659tSUBsuVC4xV+XwuaYunnphEwX8jGCLqbY WlETgnaEvhn2Ki1MQl5QRWNddiGKs/82ZhuOWrrkON9mkFbtF+02GSBZiqpCzKl+ 2cgs4zo9uL3dlwL8RisV3OOKlcXrZfHn6T1R8AceJa6lKF1vH2ela+mGFKgjeB2R 2Q2hbD/Q6PJlCL0bL1W0y6WGLg+qXEef1VjpVxiptwTNuyFPyoGkgNkx2H5IxkzR vEB4kpxoIbzkbZSXpBYR9Yx3alPq+Xv+vuA3XUCXESSaQkdkqQfVz4OXnmSzbGKK Zm6fP03OCthRRTQRVnQt4bMQfxqOXV/e953cUNeZ9MS+1hJGfmdIX6PVj5x2bZCs DhzX+hMhlXDGX5GgzwZXL06UfnI26NjZ1v2kufCGTPHycNi5lIg= =iFwr -----END PGP SIGNATURE----- --J7m1MhcaYfdD1gwo-- From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 0/6] gnu: mesa: Update to 24.0.2. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Mar 2024 01:55:01 +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: Efraim Flashner Cc: john.kehayias@protonmail.com, 69637@debbugs.gnu.org Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171098606610228 (code B ref 69637); Thu, 21 Mar 2024 01:55:01 +0000 Received: (at 69637) by debbugs.gnu.org; 21 Mar 2024 01:54:26 +0000 Received: from localhost ([127.0.0.1]:44750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn7dR-0002et-Ne for submit@debbugs.gnu.org; Wed, 20 Mar 2024 21:54:26 -0400 Received: from mail-qt1-f169.google.com ([209.85.160.169]:55428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn7dP-0002eW-C2 for 69637@debbugs.gnu.org; Wed, 20 Mar 2024 21:54:24 -0400 Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-430b6ff2a20so3025801cf.2 for <69637@debbugs.gnu.org>; Wed, 20 Mar 2024 18:53:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710985958; x=1711590758; darn=debbugs.gnu.org; h=in-reply-to:content-language:references:cc:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=2Z/BxiYNJaun481ANI9ahpr17J7Vcq4OY5Q3dIwutd8=; b=MHvXPJX52A1rYWcr7vcNpKtcu1BOHImWRpirnJ6UOagyFSoixEGHUj7agijFMTRsJ2 wp4etvF8dolMO0ev1Yi93ZDygv5FLoEM56dVc6wFST42VzCO+dPgNoGLRn3YmcQsoMjL UZPqYj6Am8bnQqw6l2iMhzXh7K3Wr/rk4OBt2DGDsqEnSQ3gSpJlfgruGnotyLuOe9fR RnPUaYJs2if7LeOcCP9idZokll/sacnPw4hxqUlLVFjne1B+xy21KK3QsYjvA0UzLTI3 2iCB61nLhzMZ3nmk91SuQaVxNAFBoAbDgPAHaBG6Gq6sQfMbIMuq3YhakKDgd66sgAN/ nRjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710985958; x=1711590758; h=in-reply-to:content-language:references:cc:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=2Z/BxiYNJaun481ANI9ahpr17J7Vcq4OY5Q3dIwutd8=; b=DHuZVii9kQdoOiCrVEh/8B6+zNnEyL3JOjfRjE+vz8ZtwwFRi4D8uEi5JZVjq0/Q31 uQHeQe5NlqbL6f3u+/R4YkJcPauFSb1xVrVDfV7aXIPLfwsEqtQd6ubr6g4XYhloSMBZ vcMOtqlgpr2QZQoLvM0aXe3DEapCs/m++Ddl0wjNneA2AstJIv/8qyclWaOGtF89itpM lWV5K5+G7dIfvYSv68G2Rhyyc/O+z7sNqLHo5eKH+BDrSvRQM9ksMDaEq339ng3/ajql DgEj81MzTskP+pZNK/26RJbSgDykdAu7arB550NEZGQcGT6PnUUOlAx/ZLpiuj086duX q9bg== X-Gm-Message-State: AOJu0YxX29q9xoyTYfs2HlNkcN9wtMdRxKQl0qYIT1341aIvLaOVJXb5 ftTnRpS189P4ZaogcEGq5mTW+EG23nF8lFBowh0m4QeXrxwKYokw X-Google-Smtp-Source: AGHT+IFCSTI1by0t3VcRm6+YtGSM5VFyqKoR6rYLNR4ygZVYj+90ujLzUj1gqscMtcshUafaxDA7mw== X-Received: by 2002:ac8:5dd1:0:b0:430:ec9c:44bd with SMTP id e17-20020ac85dd1000000b00430ec9c44bdmr4404954qtx.60.1710985957817; Wed, 20 Mar 2024 18:52:37 -0700 (PDT) Received: from [192.168.1.87] (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id hg1-20020a05622a610100b00430b5dcac34sm6506945qtb.8.2024.03.20.18.52.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 20 Mar 2024 18:52:37 -0700 (PDT) Content-Type: multipart/alternative; boundary="------------KqdKmMzObqQmrgNhcYVvh4kN" Message-ID: Date: Wed, 20 Mar 2024 21:52:36 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: aurtzy References: Content-Language: en-US In-Reply-To: X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------KqdKmMzObqQmrgNhcYVvh4kN Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/12/24 04:11, Efraim Flashner wrote: > Are there other architectures which have rust based drivers? x86_64 > isn't the only architecture which has rust building on it. There doesn't appear to be any official documentation stating architecture requirements for Mesa with NVK/Rust, however I have added few new inputs other than rust to get NVK working. I've only done extensive testing with x86_64 so I was unsure of potential issues with including this on other architectures (other than i686 not building rust). > The crates are also available in > %output/share/cargo/registry/name-version.crate, although I can't think > of a good way to address them by name without using find-files. > > I would personally replace the versions requested by mesa with whatever > version we happen to have in guix so that we don't have to add special > versions just for mesa. I have/had tried a few approaches to use the crates already available in Guix with no success so far. I've outlined the approaches below; still looking into solutions, but perhaps there's something I'm missing or haven't tried yet? - Simply including crates as (native-)inputs does not make them discoverable by meson. - Mesa uses these *.wrap files which specify the rust dependency versions, source URLs, and tar hashes. I currently get the build working by relying on meson to fall back to "downloading" from a patched source URL (pointing to store), although it still has to match the hash. - I recently discovered a way to disable the hash requirement so I could use a different input version (i.e. one from Guix), but doing it causes "File src/lib.rs does not exist" errors. I'm still looking into this right now, as it seems promising. - Old IRC logs point to projects like newsboat and librsvg which also mix cargo with with another build system, but these start with cargo-build-system with phases added/replaced from the second build system. Cargo.toml doesn't exist in Mesa either (which cargo-build-system seems to depend on), so experimenting with using cargo-build-system didn't yield much. I wanted to look more into the third bullet before responding, but I felt it would be unfortunate to have this information rot while trying to make time for hacking - hopefully it's still useful. Cheers, aurtzy --------------KqdKmMzObqQmrgNhcYVvh4kN Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit
On 3/12/24 04:11, Efraim Flashner wrote:
Are there other architectures which have rust based drivers? x86_64
isn't the only architecture which has rust building on it.
There doesn't appear to be any official documentation stating architecture requirements for Mesa with NVK/Rust, however I have added few new inputs other than rust to get NVK working. I've only done extensive testing with x86_64 so I was unsure of potential issues with including this on other architectures (other than i686 not building rust).
The crates are also available in
%output/share/cargo/registry/name-version.crate, although I can't think
of a good way to address them by name without using find-files.

I would personally replace the versions requested by mesa with whatever
version we happen to have in guix so that we don't have to add special
versions just for mesa.

I have/had tried a few approaches to use the crates already available in Guix with no success so far. I've outlined the approaches below; still looking into solutions, but perhaps there's something I'm missing or haven't tried yet?

- Simply including crates as (native-)inputs does not make them discoverable by meson.

- Mesa uses these *.wrap files which specify the rust dependency versions, source URLs, and tar hashes. I currently get the build working by relying on meson to fall back to "downloading" from a patched source URL (pointing to store), although it still has to match the hash.

- I recently discovered a way to disable the hash requirement so I could use a different input version (i.e. one from Guix), but doing it causes "File src/lib.rs does not exist" errors. I'm still looking into this right now, as it seems promising.

- Old IRC logs point to projects like newsboat and librsvg which also mix cargo with with another build system, but these start with cargo-build-system with phases added/replaced from the second build system. Cargo.toml doesn't exist in Mesa either (which cargo-build-system seems to depend on), so experimenting with using cargo-build-system didn't yield much.

I wanted to look more into the third bullet before responding, but I felt it would be unfortunate to have this information rot while trying to make time for hacking - hopefully it's still useful.

Cheers,

aurtzy

--------------KqdKmMzObqQmrgNhcYVvh4kN-- From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 0/6] gnu: mesa: Update to 24.0.2. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Mar 2024 04:41: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: aurtzy Cc: 69637@debbugs.gnu.org, Efraim Flashner Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171099602711082 (code B ref 69637); Thu, 21 Mar 2024 04:41:03 +0000 Received: (at 69637) by debbugs.gnu.org; 21 Mar 2024 04:40:27 +0000 Received: from localhost ([127.0.0.1]:56875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnAE6-0002sZ-7N for submit@debbugs.gnu.org; Thu, 21 Mar 2024 00:40:26 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:32735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnAE2-0002rp-As for 69637@debbugs.gnu.org; Thu, 21 Mar 2024 00:40:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1710995974; x=1711255174; bh=9cTxVo5hqO+ueScDyBymZqe74ICgtWFie766R55MfmI=; 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=kR9UCRbqvwq6cVEsS8gHjI6xD+kCGALdnklXVsQtUx9sDj2EcYAxM6EaYYU2L+krK Z7jVn+szsmEMAsEy+N4dry9KSBb0hHUotjYGrLCP8PmvrBFAVJdaP1qiFpku4zoJha b7B7bA+lSCS9ep4E5IJWUtyWeX8nC9Ap0MOL3VM1OErCGPAhO7J5gZcddiRlldAK9L 8m+nJASOIAOtoelStUEwbfKZ6Mpx7HckC6LAiDniqQ0oKi+hFW15Qd8YgzcfUamZ0V w+xh+ZbJ9BJnYBvER3iTqgfpeQKLLGvBzfdHD3T6WgIwkjmOoc7fr/Vl2G62RfIYMo GMvPYs0JvCg2A== Date: Thu, 21 Mar 2024 04:39:29 +0000 From: John Kehayias Message-ID: <87msqs19ms.fsf@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi aurtzy and Efraim, On Wed, Mar 20, 2024 at 09:52 PM, aurtzy wrote: > On 3/12/24 04:11, Efraim Flashner wrote: > > Are there other architectures which have rust based drivers? x86_64 > isn't the only architecture which has rust building on it. > > There doesn't appear to be any official documentation stating architectur= e requirements for Mesa with > NVK/Rust, however I have added few new inputs other than rust to get NVK = working. I've only done extensive > testing with x86_64 so I was unsure of potential issues with including th= is on other architectures (other than > i686 not building rust). > I guess this is the main question, if we will try to enable the NVK driver for other architectures, if that is supported. We could also leave it for the known working x86_64 to start. I would say we could provide a mesa variant package for testing, but that might be difficult as far as I know (e.g. trying to get Xorg to use a different mesa package looked difficult from what I saw others try). We could try just checking for where rust is available (is that just supported-systems for the rust package, or do we have other logic?) and building with NVK to see what fails... Though with how long it can take us to build on other architectures, that might take a while to find out and then correct. > The crates are also available in > %output/share/cargo/registry/name-version.crate, although I can't think > of a good way to address them by name without using find-files. > > I would personally replace the versions requested by mesa with whatever > version we happen to have in guix so that we don't have to add special > versions just for mesa. > > I have/had tried a few approaches to use the crates already available in = Guix with no success so far. I've > outlined the approaches below; still looking into solutions, but perhaps = there's something I'm missing or > haven't tried yet? > > - Simply including crates as (native-)inputs does not make them discovera= ble by meson. > > - Mesa uses these *.wrap files which specify the rust dependency versions= , source URLs, and tar hashes. I > currently get the build working by relying on meson to fall back to "down= loading" from a patched source URL > (pointing to store), although it still has to match the hash. > > - I recently discovered a way to disable the hash requirement so I could = use a different input version (i.e. one > from Guix), but doing it causes "File src/lib.rs does not exist" errors. = I'm still looking into this right now, as it > seems promising. > > - Old IRC logs point to projects like newsboat and librsvg which also mix= cargo with with another build > system, but these start with cargo-build-system with phases added/replace= d from the second build system. > Cargo.toml doesn't exist in Mesa either (which cargo-build-system seems t= o depend on), so experimenting > with using cargo-build-system didn't yield much. > > I wanted to look more into the third bullet before responding, but I felt= it would be unfortunate to have this > information rot while trying to make time for hacking - hopefully it's st= ill useful. > > Cheers, > > aurtzy Thanks for this additional info, aurtzy, and your work on this! Efraim, any thoughts on the rust related stuff based on these other attempts? I'm not familiar enough with rust, rust packaging, or what mesa is doing in the meson builds to comment right now. 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. Thoughts? And thanks both of you again! John From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates 0/6] gnu: mesa: Update to 24.0.2. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Mar 2024 11:01:01 +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: John Kehayias Cc: 69637@debbugs.gnu.org, aurtzy Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171101884219114 (code B ref 69637); Thu, 21 Mar 2024 11:01:01 +0000 Received: (at 69637) by debbugs.gnu.org; 21 Mar 2024 11:00:42 +0000 Received: from localhost ([127.0.0.1]:35267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnGA5-0004yB-5K for submit@debbugs.gnu.org; Thu, 21 Mar 2024 07:00:41 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:50263) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnGA0-0004xp-06 for 69637@debbugs.gnu.org; Thu, 21 Mar 2024 07:00:39 -0400 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-41476ddca98so1207275e9.0 for <69637@debbugs.gnu.org>; Thu, 21 Mar 2024 03:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711018730; x=1711623530; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=gH6PE1KqV+RxkzFTv9NM4up4E6k9XI5pet0HrI7e52E=; b=egJADn5JHbeY+DICODViUCTaBzPHWK7oEXU2r4ixojaVJUCJQU+hZqqkljoPOM2GTn T+sq9ej3Yt0ep+gadtAxO5a9snen3UTkEY88CaAqh5Ryp+S6NlC9Xf8h9gfYu6+qnvzt gHH6K7kRLqMyejEMeCTz3h0UTVBtT8BzS7FiueHeo2qiLT4m/7BL+l1PHi/oEisxzDT1 qk6dl58yDECWowLJ8E9QOjq3AJSy2IYjRxSvbA+FX0Kffkwd54tha/l2cemB5VXTk6Ej otvzm85nxEzWmRmfXaFmWdoOkZXJ2qDW3GrXrUcJkPAaUiXExNlm8nALvxcwZOQSK+NL MB1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711018730; x=1711623530; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gH6PE1KqV+RxkzFTv9NM4up4E6k9XI5pet0HrI7e52E=; b=Qq16P2DVASQCxiGjs9VWHItX9M9xfp5gYFFTo8MaDPhULJSJ4CFHMjH9wjIM+XWnjf b6Luqzj53hvoljs08JLQFZAP9IZ78FYVgj7bXh/Z81A/h5Bwgl3oCYOKBzUFl1Ko/Jkq YoPwRshUPjoI4LUG8HY3NnH26OMlKHuYQH0RAj0joNCo13nW+OP+o3nJ7fZZjANAoVfg 8UWJwlzMfj/RAeYL6w9gMFWaEHXQ9Zo6AQi/a8k8eLc4YFMobvmK5+HPxoI6hJP8EIkH JXJs7d2q8am8E22n2Lk7SagE5KR27wWaE0N3oMzLlqMojQlSgds3J2ztaOcRpKzjKCWm uM7g== X-Forwarded-Encrypted: i=1; AJvYcCX6rl7sXLbPWQ1b+w1zmaFp5mRbBycJMXx+HEerbj1JGq3Tx9mOX8v8jB1PQKZq2rp8K7wioN85T84KyEwezy08EnuBjzY= X-Gm-Message-State: AOJu0YxSuCXnUQVs0DGxBUaIbUZZGJcMMIfx+GHtzm5Q7NpKljgakMYQ BdcYIeTR7NUEc10kS8tYNLoNwDqX+Omsca6aKvZ6RqD15B5Sf9h8 X-Google-Smtp-Source: AGHT+IGEfK5bmHJYGe3FotDVyaW88LRumSam9kDeyKLHtWxpPqOKOjxmiL9IgHm/0Pn8xS17Cagk4w== X-Received: by 2002:a05:600c:2484:b0:412:e50f:acaf with SMTP id 4-20020a05600c248400b00412e50facafmr1097398wms.24.1711018729633; Thu, 21 Mar 2024 03:58:49 -0700 (PDT) Received: from localhost ([141.226.12.177]) by smtp.gmail.com with ESMTPSA id f14-20020a05600c4e8e00b0041413aefeb9sm5206323wmq.48.2024.03.21.03.58.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 03:58:48 -0700 (PDT) Date: Thu, 21 Mar 2024 12:58:47 +0200 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , John Kehayias , aurtzy , 69637@debbugs.gnu.org References: <87msqs19ms.fsf@protonmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ElKl8eNSTMMYRDHR" Content-Disposition: inline In-Reply-To: <87msqs19ms.fsf@protonmail.com> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --ElKl8eNSTMMYRDHR Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Mar 21, 2024 at 04:39:29AM +0000, John Kehayias wrote: > Hi aurtzy and Efraim, >=20 > On Wed, Mar 20, 2024 at 09:52 PM, aurtzy wrote: >=20 > > On 3/12/24 04:11, Efraim Flashner wrote: > > > > Are there other architectures which have rust based drivers? x86_64 > > isn't the only architecture which has rust building on it. > > > > There doesn't appear to be any official documentation stating architect= ure requirements for Mesa with > > NVK/Rust, however I have added few new inputs other than rust to get NV= K working. I've only done extensive > > testing with x86_64 so I was unsure of potential issues with including = this on other architectures (other than > > i686 not building rust). > > >=20 > I guess this is the main question, if we will try to enable the NVK > driver for other architectures, if that is supported. We could also > leave it for the known working x86_64 to start. I would say we could > provide a mesa variant package for testing, but that might be > difficult as far as I know (e.g. trying to get Xorg to use a different > mesa package looked difficult from what I saw others try). >=20 > We could try just checking for where rust is available (is that just > supported-systems for the rust package, or do we have other logic?) > and building with NVK to see what fails... Though with how long it can > take us to build on other architectures, that might take a while to > find out and then correct. We have (supported-package? package) to check if a package is supported. Then we can wrap the phase in #$@(if (assoc-ref inputs "rust") ...) and it should all just work. > > The crates are also available in > > %output/share/cargo/registry/name-version.crate, although I can't think > > of a good way to address them by name without using find-files. > > > > I would personally replace the versions requested by mesa with whatever > > version we happen to have in guix so that we don't have to add special > > versions just for mesa. > > > > I have/had tried a few approaches to use the crates already available i= n Guix with no success so far. I've > > outlined the approaches below; still looking into solutions, but perhap= s there's something I'm missing or > > haven't tried yet? > > > > - Simply including crates as (native-)inputs does not make them discove= rable by meson. > > > > - Mesa uses these *.wrap files which specify the rust dependency versio= ns, source URLs, and tar hashes. I > > currently get the build working by relying on meson to fall back to "do= wnloading" from a patched source URL > > (pointing to store), although it still has to match the hash. > > > > - I recently discovered a way to disable the hash requirement so I coul= d use a different input version (i.e. one > > from Guix), but doing it causes "File src/lib.rs does not exist" errors= =2E I'm still looking into this right now, as it > > seems promising. > > > > - Old IRC logs point to projects like newsboat and librsvg which also m= ix cargo with with another build > > system, but these start with cargo-build-system with phases added/repla= ced from the second build system. > > Cargo.toml doesn't exist in Mesa either (which cargo-build-system seems= to depend on), so experimenting > > with using cargo-build-system didn't yield much. > > > > I wanted to look more into the third bullet before responding, but I fe= lt it would be unfortunate to have this > > information rot while trying to make time for hacking - hopefully it's = still useful. 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. > > Cheers, > > > > aurtzy >=20 > Thanks for this additional info, aurtzy, and your work on this! >=20 > Efraim, any thoughts on the rust related stuff based on these other > attempts? I'm not familiar enough with rust, rust packaging, or what > mesa is doing in the meson builds to comment right now. >=20 > 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. >=20 > Thoughts? Looking at qa.guix.gnu.org I believe that gnome-team is going to merge soon, and then the emacs-team is up next. I would prefer to use the already packaged crates but we can go ahead and use the ones from the patchset for now and work out swapping them later. As far as which architectures, I think I'd start with x86_64 only first. And sprinkle a couple of TODOs around. > And thanks both of you again! > John >=20 --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --ElKl8eNSTMMYRDHR Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmX8EuEACgkQQarn3Mo9 g1E27g//b+dJiln9bLhTma3mMzEdR1f+ZkszyVDyQGehsKGFUVEZOR8nOuE9bplY IbeUo57ruipEvT/KSoG6SVHneEr625KJIbR618onhdOvHSbFo6+lQyOPUcEX+WSV XE6C5nMr0ZejIbCbB45mDBE7xTopDdqg196OuG3KqMTXBj8aCcBnlL0GR1fv9Qrm 2g4JTQvo/NZtyyE4pVbdi6iNCz9BPj3dhH4Tqi8T5OUtgI2Jprbe8G+04GqbpxgB 5BYNaxO9NDD/P1QOgsWSH8zKx92KBvIlBNEITYafwbHeQvyfY0tW8nVR/gHrUhKP aDMbpn5qI8SrhVweNvT3LDWZz0hixxcc2Jnz28OmjQWeN29U2TQHNikzEt/D5mER zn+QXGemImYMO35LrZ31sxx0Q0eVs4Pcrwjeb1I/aneTJkPoWsXIynE7TQmdLM9/ 57c6cKHSgnxgfamLxd+m9LSGkZrWLV9hgsbBGpiHp8HN7jVCRk3VmpErVvz34CfN 47Dz90FoCxH46qBsMyhjRL498YCrIFwRRRqw33Z6njs0BIbDJY6oldQu8GZdc9qN JW1nJRFf0SNs3sWeAkUpiQi6G9PL5sgdOR6BouSVq9dmKH1OLFphMoUvJIp0+uH5 Wh+A+HbrW6udz7r7FR2FYJ6+5j3VXKLXhRBOv6HgD165SdEeO3s= =Ka1j -----END PGP SIGNATURE----- --ElKl8eNSTMMYRDHR-- From unknown Tue Jun 24 17:27:05 2025 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 1/5] gnu: Add meson-1.3. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 07:38: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.171109306220331 (code B ref 69637); Fri, 22 Mar 2024 07:38:02 +0000 Received: (at 69637) by debbugs.gnu.org; 22 Mar 2024 07:37:42 +0000 Received: from localhost ([127.0.0.1]:56118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTB-0005Hp-Jm for submit@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:41 -0400 Received: from mail-yw1-f171.google.com ([209.85.128.171]:60472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZT8-0005HS-PV for 69637@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:39 -0400 Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-609f060cbafso23038957b3.0 for <69637@debbugs.gnu.org>; Fri, 22 Mar 2024 00:36:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711092952; x=1711697752; 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=BDLLJ1s1p+qiCUbLUcPFLPm8K/Tszug6A/5puu/IdgE=; b=VfNqGg9fqmSsLVmMuJY+cRBmNDq8wRCPOlN2yybhGN1OzJGouzTC+isRMhtmTcTXI3 zmV0cwRz/AkoYe7VdSN35jQStw1EiIqPvcRUgn4mpYfV8Thqn5ME/k5FoOFVSBX0x2Q/ kAfv+tMLbxQymSR9hH919yTNzeQhbfNek6dIyOfga32qAdiMtGMDC8DKB7YqlEenGgHV MhntxxCYZsrRecL7Im5CTh7lG6TVjVWitnIaEEslIxoYaKDJt0DIXho5kaIo3HnTeYXZ h17eo5xMntbC4YMqQF+Nx1I0RvDW9Ysg+tAeC+viFeTEHKkDaXvby77x3VygkLOV6/DC dIDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711092952; x=1711697752; 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=BDLLJ1s1p+qiCUbLUcPFLPm8K/Tszug6A/5puu/IdgE=; b=tQQvvzJltAtkJ5417ZoNATwrhy/cNatuiLjO6GRc9vaLMTgPxPZd9ncV+8M3QTpo0Y Fpvg/5Q6MtbC67jP/STlLjlTSSazJ0dDqktzywB0wxqCOZoJfGRLAiB3gLJJoudwG0N4 Y7lKAkKgPT6+FbQPVuGiPaZ/RsNjWxIl1ueeLCgNSF9rqMAGOm3M1+/myqGgfGhQq5ZZ KpCEM05cyG3YAcqsM6B80rijej7I+tx6SjJ0cQVXpLWcY4DnzZ1Za8BpOVbe12G6AxJi RCpusrd9H25wgzTgI7VCKTj0EV7oVE2UGHiqF+2F56m9Gej7M/POU30ByMbwXam08UwV /XCA== X-Gm-Message-State: AOJu0Yw3Tn84BsO2neL8uNu3DFPZP5rubfxOqvUwa8r6o4B+2T3K8lOI wIwoutJ9MUgeIiYL1m9lzLAmsVQGWJnYPKHj7eLU9CkCITiOFS4We94n+7gh X-Google-Smtp-Source: AGHT+IFx8kknq6H7polWRhaE9uAzDj9QtW4+2ml84Sc66JA5t4kGI4nq/5H2LKkyr2t3rVVBgbO4ZQ== X-Received: by 2002:a0d:fa43:0:b0:610:e457:a7a7 with SMTP id k64-20020a0dfa43000000b00610e457a7a7mr1365907ywf.14.1711092951805; Fri, 22 Mar 2024 00:35:51 -0700 (PDT) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id jz9-20020a05622a81c900b00430bf59ebccsm648013qtb.11.2024.03.22.00.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:35:51 -0700 (PDT) From: aurtzy Date: Fri, 22 Mar 2024 03:33:17 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/build-tools.scm (meson-1.3): New variable. Change-Id: I3c280851d0ecd116572e982db7a0e90045bcd682 --- gnu/packages/build-tools.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 15d88ded80..e25266820f 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 qblade ;;; Copyright © 2021, 2023 Maxim Cournoyer ;;; Copyright © 2022, 2023 Juliana Sims +;;; Copyright © 2024 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -343,6 +344,19 @@ (define-public meson/newer (base32 "073vf8059nzs6p5aaqr5wva4pgl81540szdb5yw9yhyajwgm8jyh")))))) +(define-public meson-1.3 + (package + (inherit meson/newer) + (version "1.3.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mesonbuild/meson/" + "releases/download/" version "/meson-" + version ".tar.gz")) + (sha256 + (base32 + "1ajvkcyly1nsxwjc2vly1vlvfjrwpfnza5prfr104wxhr18b8bj9")))))) + (define-public meson-python (package (name "meson-python") -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 2/5] gnu: Add rust-syn-2.0.39. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 07:38: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: john.kehayias@protonmail.com, aurtzy , efraim@flashner.co.il, Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171109307520388 (code B ref 69637); Fri, 22 Mar 2024 07:38:03 +0000 Received: (at 69637) by debbugs.gnu.org; 22 Mar 2024 07:37:55 +0000 Received: from localhost ([127.0.0.1]:56134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTP-0005Il-2F for submit@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:55 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:51332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTM-0005IH-N6 for 69637@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:53 -0400 Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-430ccb3d65eso13444561cf.2 for <69637@debbugs.gnu.org>; Fri, 22 Mar 2024 00:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711092966; x=1711697766; 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=3dGPo/am28etvSQcoWGbCv+sEQp95cunyQLnV5FK+tM=; b=W2z2AF2JuSy9DTU+W6sfFqKTnnBkYOif0ClyToP/uAo8AJSn3ZfO/AWfwnmvOEq2dK vEdkNFAl1lDweftQVbRbMw/CFSzUBYfdfQ9tVfyEUQMLhmWhVcUmpwIa1efFOji+D9of d1kBavqCAvMcKj/+nntMggbh/Vru2I0ztIK3hd4O23MwikDbBwmKbB1rrU4LgyhZ6NWu 3PHN6r+fOs35jAR4yQupB/yChQfQjgpN2409l7iibjnMjkU0IjUBAfMoOjWQpJ3JoBL3 LFssJeKvep48IvMWhcpdTn4z5grU+imvlP8Vdmwpuhm5wSA6H2avGUb6sB8NxZXIR/W4 1MtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711092966; x=1711697766; 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=3dGPo/am28etvSQcoWGbCv+sEQp95cunyQLnV5FK+tM=; b=Hd2ZSv3NeXfsHdAyRK2TIA9PPW9H7b5KUITVispQHXWW/GbeSjubgrpMAexu9QWOTL ugi54G/WDqyB6MYe989oSdVsPPMeeG8GcLZQnSE2W+t69KFrFv0w9ks4El5JkYuZgHGR uktnjerk2M1Z7AdAGD+wWCSKbnfruNtDCZuWyAxUDotpv9w/Tjp9UIlUdagB37KaG1A/ ViAYHSInslrWPNaTAhvXkXkfcoSgIZZq51Z5fERU5QRJ6PT8/ZRWp9Jj5Q535o5pPqnM RAlsKgWRhyflyFIoFJkZ85zPSa1d0Pjf3qJEfSrsndrSW8jMVjIRGNYbwIODiiYkZOHk aFUQ== X-Gm-Message-State: AOJu0Yza7EVi6Wqu352mRe6F9uEJwSwTFM0kbijtvEC8HIqXLjm3Ds4h MN93K+6/3ifcSgVnhefWDZECNXRQzDk3YO7oQPoDHbrSMlBvQy5inokBozHo X-Google-Smtp-Source: AGHT+IGKrSB1XWikRDrg35ZXMAZNmeD0UdFJnHgmYImhvdbgW8m27WchquL6tOTjuwhJl1+7pi1SEw== X-Received: by 2002:a05:622a:251:b0:430:a3d6:a8f0 with SMTP id c17-20020a05622a025100b00430a3d6a8f0mr1590106qtx.37.1711092965798; Fri, 22 Mar 2024 00:36:05 -0700 (PDT) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id jz9-20020a05622a81c900b00430bf59ebccsm648013qtb.11.2024.03.22.00.36.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:36:05 -0700 (PDT) From: aurtzy Date: Fri, 22 Mar 2024 03:33:18 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-syn-2.0.39): New variable. Change-Id: I148a87e6927adb897da410c29edec28cc0d5687d --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a67d3d74bb..be33ea973f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2024 Herman Rimm ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; Copyright © 2024 Suhail Singh +;;; Copyright © 2024 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -66818,6 +66819,20 @@ (define-public rust-syn-2 a syntax tree of Rust source code.") (license (list license:expat license:asl2.0)))) +(define-public rust-syn-2.0.39 + (package + (inherit rust-syn-2) + (name "rust-syn") + (version "2.0.39") + (source + (origin + (method url-fetch) + (uri (crate-uri "syn" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ymyhxnk1yi4pzf72qk3lrdm9lgjwcrcwci0hhz5vx7wya88prr3")))))) + (define-public rust-syn-1 (package (name "rust-syn") -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 3/5] gnu: Add rust-proc-macro2-1.0.70. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 07:38: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: john.kehayias@protonmail.com, aurtzy , efraim@flashner.co.il, Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171109307820409 (code B ref 69637); Fri, 22 Mar 2024 07:38:03 +0000 Received: (at 69637) by debbugs.gnu.org; 22 Mar 2024 07:37:58 +0000 Received: from localhost ([127.0.0.1]:56138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTS-0005J6-DQ for submit@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:58 -0400 Received: from mail-yw1-f177.google.com ([209.85.128.177]:50498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTN-0005IL-Tm for 69637@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:54 -0400 Received: by mail-yw1-f177.google.com with SMTP id 00721157ae682-609ff069a40so20536857b3.1 for <69637@debbugs.gnu.org>; Fri, 22 Mar 2024 00:37:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711092967; x=1711697767; 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=H395THGTjOy7TSmXZXRqRMub9pb0jtNVfueiPRgej6U=; b=cGsrmWo+TvwEpkhF5LjR37SdLld4Gcfi/F+jtTyjdaV+nqaB+b9qFQG7U7NmTRstEB t0JyN2KwrrDTIEsYcQnZ9kPU3BBhRslWbljoONYYHPqjYjZ/olVzibWM1i/gn43elLLJ bUfK78TEha9OjruXcG3m08lGKxxqE97uZvTBYOTnQ2anHGhoFK4aIzJTbdZDPXMlOCCR YR5dT3bAdu+Y/xNIpIjBFC9w4cMdN9swaZg8/QDZ2L6jhrSOgVjAfziBukmJ5zGfU363 Ddy81oUMttAQewwS4JxTqKC86NbcWtiQ5PmwiJZePNAZluxKoL1gc6V82TmGEUtYU8BQ 6Lwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711092967; x=1711697767; 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=H395THGTjOy7TSmXZXRqRMub9pb0jtNVfueiPRgej6U=; b=C6TVlFx7eNCkJ4L9skk3oY4ROpLIohcY0lAkd+cZcnvN6A9v+Q7d/kBK+LhwXM1FCA yhFiVKLYSedVCDtc9igHPlLSDPzHU7xMAaCSfngVtI/v+z+OKmp/Dp6vBj1B/st9QJpC mdW7qt89LF4vC7F9gsbm4zx6YdTBicfdOGTYn2QvO7CUdCa1PPA5a834NSFhN1VAl/8u xmoKcYyUEpNmNG2qzrvAZIX6rrUXOYeygSDGXiFfnsuRzDYdKy85nLFUow/3zRlwJ0mW OiQSMQndePD1kEoSNwY4sCDYsvgV9CzbmJ43Ih98SISUlbNqJ8QAPkRM2w0rcFNI3+Ad nqkQ== X-Gm-Message-State: AOJu0Yze7x60XbpAiQwCNgQXZyNOTO42VyliAK85XMBF5MG8dqp50O21 0GwHGsAcbDoJLpEpsquI1hXAMA6gRq1NeAseZUEEV+Vo+geB0DPNwFNiyhBx X-Google-Smtp-Source: AGHT+IGjTYDuNjLE/NHKpmcvsgg345Na/eL/UJAnmruauuyzF9Ko01qXWxSekCGWsQ+GLA6w3fQI6Q== X-Received: by 2002:a0d:c704:0:b0:611:bdd:4534 with SMTP id j4-20020a0dc704000000b006110bdd4534mr1580804ywd.3.1711092967113; Fri, 22 Mar 2024 00:36:07 -0700 (PDT) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id jz9-20020a05622a81c900b00430bf59ebccsm648013qtb.11.2024.03.22.00.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:36:06 -0700 (PDT) From: aurtzy Date: Fri, 22 Mar 2024 03:33:19 -0400 Message-ID: <419ca69cd489680104483785562757be1672bfdc.1711091869.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-proc-macro2-1.0.70): New variable. Change-Id: I4b567bee92c789cb189df2a6e022c2cdcd11bcdb --- gnu/packages/crates-io.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index be33ea973f..c5aff774b3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49652,6 +49652,20 @@ (define-public rust-proc-macro2-1 in terms of the upstream unstable API.") (license (list license:asl2.0 license:expat)))) +(define-public rust-proc-macro2-1.0.70 + (package + (inherit rust-proc-macro2-1) + (name "rust-proc-macro2") + (version "1.0.70") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fzxg3dkrjy101vv5b6llc8mh74xz1vhhsaiwrn68kzvynxqy9rr")))))) + (define-public rust-proc-macro2-0.4 (package (inherit rust-proc-macro2-1) -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 4/5] gnu: Add rust-quote-1.0.33. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 07:38:04 +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, Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171109307920416 (code B ref 69637); Fri, 22 Mar 2024 07:38:04 +0000 Received: (at 69637) by debbugs.gnu.org; 22 Mar 2024 07:37:59 +0000 Received: from localhost ([127.0.0.1]:56140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTS-0005JD-PN for submit@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:59 -0400 Received: from mail-yw1-f178.google.com ([209.85.128.178]:50500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTP-0005IP-DA for 69637@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:55 -0400 Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-609ff069a40so20537077b3.1 for <69637@debbugs.gnu.org>; Fri, 22 Mar 2024 00:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711092968; x=1711697768; 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=3ujYDJ68loif295e/CUJHMianed4D6Dt0KBu4/UQjTs=; b=X1vVLEnB9U/iJFuw2lEinT+CS9gR/oq69VeZHthHV3Pw2aeaiox8idYuk2+xTGA8T5 tlT/fpGMghkxxlSQwpVR9eTTelrPuTRoMEc7zuVw2Dpcpgkt/yZOMg+qKX48XbUvobj1 IiXBOOY7+Snj9+V9uoCktfQ48p0wcEf9r2h1h2HGHQUHShrIrjzXQ53mplxHk6OC7J2x O82xlTYpAU2mp0aLKx1g7+W2mEsu5/g0Ubbgkh82CuarImbHkl7Uiy5or+2ZUrBH68sB xt4Nwds61Tsu4AOih5xvw7sJsawADnc5UNo2QkAn+/yYGA7ygh7ACuHBZ1ell8S8VZWU Vc2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711092968; x=1711697768; 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=3ujYDJ68loif295e/CUJHMianed4D6Dt0KBu4/UQjTs=; b=PmOHgDFalqo8CMFJEXCGB7xKunxHvoG+drzSkwfko2rJwI0++ZXf/EJOFtz3BIQ79J c9Y/Dvle4plTGWmZyqQiEy8WyK0K9GXJe/y7KcknHMWAljua/KY/KEwk0MVIPBbZ3OQb Gc3X9jkeZBvhHfc3MavbLYpJQqErBi2wFi1iheripZB8yWEjAtG8FLM+768e86awRTgf iihqa9+xIITmpSapKHcqqr/RcBzI6rgm2GGlZ3owD7baErFoNHpdgxx3DhKvDgZDMqmW MzCmDFj64eZEI+84Y8L+O+LOkV4kuLodfs9EIC47jRTMRQ0R/G4Z1ccvmRivxZZ3Z+ur pY8A== X-Gm-Message-State: AOJu0YyOKKrxVbZueYvGIdccPjecUDhai014rSv+PlCIdmiE2t7igLR4 mKoGD2UGsRIxTn2DytT+8kg9I9ha9sJIzObXtNL+ixNI/NGIkTej0Mjj1++a X-Google-Smtp-Source: AGHT+IEq7EOpNzry50eiYJst6kL+uphRFULPrayT9s/5fLgT1LbMTFFgjqE6VyasUK359W19meGAsA== X-Received: by 2002:a0d:f106:0:b0:611:1737:2f62 with SMTP id a6-20020a0df106000000b0061117372f62mr1343528ywf.35.1711092968517; Fri, 22 Mar 2024 00:36:08 -0700 (PDT) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id jz9-20020a05622a81c900b00430bf59ebccsm648013qtb.11.2024.03.22.00.36.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:36:07 -0700 (PDT) From: aurtzy Date: Fri, 22 Mar 2024 03:33:20 -0400 Message-ID: <85034c7fb34fb078a10e8f2db41708ec533ae8e4.1711091869.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-quote-1.0.33): New variable. Change-Id: I45591530fe0644ded11bd0048519ac59de82eec9 --- gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c5aff774b3..0a788fc5ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52525,6 +52525,19 @@ (define-public rust-quote-1 (description "Quasi-quoting macro quote!(...)") (license (list license:asl2.0 license:expat)))) +(define-public rust-quote-1.0.33 + (package + (inherit rust-quote-1) + (name "rust-quote") + (version "1.0.33") + (source (origin + (method url-fetch) + (uri (crate-uri "quote" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1biw54hbbr12wdwjac55z1m2x2rylciw83qnjn564a3096jgqrsj")))))) + (define-public rust-quote-0.6 (package (inherit rust-quote-1) -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 5/5] gnu: mesa: Update to 24.0.3. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 07:41: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.171109322320906 (code B ref 69637); Fri, 22 Mar 2024 07:41:02 +0000 Received: (at 69637) by debbugs.gnu.org; 22 Mar 2024 07:40:23 +0000 Received: from localhost ([127.0.0.1]:56336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZVm-0005R5-B9 for submit@debbugs.gnu.org; Fri, 22 Mar 2024 03:40:23 -0400 Received: from mail-qt1-f182.google.com ([209.85.160.182]:46505) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTQ-0005IS-B2 for 69637@debbugs.gnu.org; Fri, 22 Mar 2024 03:38:02 -0400 Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-430ad286ab8so10906481cf.1 for <69637@debbugs.gnu.org>; Fri, 22 Mar 2024 00:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711092970; x=1711697770; 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=DqpIGbkg3h9RQTnaz/Zt0dHzLz5GIMo/7ter5JUwc/o=; b=cJpAk/rfVJYGWfrR5t8PM3wo6INKnTe0HiNVxDhMxVqMFLgm4sdeTG65Itma0y3Pzu dDZeEZ/V/ZYoNE+hZ/sXJeqstFVul8uu8CGZ16851t8FseLpQZujrVcvqLq5LUw74rC4 S+vN7RKwcwRFcbgdAz84PHLJ1TuTnPOJrLKW3tCM5hEKZ7yEun7Tqr/7mOzuhOf9/NAj NkpcY24goGbtwfuJ+maQ55CRnE4GRy1plwssMUDgW6o+zP5vr4qaBARfc1WdjhgkIM8D A1Q/ZE5fd4hsccNULi21AyBMzod4787LL6vXZVfaN1OH69qWd9dmhdxiMYBpwXJu/7Va lOsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711092970; x=1711697770; 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=DqpIGbkg3h9RQTnaz/Zt0dHzLz5GIMo/7ter5JUwc/o=; b=h4K21bYUXA/yiiBHGxf6wIk4VazFUrblbSoQRCDkUc4lxWyNOlzPA7ogMQLJd62NSP PJ3Zna/bGDNpme5HW/SY6zCnJWN36Qr2jjtj1bLArL1oqfl4zkTTO2BIP+2zmkyV5iGF HU975lvRiQdNU2SKi6j1Hip/lyaHkF3R840XOrpE5YMfFaYNptooUcHcUf5ENs+/24OY A5W3KCmKFXm76/fn+amnE+wmT9p8eejsZPHO/4SF1f74iUFn7jUgvPbSGRQ0CxHgM7pt aTdRMR/iME4ZpnhFy6n/pUJdaZyeQJFyAPdwOCSCBOZ9Zic1SnxZ8OziTAGlUTZow8NN guXQ== X-Gm-Message-State: AOJu0Yzd2F52QUipfJJVGOZEfTzwb3uUSHe6OOhr5lo13d4UZHiU6Y/l QIggM/7ygnUhqxTWChvSyPpxhw+dxqUZq4vlb3aDXqFeJc2b8pCFLFEOYhsc X-Google-Smtp-Source: AGHT+IFoxM/meSkdWatiJsjwxS2qc71xuKe97mxa11vwFve0CgHJ9IYbpQbIVie6qCoiTQ1d8qqZLQ== X-Received: by 2002:a05:622a:196:b0:431:435:20fb with SMTP id s22-20020a05622a019600b00431043520fbmr1502539qtw.64.1711092970055; Fri, 22 Mar 2024 00:36:10 -0700 (PDT) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id jz9-20020a05622a81c900b00430bf59ebccsm648013qtb.11.2024.03.22.00.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:36:09 -0700 (PDT) From: aurtzy Date: Fri, 22 Mar 2024 03:33:21 -0400 Message-ID: <06ab73253d226155792ae2817c74d0f8d790db14.1711091869.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gl.scm (mesa): Update to 24.0.3. Change-Id: Ic4176f8a747bcb4c5210af6ccb4569589192e4a7 --- gnu/packages/gl.scm | 80 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f8dc8c1d9d..0265716ac0 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,8 @@ (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 rust-apps) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) @@ -297,17 +302,17 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "23.3.2") + (version "24.0.3") (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 + "1gpx3glifdvyw2fxigiannrxkdfhag6b6h0nxab3azbvlfickbkp")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. @@ -340,15 +345,23 @@ (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) + '()) + ;; NVK-specific inputs + (if (target-x86-64?) + (list clang-15 + rust-bindgen-cli + rust) + '())))) (outputs '("out" "bin")) (arguments (list + #:meson meson-1.3 #:configure-flags #~(list #$@(cond @@ -379,9 +392,12 @@ (define-public mesa "-Dgbm=enabled" "-Dshared-glapi=enabled" - ;; Explicitly enable Vulkan on some architectures. + ;; Explicitly enable Vulkan on some architectures. TODO: Identify other + ;; architectures where nouveau (NVK) works and enable it for them #$@(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 +494,34 @@ (define-public mesa (("'lp_test_arit', ") "")))) (_ '((display "No tests to disable on this architecture.\n")))))) + #$@(if (target-x86-64?) + #~((add-after 'unpack 'change-subproject-sources + ;; Patch subproject source URLs to point to the store, which lets + ;; meson correctly identify rust inputs and avoid an attempt to + ;; download them mid-build. + (lambda _ + (for-each + (match-lambda + ((file input) + (substitute* file + (("source_url = .*$") + "") + (("source_hash = .*$") + "") + (("(source_filename = ).*$" all assign) + (string-append assign input "\n"))))) + ;; TODO: Patch mesa to allow for using sources with different + ;; versions so we don't have to package these crates + ;; specifically for mesa. + '(("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)) -- 2.41.0 From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 0/5] gnu: mesa: Update to 24.0.3. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Mar 2024 01: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: aurtzy Cc: 69637@debbugs.gnu.org, efraim@flashner.co.il Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171133025021210 (code B ref 69637); Mon, 25 Mar 2024 01:31:02 +0000 Received: (at 69637) by debbugs.gnu.org; 25 Mar 2024 01:30:50 +0000 Received: from localhost ([127.0.0.1]:47662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roZAn-0005W2-DL for submit@debbugs.gnu.org; Sun, 24 Mar 2024 21:30:49 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:26659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roZAk-0005Vg-RZ for 69637@debbugs.gnu.org; Sun, 24 Mar 2024 21:30:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1711330196; x=1711589396; bh=KlOFiGhHmRe3uRmD+y1xEgCf2GABz6ncYGWtSQYxEJc=; 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=m4XlP7IYi8YlM6KktYxcKwdvYPbdqrA+13yWjP78jz1MlnCoJCZUs6BrmVGCsQaCe WPPE3xt5lcDFIFWE0EdwHPxSyyJFmzZRvyClGI6GmGdgKatlCPSYiVrgR3KiCu8Ici b+2s3jF/eKKax2MDBRiWLuUZrXqvOtzYoF/2ndP7DvQfZYMpSmUO/pJt7toMKkmign CM3MeeZ+JPkN4JSXc+uhienS9ZTxY0cxJokOSm9IBCpfiDe2rvUPbWTklLVBJ54zf2 cXXLAXsDjD6DpzFMzErrGQUALg9w4d2+tb2BXg0CdO4PpJ6ai6z0zJdXu1EId3GJyC i6NUNa4TJ7W1g== Date: Mon, 25 Mar 2024 01:29:42 +0000 From: John Kehayias Message-ID: <87sf0fnloc.fsf@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi aurtzy and Efraim, On Fri, Mar 22, 2024 at 03:24 AM, aurtzy wrote: > New patchset coming in. Mesa has been updated to 24.0.3, and I've added = TODO > comments for future work as suggested. > Thanks! >> 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 conce= rn we > could save this work for 24.1 when it's planned to move out of this stage= . > Right, I forgot about that. I also remember that it depends (or is helped by) some changes in recent kernels, 6.7 and/or 6.8 if I remember. So, maybe we can take this approach: 1. Make the update just to 24.0.3 for mesa (does that require newer meson?) 2. Add any rust packages as needed to master 3. Either add a mesa-next (to master?) or followup on mesa-updates after it gets merged to master with a mesa based on 24.1 (as soon as it is tagged) with NVK enabled. This will let us at least get mesa built and make for a headstart come 24.0.1. With 24.1 soon ("this quarter"?) and how long it can take us to build on non-x86 architectures, it would be nice to have that go quickly. Since I'll be including cairo, libdrm, and vulkan updates (at least) this round, I anticipate it taking a bit. Does that sound okay? It'll give some time to test things and clean up/find alternatives as Efraim suggested. I'm also not opposed to just enabling NVK now. In that case, we should have one commit to just update mesa and another to enable NVK. >> 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. > Thanks both of you! I would like to start pushing patches and building everything in the next few days, especially as some have sat for a while and it will take time to build. John From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 0/5] gnu: mesa: Update to 24.0.3. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 02:16:01 +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: John Kehayias Cc: 69637@debbugs.gnu.org, efraim@flashner.co.il Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171150570430978 (code B ref 69637); Wed, 27 Mar 2024 02:16:01 +0000 Received: (at 69637) by debbugs.gnu.org; 27 Mar 2024 02:15:04 +0000 Received: from localhost ([127.0.0.1]:35482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpIoh-00083a-FQ for submit@debbugs.gnu.org; Tue, 26 Mar 2024 22:15:04 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:44175) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpIob-00082J-Tr for 69637@debbugs.gnu.org; Tue, 26 Mar 2024 22:15:01 -0400 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-788598094c4so293566085a.0 for <69637@debbugs.gnu.org>; Tue, 26 Mar 2024 19:14:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711505692; x=1712110492; darn=debbugs.gnu.org; h=in-reply-to:content-language:references:cc:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=+YnyM5OQcG2hKU8ZricNGXDHjbhR13qTjUCM23XXg34=; b=LnhavC5Q2ToOrCB0BH9KEwBuTiGRQPz3pn/zkIvANtSiebLUEhWluccnrCebOcM0hZ jQIz+C8fL7dUEnbki5FjK0zBQD2cToMCrTkpNW2fYTHDOif8j8tUsEHI46cIIXHcXdke 7VTW4u+3dgf4fEnDakKa5YIe/ooZdBm/03Fpf51As77W/DcmTU1C0967e0vSnKTt1hqz gQ7ZFp0BjxLjyALF9xSLelFfm3CVbf1Rlnq/sWdQoxCLOSDL5Avoz4ZTApppBF3Uzsc0 cidSZLb0Y8EvR0qvbWzRA1Sy7agcePndn2jHzS2Vs7pfCOj0A5E3z3tibstw1i485VM6 e0vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711505692; x=1712110492; h=in-reply-to:content-language:references:cc:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=+YnyM5OQcG2hKU8ZricNGXDHjbhR13qTjUCM23XXg34=; b=S+PyXRzfh/+DvTtdPun2o5B75MZ4xoD922HjrG8utmxp1Lv85H/dOqcPz3tmAy39lx NUJ9C6tBokiFjvB1RTB1UF3d9SLTWtglFlU6pAfu24ZH0sVCRMKRrje7JP7m1d3DJacf plsAXtuVTRkYCahHzLhWnYwzyCyb8sv254aPKLgzv33iW2EosLEbaWEdtcfLH42zImv+ m2P5gGBVSwZ5WcObPZI4q9Kb1P9GL0K2W4jU1m+5E/Ho08xpnDJ4+nnKGdGMtv6OmSAw 4VKkseCOewRGptwkakhT0yTzKmrk1coYKLKQuMxCnLzk8AF/fXDCfD8A2yJ33WXAeRNn rj0g== X-Gm-Message-State: AOJu0YyZyDNAOJ1X9rBe6djSsFJ6JR3cOdvBY8cEttEbbGZ8zgkbEgL9 /m8mb/6/KfcyD6WnNWL9labwqTtbSEFnvwcl26wfF9DxAc/cWmLe X-Google-Smtp-Source: AGHT+IFTBm+a55zXaFrdF8y/MUT+znBBaufcgJw5sT9n0a5fwLNkWNHzgfUgAljm3d2l9E4lv19weA== X-Received: by 2002:a05:620a:108b:b0:78a:2b1b:e56b with SMTP id g11-20020a05620a108b00b0078a2b1be56bmr4785986qkk.68.1711505692151; Tue, 26 Mar 2024 19:14:52 -0700 (PDT) Received: from [192.168.1.87] (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id a27-20020a05620a067b00b0078a315d9ed4sm3525406qkh.92.2024.03.26.19.14.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Mar 2024 19:14:51 -0700 (PDT) Content-Type: multipart/alternative; boundary="------------vEvVLxLF9Q64DIM2u72DgYoV" Message-ID: <88a7c961-6a3c-4700-8da1-f7dcb5127489@gmail.com> Date: Tue, 26 Mar 2024 22:14:50 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: aurtzy References: <87sf0fnloc.fsf@protonmail.com> Content-Language: en-US In-Reply-To: <87sf0fnloc.fsf@protonmail.com> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------vEvVLxLF9Q64DIM2u72DgYoV Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/24/24 21:29, John Kehayias wrote: > Hi aurtzy and Efraim, > > On Fri, Mar 22, 2024 at 03:24 AM, aurtzy wrote: > >> New patchset coming in. Mesa has been updated to 24.0.3, and I've added TODO >> comments for future work as suggested. >> > Thanks! Happy to help! >>> 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. >> > Right, I forgot about that. I also remember that it depends (or is > helped by) some changes in recent kernels, 6.7 and/or 6.8 if I remember. 6.6 appears to be the minimum required according to mesa docs, if that changes anything: https://docs.mesa3d.org/drivers/nvk.html#kernel-requirements > So, maybe we can take this approach: > > 1. Make the update just to 24.0.3 for mesa (does that require newer > meson?) The meson 1.3 requirement is only for NVK; mesa 24.0.3 without NVK can build with the current meson. > 2. Add any rust packages as needed to master > > 3. Either add a mesa-next (to master?) or followup on mesa-updates after > it gets merged to master with a mesa based on 24.1 (as soon as it is > tagged) with NVK enabled. This will let us at least get mesa built and > make for a headstart come 24.0.1. > > With 24.1 soon ("this quarter"?) and how long it can take us to build on > non-x86 architectures, it would be nice to have that go quickly. Since > I'll be including cairo, libdrm, and vulkan updates (at least) this > round, I anticipate it taking a bit. > > Does that sound okay? It'll give some time to test things and clean > up/find alternatives as Efraim suggested. > > I'm also not opposed to just enabling NVK now. In that case, we should > have one commit to just update mesa and another to enable NVK. Looks like 24.1 stable should be releasing May-June: https://docs.mesa3d.org/release-calendar.html This approach sounds fine to me. I don't mind holding back the NVK-related changes for more testing and improvement. >>> 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. >> > Thanks both of you! I would like to start pushing patches and building > everything in the next few days, especially as some have sat for a while > and it will take time to build. > > John Cheers, aurtzy --------------vEvVLxLF9Q64DIM2u72DgYoV Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit
On 3/24/24 21:29, John Kehayias wrote:
Hi aurtzy and Efraim,

On Fri, Mar 22, 2024 at 03:24 AM, aurtzy wrote:


New patchset coming in.  Mesa has been updated to 24.0.3, and I've added TODO
comments for future work as suggested.


Thanks!
Happy to help! 
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.


Right, I forgot about that. I also remember that it depends (or is
helped by) some changes in recent kernels, 6.7 and/or 6.8 if I remember.

6.6 appears to be the minimum required according to mesa docs, if that changes anything: https://docs.mesa3d.org/drivers/nvk.html#kernel-requirements 

So, maybe we can take this approach:

1. Make the update just to 24.0.3 for mesa (does that require newer
meson?)
The meson 1.3 requirement is only for NVK; mesa 24.0.3 without NVK can build with the current meson.
2. Add any rust packages as needed to master

3. Either add a mesa-next (to master?) or followup on mesa-updates after
it gets merged to master with a mesa based on 24.1 (as soon as it is
tagged) with NVK enabled. This will let us at least get mesa built and
make for a headstart come 24.0.1.

With 24.1 soon ("this quarter"?) and how long it can take us to build on
non-x86 architectures, it would be nice to have that go quickly. Since
I'll be including cairo, libdrm, and vulkan updates (at least) this
round, I anticipate it taking a bit.

Does that sound okay? It'll give some time to test things and clean
up/find alternatives as Efraim suggested.

I'm also not opposed to just enabling NVK now. In that case, we should
have one commit to just update mesa and another to enable NVK.

Looks like 24.1 stable should be releasing May-June: https://docs.mesa3d.org/release-calendar.html

This approach sounds fine to me. I don't mind holding back the NVK-related changes for more testing and improvement. 

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.


Thanks both of you! I would like to start pushing patches and building
everything in the next few days, especially as some have sat for a while
and it will take time to build.

John

Cheers,

aurtzy

--------------vEvVLxLF9Q64DIM2u72DgYoV-- From unknown Tue Jun 24 17:27:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 0/5] gnu: mesa: Update to 24.0.3. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 05:32:01 +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: aurtzy Cc: 69637@debbugs.gnu.org, efraim@flashner.co.il Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.17115174946488 (code B ref 69637); Wed, 27 Mar 2024 05:32:01 +0000 Received: (at 69637) by debbugs.gnu.org; 27 Mar 2024 05:31:34 +0000 Received: from localhost ([127.0.0.1]:35562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpLss-0001ga-D4 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 01:31:34 -0400 Received: from mail-41104.protonmail.ch ([185.70.41.104]:27039) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpLso-0001gG-12 for 69637@debbugs.gnu.org; Wed, 27 Mar 2024 01:31:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1711516946; x=1711776146; bh=DMrgs6+1sy+/g3XCPn5WKMEQTso/u0w7ToLdynicaQc=; 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=Y//g6I3mfVo4+NEUy5UjbJgx1O8tU1nppoM9xl5Pn5ifVfhGaBbEGVfNa7XPTtfzt 8K7Gb5SFZhkptqp16AJ4Pk1OOeg2w3dWJSmBIXYWbOcGmDl+bI12RDigM1h+H1+WkG UMWrjxecM1dK8LXuxmrKuWR1OYgy9uhLQPRzPizSZGNBXsXaoqOASKA3+28XXm+qHN yaAwnPpeJzfBujvYh+oY/Q4NPhWEjpIYVv0Zak9GV9fq+ApQ6hL4MZXv1aYxhUrUyr sHQLRd//3ikat2yQkZoPGz4aSr/Y4x2R2C5geVli79yftrVKc6yNhx9WHVtsXL1LXS nEKHLiBsEjrkA== Date: Wed, 27 Mar 2024 05:22:20 +0000 From: John Kehayias Message-ID: <8734scnta5.fsf@protonmail.com> In-Reply-To: <88a7c961-6a3c-4700-8da1-f7dcb5127489@gmail.com> References: <87sf0fnloc.fsf@protonmail.com> <88a7c961-6a3c-4700-8da1-f7dcb5127489@gmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, On Tue, Mar 26, 2024 at 10:14 PM, aurtzy wrote: > Looks like 24.1 stable should be releasing May-June: > All the more reason to pre-empt it a bit, as I will be away for most of May and the beginning of June :-) > This approach sounds fine to me. I don't mind holding back the NVK-relate= d changes for more testing and > improvement. > Great, thanks! I applied a version only bump locally (haven't pushed it out live yet) and so far so good. I put you as co-author, even though it was just the hash basically, you did save me having to do that. Once this is on mesa-updates, you can base your patches on that (bunch of other updates too) and it can live on that branch in prep for 24.1. Thanks again! John From unknown Tue Jun 24 17:27:05 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: aurtzy Subject: bug#69637: closed (Re: [bug#69637] [PATCH mesa-updates v2 0/5] gnu: mesa: Update to 24.0.3.) Message-ID: References: <87cyqn2sjl.fsf@protonmail.com> X-Gnu-PR-Message: they-closed 69637 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 69637@debbugs.gnu.org Date: Thu, 18 Apr 2024 04:41:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1713415262-9760-1" This is a multi-part message in MIME format... ------------=_1713415262-9760-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #69637: [PATCH mesa-updates 0/6] gnu: mesa: Update to 24.0.2. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 69637@debbugs.gnu.org. --=20 69637: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D69637 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1713415262-9760-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 69637-done) by debbugs.gnu.org; 18 Apr 2024 04:40:06 +0000 Received: from localhost ([127.0.0.1]:50024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxJZ7-0002RA-Hv for submit@debbugs.gnu.org; Thu, 18 Apr 2024 00:40:06 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:10105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxJZ2-0002PU-Aq for 69637-done@debbugs.gnu.org; Thu, 18 Apr 2024 00:40:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1713415179; x=1713674379; bh=VgPHkKdcxz9e1sW2i9oZg5edcI2c2emQw7aZk9flKJI=; 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=n/cB08nsrNRYHfrgqC08xID/TnOS/JeE8tp99bleOC1Iwjc4PW0fxHwwyI9vgW6d3 YgWG3YHcnpM0jaZeyi0O84F6/vk0fAPgF8upyPGLEKghC2bxQ5Wupl9OwiTG/6Ai0q F4PnaioPxGuQkV1EZpM1F8rbUcTrQAxGn0YMEGNMfI3pFK/erHvoLuWS9NOrWFKY3t ayixlG0t0jofo7Fj27f0OIEyrv0yIWfJ5AsWRzUmAiWsa/xHbHNIgGvTgTMpZoJF5y M080Yi3ViPNVWRSvqVf0nbqo+z183f9VlRZPdRCBl+jca/GT9UPJ3o77c9zBR6BWYA xd4n1XjFVlj4w== Date: Thu, 18 Apr 2024 04:39:33 +0000 To: aurtzy From: John Kehayias Subject: Re: [bug#69637] [PATCH mesa-updates v2 0/5] gnu: mesa: Update to 24.0.3. Message-ID: <87cyqn2sjl.fsf@protonmail.com> In-Reply-To: <8734scnta5.fsf@protonmail.com> References: <87sf0fnloc.fsf@protonmail.com> <88a7c961-6a3c-4700-8da1-f7dcb5127489@gmail.com> <8734scnta5.fsf@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69637-done Cc: 69637-done@debbugs.gnu.org, efraim@flashner.co.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Wed, Mar 27, 2024 at 01:17 AM, John Kehayias wrote: > Hello, > > On Tue, Mar 26, 2024 at 10:14 PM, aurtzy wrote: > >> Looks like 24.1 stable should be releasing May-June: >> >> > > All the more reason to pre-empt it a bit, as I will be away for most > of May and the beginning of June :-) > >> This approach sounds fine to me. I don't mind holding back the >> NVK-related changes for more testing and >> improvement. >> > > Great, thanks! > > I applied a version only bump locally (haven't pushed it out live yet) > and so far so good. I put you as co-author, even though it was just > the hash basically, you did save me having to do that. > > Once this is on mesa-updates, you can base your patches on that (bunch > of other updates too) and it can live on that branch in prep for 24.1. > > Thanks again! > John mesa updated to 24.0.3 in b43d36a556c1c1d75fdffbec08d8c39121a528cd and then 24.0.4 in 23928e2d426fb63945682c2c8c60145fe4d333dd. Closing this issue number, but thank you for the efforts so far for NVK. Happy to have patches for 24.1 on mesa-updates when you have them. John ------------=_1713415262-9760-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 8 Mar 2024 12:38:44 +0000 Received: from localhost ([127.0.0.1]:57001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riZUp-0005Ed-Vq for submit@debbugs.gnu.org; Fri, 08 Mar 2024 07:38:44 -0500 Received: from lists.gnu.org ([209.51.188.17]:54982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riZUm-0005EU-4F for submit@debbugs.gnu.org; Fri, 08 Mar 2024 07:38:42 -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 1riZUE-0005Ei-Hi for guix-patches@gnu.org; Fri, 08 Mar 2024 07:38:07 -0500 Received: from mail-qv1-xf36.google.com ([2607:f8b0:4864:20::f36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1riZUC-0005J8-8m for guix-patches@gnu.org; Fri, 08 Mar 2024 07:38:06 -0500 Received: by mail-qv1-xf36.google.com with SMTP id 6a1803df08f44-690578e13c4so9622696d6.1 for ; Fri, 08 Mar 2024 04:38:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709901482; x=1710506282; darn=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=o/i2d6hdYkiA72/+oGrbnyjbR3UKqkDELfdVfbLh3ck=; b=cicge8TMSxGtwKj4nNSs1SlyIC9VigTOcoAZbyjV0+bwCbI4PgmgqJ4Sy9GVmsTHYO pHNL7XJUjGAM6au3oH6wsfQNfDISABx41Ff5UYrnVWCm6JvZczA1rAQOTf9q9mGIY+Hi xVsBDQQFICspQZ4nIQtpqgLAQKzM4KwI/RnoCXE++FJro63Tsmrf6cgmxMxSVHV2k2LW z94rwwwwbivYKGF/QCNwzNNnXfJuf8rvTWLXHLkfmHcdIU5YwPa8+vBBBoy3B7vlU0xB S87mi5sCAHqqVwN7q0EBF4xRaNqR6Q+yXTMjYW9ECZZlHFyXCz0SN8m6Rb0qGUMOLE41 fK3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709901482; x=1710506282; 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=o/i2d6hdYkiA72/+oGrbnyjbR3UKqkDELfdVfbLh3ck=; b=tjFgEjhFozFd7twWCM977wWuysab7n9cAonopDmgQZKFRo2pYBhAZc6IAfcQprEOGj Say3+rtY1LVNzxtmdhKZLCUZBFpRW6NdgYGozlP2Q2iyLVYBeFSjazifI2AGhMxx6f6s rskzuDS6TkhJ/sHIutqprI0cz8NsiJgY2auDDO8zleBUXNE11qDl7LzTH+nEh3gH102U qUrKxP6QGQ4177A+nMwsb/Lqs7IP046BCKcE5ZsI1cal2eqxoO2S7K5vfycFqxa517JZ r76iQuJTL85VYxdevYSn0Mjk4/CoXTfzVcirvcvKO9cS31pUyCt3c0Cw3MSwqG5nA5No Hn1g== X-Gm-Message-State: AOJu0Yxh35G7PFFMRagb1E57vHyrCeXYZJj+HvN+rUQa03SDyW34HEgi xzBjow1syG9biPBl9QoCCPoXhnmqsuKnPOaAhXKqsze18LNAZUqbeSxUyPoc X-Google-Smtp-Source: AGHT+IFqETqbG6dCX9wSXMaDGzUJF3ZjSsMBUAIp2Etv5lF3odA7pvmrMNOSrp1/kaxTH3qOO6BdWQ== X-Received: by 2002:a0c:eed3:0:b0:68f:cd2c:ee9f with SMTP id h19-20020a0ceed3000000b0068fcd2cee9fmr11108908qvs.29.1709901481980; Fri, 08 Mar 2024 04:38:01 -0800 (PST) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id op29-20020a056214459d00b0068fa815b517sm9763048qvb.6.2024.03.08.04.38.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 04:38:01 -0800 (PST) From: aurtzy To: guix-patches@gnu.org Subject: [PATCH mesa-updates 0/6] gnu: mesa: Update to 24.0.2. Date: Fri, 8 Mar 2024 07:32:39 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::f36; envelope-from=aurtzy@gmail.com; helo=mail-qv1-xf36.google.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: john.kehayias@protonmail.com, aurtzy X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello! This series of patches updates Mesa to the latest stable version with the NVK Vulkan driver for NVIDIA GPUs enabled for x86_64 systems. Mesa 24.0.2 depends on a newer version of libdrm (>= 2.4.119), which is pending in another issue (https://issues.guix.gnu.org/68845). Some packages (rust-syn-2.0.39, rust-proc-macro2-1.0.70, rust-quote-1.0.33) were added specifically to be used as sources that satisfy explicit versions of dependencies required by Mesa (for NVK). Would it be better to inline origins in the change-subproject-sources phase? The same question also applies for the rust-unicode-ident-1 source. Currently, the Rust dependencies are found in the build by substituting the fallback https://* URLs in the relevant ./subprojects/*.wrap files with file://*, then relying on the fallback to "download" from the store. It seemed a bit hacky doing it this way, but I'm not aware of a better solution. A newer Meson version is also required for NVK (>= 1.3.0), which this patch series adds a new variable for. x86_64-linux and i686-linux have been tested to successfully build. Cheers, aurtzy aurtzy (6): 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: Add rust-bindgen-cli-0.69. gnu: mesa: Update to 24.0.2. gnu/packages/build-tools.scm | 14 ++++++ gnu/packages/crates-io.scm | 95 ++++++++++++++++++++++++++++++++++++ gnu/packages/gl.scm | 68 +++++++++++++++++++------- 3 files changed, 160 insertions(+), 17 deletions(-) base-commit: 0b5cbca689b2f91949e191ca256ffc9bb48c1141 -- 2.41.0 ------------=_1713415262-9760-1--