From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mMf1MWUT/GVT6AAAqHPOHw:P1 (envelope-from ) for ; Thu, 21 Mar 2024 12:00:53 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id mMf1MWUT/GVT6AAAqHPOHw (envelope-from ) for ; Thu, 21 Mar 2024 12:00:53 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=egJADn5J; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711018853; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=gH6PE1KqV+RxkzFTv9NM4up4E6k9XI5pet0HrI7e52E=; b=EaIxYJjsQ1zkUFW05oixjVjT2UxLMvZat8CkF3mUkzIid76aohysPbYyCl7s8tdsalKPw/ c5QMM4L6uyZWdWG6DbR/2shcrrFyS9cAoDjJwjy9KVFllWJpfZrRohGq39NVAH6BGZvg4B sxXlhr7o0JGqcy1DxtbUY+FgbFyV9ZY7qgduc/a0Wy9swMmXMaiJCb/z3i5GP64GFnkM5K FzeqhPWbTKHgCcrMRqK2oIFdOzE8azE6sFBDtwoDASbIO6iawNAnsDzoSzDW5cLV6DgO95 23m4O/HIyoV1KIY60YPi26IIOMN5qbBZPfPVxft5A4eFJfQiIpdoOFU3HiOs6w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=egJADn5J; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711018853; a=rsa-sha256; cv=none; b=pautAIKCKPtltaQJkJxfweXYn4eb2b8ORL6KhDOURXmJGtfjn9aeOvRo+QbmfnzbH1gcMv AFVl8be6NYtSrVREwTUOJY8zWMil5K2m1ND7DyUcezG5g+jJnUSswv963ap0UNvafGAj3c TURcMFpx40VvvCqYHZVCssn+Q8vWvflmsiT1hvYIp9cIlCNagU+RemIa36xYeWiOFWbdGq ABfqMoZO6TCSfmrCdwP+yWRrpLbjGMCHKOwifOWCQmHT3qQE/n8CF12TF9KRBOYaTrkMwh L4AmddtyPF55LmR12Itj47hWOyKg/qzj9QLPWsmmfSFUmvfEirz7qKpw3Q4X2A== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 602973CFE7 for ; Thu, 21 Mar 2024 12:00:53 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnG9o-0004V1-CU; Thu, 21 Mar 2024 07:00:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnG9m-0004Um-CI for guix-patches@gnu.org; Thu, 21 Mar 2024 07:00:22 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnG9m-0000Uv-3b for guix-patches@gnu.org; Thu, 21 Mar 2024 07:00:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rnGAP-0004z0-VV for guix-patches@gnu.org; Thu, 21 Mar 2024 07:01:01 -0400 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.92 X-Spam-Score: -6.92 X-Migadu-Queue-Id: 602973CFE7 X-Migadu-Scanner: mx11.migadu.com X-TUID: jWFh3NGV4ie5 --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--