From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 11:01:17 2024 Received: (at submit) by debbugs.gnu.org; 6 Sep 2024 15:01:17 +0000 Received: from localhost ([127.0.0.1]:53795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaSb-0004iO-0o for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:01:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:39956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaSY-0004iG-PK for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:01:15 -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 1smaSW-00011k-Lv for guix-patches@gnu.org; Fri, 06 Sep 2024 11:01:13 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smaSU-0002Oi-A3 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:01:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725634858; x=1725894058; bh=usaYlcxUNdOti9r8JrZRvqZGy8gU6QfNOQojl/1qEyo=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=szgf40PALSrXn6aW9/JWbGXhmuZAjMGJJqkwCnog9fUOVnB35vrgQv0iN+HP3AiKb 52CSOK0X5BI2XwdC/pbMFvSlINaubKZ7MhSKBXivz996U4J2/MUSBdYNKqfH5kwS29 YIZ91pwT9ctK5IYBfCFheCHbvr0No1NHI/9zPgtBwsDVk7FT4I4a4iNujeJUOKiKtL OawFrytB9XB4g35cu/DkWSxgtnB8hiDtBhJeoa17oglKCBf73R7KmVBajC15iKWLzw uQs0uToaqiwZC/3xneVKFGU5fs/m0zP8pf47IVK7zu04rHdR2tiQ6NYPrQjUaW5inI EJdVPYTu68Leg== Date: Fri, 06 Sep 2024 15:00:53 +0000 To: guix-patches@gnu.org From: John Kehayias Subject: [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2 Message-ID: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: aae3832594f74e6f73678afc71d9f2125545c590 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.43.16; envelope-from=john.kehayias@protonmail.com; helo=mail-4316.protonmail.ch 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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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 , aurtzy@gmail.com, 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: -2.3 (--) Hello Guix, This is a series of patches to update mesa to the latest, 24.2.2, some dependencies, and fix a vulkan issue . Along the way I updated llvm-for-mesa and mesa inputs, which unifies the changes made to build on aarch64-linux, for instance. Hopefully this doesn= 't introduce regressions. To that end, I've pushed this series now to the mesa-updates branch to see how building on Cuirass goes. (A previous versi= on was there already, but I have updated/rebased and now finally sending this.= ) Some notes: 1. The closure size of mesa has increased, something like from 374 MiB to 5= 42 MiB, mostly due to itself (not sure why) and then also from llvm. This is from going from v15 to v18 and as you'll see in a patch I had to enable building all targets. Possibly this can be alleviated by building a smalle= r clang for mesa? 2. Previous discussion was about getting NVK (which requires rust) built in the last mesa update. I'm not sure the current status but will check with those that were working on it before . = I believe it is no longer experimental, so we should try to include it. Hopefully the patch changes and brief comments explain all, but please do provide any feedback, changes, fixes, etc. The branch has just been rebase= d on master but we can rebase as needed or if there are some critical errors = on these patches I missed. Thanks! John PS: I guess python-team will get this series as I added two comments (no co= de changes) to python packages now needed for mesa. One already has a huge number of dependents anyway, but good to note I suppose. John Kehayias (6): gnu: libdrm: Update to 2.4.123. gnu: wayland-protocols: Update to 1.37. gnu: Remove wayland-protocols-next. gnu: llvm-for-mesa: Update to llvm-18. gnu: llvm-for-mesa: Build all targets. gnu: mesa: Update to 24.2.2. nathan (2): gnu: vulkan-headers: Hard-code libvulkan.so file name. gnu: volk: Hard-code path of vulkan-loader for dynamic loading gnu/packages/freedesktop.scm | 17 ++----------- gnu/packages/gl.scm | 49 ++++++++++++++---------------------- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/llvm.scm | 29 ++++++++++----------- gnu/packages/python-xyz.scm | 2 ++ gnu/packages/vulkan.scm | 41 ++++++++++++++++++++++++++---- gnu/packages/xdisorg.scm | 4 +-- 7 files changed, 75 insertions(+), 69 deletions(-) base-commit: d4fbd1ab341de85c1e5c77e0f7adc5aae056be15 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 11:05:55 2024 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:05:55 +0000 Received: from localhost ([127.0.0.1]:53801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaX4-0004yG-RD for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:05:55 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:37911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaX2-0004y4-MW for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:05:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635145; x=1725894345; bh=9NyotAYBP+YhpkrJu74VSsxdgq2l7NLMeIV/LZXw4ms=; 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=Zhh71rqJmZ3bXE0zO9wCtG2euPFcDhPLRfWEcUHLp8TTov3hSUau5xV05TFCqNFG9 Q3r/RFzqGffk8BvuI4sz/S2LO4TmLo2LsH8zH9Xg+O61CB4Ez1xOaf+f22Ukgq1+qx BATiEl5oKx8UUJqgtfoe9TH8suhW11R8E3eQX4XWt20UGrkCktsw1/UWJXVZugZTSo 20WyYv5qvCGYeA2KjdOvRMNxMd5OfRNnm8Ue07iVIsXtWJ968cz4BBo0WjC1Tznxel 4fn1uSc2K//TM4mTl2tR+EOWaMeke5FcfGjYdd+41Moac4uLzfQnpvxb7aQPXdxVPA Vbm5IhA0A24Lw== Date: Fri, 06 Sep 2024 15:05:41 +0000 To: 73071@debbugs.gnu.org From: John Kehayias Subject: [PATCH mesa-updates 1/8] gnu: libdrm: Update to 2.4.123. Message-ID: <3960dbb23a9af404122ff592174fbbc23a52a4d8.1725634153.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 9fb94943033935afaa1c748683f3317d42e15dd6 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: 73071 Cc: John Kehayias , aurtzy@gmail.com, 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 (-) * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.123. Change-Id: I28ace4f3f121a7177cfc78de8e50364753114e8c --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c041ab1fc0..f78d06b32f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -791,7 +791,7 @@ (define-public pixman (define-public libdrm (package (name "libdrm") - (version "2.4.120") + (version "2.4.123") (source (origin (method url-fetch) (uri (string-append @@ -799,7 +799,7 @@ (define-public libdrm version ".tar.xz")) (sha256 (base32 - "0yijzgg6rdsa68bz03sw0lcfa2nclv9m3as1cja50wkcyxim7x9v")))) + "17mpmp59icp8vaa47dz9gdpdh583kigq47p9a07lp9s9l5kqbfd2")))) (build-system meson-build-system) (arguments (list #:configure-flags -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 11:07:12 2024 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:07:12 +0000 Received: from localhost ([127.0.0.1]:53806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYK-00051h-7q for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:12 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:12971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYI-00051Q-K9 for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635224; x=1725894424; bh=uEnI3jDzmXCKs4ALkehooRUE1rbuorn47UoZuAzA9+A=; 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=e230V/EbRLcqA8DtBnLg0kLxJ4I+0/BLkY2dOWPj/t+fHAq92JIdoAeXz1baH/H5F olnamcByMor2/3yikiP7a6BJW+YD7DRmiYzzoKTv4SsV3XOIZFF7CIBWZ1BRoK2TQx Bg1pNwzUD37lfTB1NrhsSkJufnhBLrcULm5HKwKo3bV+M9ibARB28vWJRIhKUdL9pr 3TDZWWUAO1FoB3dDt+RR+l4Ew/J4pKcGcilum3TsmmjMlWNT80b/JlM9dgoL7DsmOg 1Ank6vI4t2ualjleW0WmbDsgNOGuQDAV9iILW4gTpvlwN+gQOASw3kygBLZrSRynPq NjNUR/aWJJwfA== Date: Fri, 06 Sep 2024 15:07:00 +0000 To: 73071@debbugs.gnu.org From: John Kehayias Subject: [PATCH mesa-updates 3/8] gnu: Remove wayland-protocols-next. Message-ID: <94f8a74b1e9b4cac7d11abf46c0889d577251058.1725634153.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 15801994737f27077e69d79a25538f8f57f5866e 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: 73071 Cc: John Kehayias , aurtzy@gmail.com, 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 (-) The default wayland-protocols has been updated to the latest version. * gnu/packages/freedesktop.scm (wayland-protocols-next): Delete variable. * gnu/packages/kde-plasma.scm (kwin)[native-inputs]: Remove wayland-protocols-next; add wayland-protocols. Change-Id: I7620db01317c08ae6bce029dff4d482a7f868f5f --- gnu/packages/freedesktop.scm | 13 ------------- gnu/packages/kde-plasma.scm | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index de83ed95d6..d5b31bf837 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1395,19 +1395,6 @@ (define-public wayland-protocols . "https://wayland.freedesktop.org/releases.html"))) (license license:expat))) -(define-public wayland-protocols-next - (package (inherit wayland-protocols) - (name "wayland-protocols-next") - (version "1.36") - (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.freedesktop.org/w= ayland/" - "wayland-protocols/-/releases/" v= ersion "/downloads/" - "wayland-protocols-" version ".ta= r.xz")) - (sha256 - (base32 - "14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vz= bi")))))) - (define-public wayland-utils (package (name "wayland-utils") diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 5e9b9688d1..7a35209da8 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -1451,7 +1451,7 @@ (define-public kwin mesa-utils pkg-config qttools - wayland-protocols-next + wayland-protocols xorg-server-for-tests python-minimal ;; for QtWaylandScanner -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 11:07:23 2024 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:07:23 +0000 Received: from localhost ([127.0.0.1]:53810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYU-000526-KZ for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:22 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:35163) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYS-00051r-Ex for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635235; x=1725894435; bh=Hx+4LLjq9fszJThul22pTkiXdP+/ZXxVnksxMx3a2eE=; 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=B0+NG6arGPTsAaxMQLWfiZ5eWRDjHvJwNqaKEftscYnfbW+UkiyBxdj1eePoClLFM yt15jRxTYXxrw8GO1gKncKF4J4W7gqcjlRx4fI4nBQxyrZBJZjYUP+1ObpaMfOsQ1j 8KeRLR8i51WkO30zQodwXiT+denLSW+h73qlRgsOBo8NIOcS5VNa6PfO+fYqZsG4EQ YgcUcUACC9vWQUBqdJLjxF9X0HRMj/GWLQX/+l9jAoQygNedPtylahlKXMLsg9Yx2T ECSjxzfJoTwhYmBr912ANtu7B2j+LO7CEBSela3kM51vVPqrEEulBZsveHDz4pvAH5 TnY8rWfRSfJKA== Date: Fri, 06 Sep 2024 15:07:13 +0000 To: 73071@debbugs.gnu.org From: John Kehayias Subject: [PATCH mesa-updates 4/8] gnu: vulkan-headers: Hard-code libvulkan.so file name. Message-ID: <5eec37609a42d1dc349b3e37a96d794140f154fa.1725634153.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 623a0fa05cc7d6d1619f3e8183368460eeb0cc4f 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: 73071 Cc: John Kehayias , =?utf-8?Q?Ludovic_Court=C3=A8s?= , nathan , aurtzy@gmail.com, 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 (-) From: nathan * gnu/packages/vulkan.scm (vulkan-headers): Rename to=E2=80=A6 (vulkan-headers/no-loader): =E2=80=A6 this. (vulkan-headers): New variable. (vulkan-loader): Depend on =E2=80=98vulkan-headers/no-loader=E2=80=99. Change-Id: Ic674a4d965d8049e388d75137111ed0253ca3b18 Co-authored-by: Ludovic Court=C3=A8s Signed-off-by: John Kehayias --- gnu/packages/vulkan.scm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1b69da1a4d..e76455a835 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -299,7 +299,8 @@ (define-public vkbasalt (license (list license:bsd-3 ; src/reshade/LICENSE.md license:zlib)))) ; LICENSE -(define-public vulkan-headers +;; vulkan-headers, but without the path to vulkan-loader patched in. +(define-public vulkan-headers/no-loader (package (name "vulkan-headers") (version "1.3.280.0") @@ -316,6 +317,7 @@ (define-public vulkan-headers (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. + (properties '((hidden? . #t))) (home-page "https://github.com/KhronosGroup/Vulkan-Headers") (synopsis "Vulkan Header files and API registry") @@ -323,6 +325,25 @@ (define-public vulkan-headers "Vulkan-Headers contains header files and API registry for Vulkan.") (license (list license:asl2.0)))) ;LICENSE.txt +(define-public vulkan-headers + (package + (inherit vulkan-headers/no-loader) + (arguments + (substitute-keyword-arguments (package-arguments vulkan-headers/no-lo= ader) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'patch-libvulkan-file-name + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "include/vulkan/vulkan.hpp" + (("dlopen\\( \"libvulkan.so") + (string-append "dlopen(\"" + (search-input-file + inputs "/lib/libvulkan.so")))))))))) + (inputs + (modify-inputs (package-inputs vulkan-headers/no-loader) + (prepend vulkan-loader))) + (properties '()))) + (define-public vulkan-loader (package (name "vulkan-loader") @@ -383,7 +404,7 @@ (define-public vulkan-loader python wayland)) (inputs - (list vulkan-headers libxrandr)) + (list vulkan-headers/no-loader libxrandr)) (native-search-paths (list (search-path-specification (variable "XDG_DATA_DIRS") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 11:07:42 2024 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:07:42 +0000 Received: from localhost ([127.0.0.1]:53816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYo-00052n-2S for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:42 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:58007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYm-00052U-B1 for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635254; x=1725894454; bh=RUMqlnaKCQQgSYOcxrzFHuN1UOoQY03zpD+SyZMv4wk=; 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=YwhwNQNLp+SSrEPPsrlx0SKSeak+Nnt6HKUqqrSoGSTkaEkqKVrDjCdojokFmFOdd cSpoXO1QCpPoJoPo+BS5PTCxSO1hPnHbqYEZhksaaO3H2mcgt7OwBxColL2BlQiWI3 dfeL63+5T8KC84yjIBRdIvA6yK0aAd2yYtpWQl2o+hcRdgBRwdTfsfOD79iXMwDRSD 4RXLNjTbLov8tYmmszqBWmMT5aaik2kC0BVtebGiF6+jrsSboA7c2OxIpWF3PFgGOp 3PrX+/fQ3+f2RzuSFaQD3bYKbGT9VJ0qiyYTiSUiHROYXlUMOXiSKMUo3UNh4qL8T1 RkhIgc1Itmr7w== Date: Fri, 06 Sep 2024 15:07:31 +0000 To: 73071@debbugs.gnu.org From: John Kehayias Subject: [PATCH mesa-updates 5/8] gnu: volk: Hard-code path of vulkan-loader for dynamic loading Message-ID: <92b1626bd63250dd639bcb8d9d3be2e3def22a73.1725634153.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 980bde94717c1908484dc841ebbc405afebad793 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: 73071 Cc: John Kehayias , =?utf-8?Q?Ludovic_Court=C3=A8s?= , nathan , aurtzy@gmail.com, 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 (-) From: nathan Until now, we=E2=80=99d get: $ guix shell vulkan-tools -- vulkaninfo ERROR at /tmp/guix-build-vulkan-tools-1.3.280.0.drv-0/source/vulkaninfo/.= /vulkaninfo.h:412: Failed to initialize: Vulkan loader is not installed, no= t found, or failed to load. This patch fixes it and potentially for other programs as well. * gnu/packages/vulkan.scm (volk)[arguments]: use gexp. <#:phases>: Patch dlopen with libvulkan.so. [input]: Add vulkan-loader. Change-Id: I5ef0eb13d35e517b8947faddace641882a775b80 Co-authored-by: Ludovic Court=C3=A8s Signed-off-by: John Kehayias --- gnu/packages/vulkan.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index e76455a835..dd5b51c7fe 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -654,9 +654,19 @@ (define-public volk "0x4jhc8n9c4k8svmmcaxxs613xbsav7wam94gacddlm738cwp13v")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;no test - #:configure-flags '("-DVOLK_INSTALL=3DON" "-DVOLK_PULL_IN_VULKAN=3D= ON"))) - (inputs (list vulkan-headers)) + (list + #:tests? #f ;no test + #:configure-flags #~(list "-DVOLK_INSTALL=3DON" "-DVOLK_PULL_IN_VULK= AN=3DON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-loader-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "volk.c" + (("dlopen\\(\"libvulkan.so") + (string-append "dlopen(\"" + (search-input-file + inputs "/lib/libvulkan.so"))))))))) + (inputs (list vulkan-headers vulkan-loader)) (synopsis "Meta loader for Vulkan API") (description "Volk is a meta-loader for Vulkan. It allows you to dynamically load -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 11:07:53 2024 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:07:53 +0000 Received: from localhost ([127.0.0.1]:53820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYz-00053E-Fu for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:53 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:37385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYx-00052z-Ud for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635265; x=1725894465; bh=3QuD1enhSII2XPlPVxw7oWPa1tRNJHZDbGtM7otmlPs=; 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=lS+E4Ot3mkoYE0NkVP262Nbp0Fi1vrd436uzRVj5V07MUE5YwZS/jgtdZGuHInMna ohp3a6B4WFRX4GIX67rt1hkKl0ZcSibsPSbOC7Y/monGftTCBGjQ8BYfRMxiQ2uB14 micpSnfDmzVk/sdCnJOytot+wFPOXIHj7mh2sAwBby8q2IXNzpPiupGymLDMdX3kTk jrz+4V8bNmrJJ1A4vXgdEfOU1c75mbiwi26zIlUe/aE5KRxTzqdzvxkKWvnzNK8Qir nUHQaum/5zHElVRVeAe3ieXlNZEMphpwy9Kflh0pwym1UdHLLYu2zXuL8u6qTY3z0Z qUtWIzC3ajJvA== Date: Fri, 06 Sep 2024 15:07:41 +0000 To: 73071@debbugs.gnu.org From: John Kehayias Subject: [PATCH mesa-updates 6/8] gnu: llvm-for-mesa: Update to llvm-18. Message-ID: <6037f5e17a5c583fbdc38e75ba88f7122b44e180.1725634153.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 43be75a3591ba832af31d61e0d1e44b8d2b71d37 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: 73071 Cc: John Kehayias , aurtzy@gmail.com, 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 (-) * gnu/packages/llvm.scm (llvm-for-mesa): Update to llvm-18. * gnu/packages/gl.scm (mesa)[inputs]: Always use llvm-for-mesa (remove llvm= -18 for aarch64 to use llvm-for-mesa). (mesa-opencl)[native-inputs]: Remove clang-15. Add clang-18. Change-Id: I767d40d62a827864d3d109c44f82a43302875eb8 --- gnu/packages/gl.scm | 8 ++++---- gnu/packages/llvm.scm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 849ca076dc..ab53b1761a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -323,15 +323,15 @@ (define-public mesa (inputs (append (if (target-aarch64?) - (list clang-18 - llvm-18) - (list llvm-for-mesa)) + (list clang-18) + '()) (list elfutils ;libelf required for r600 when usi= ng llvm expat (force libva-without-mesa) libxml2 libxrandr libxvmc + llvm-for-mesa vulkan-loader wayland wayland-protocols @@ -602,7 +602,7 @@ (define-public mesa-opencl (if (target-aarch64?) (package-native-inputs mesa) (modify-inputs (package-native-inputs mesa) - (prepend clang-15)))))) + (prepend clang-18)))))) (define-public mesa-opencl-icd (package/inherit mesa-opencl diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index fd2e815fe0..7fcb15891d 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -2152,7 +2152,7 @@ (define-public emacs-clang-rename (define-public llvm-for-mesa ;; Note: update the 'clang' input of mesa-opencl when bumping this. - (let ((base-llvm llvm-15)) + (let ((base-llvm llvm-18)) (package (inherit base-llvm) (name "llvm-for-mesa") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 11:08:11 2024 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:08:11 +0000 Received: from localhost ([127.0.0.1]:53828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaZG-00054V-Tb for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:08:11 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:53927) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaZE-000542-MT for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:08:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635283; x=1725894483; bh=xBxUhjI+hJzkso+BzQruSK1bBQD5lEhT+e/ZPcVQKfk=; 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=KBch0QeAagOCqTuxUWBAMUpsWGM/RlAdMRvMcaCgdv0VivXeJydBnleQY9d/rKwfB 5MNY0q/+mz9KiuLxsBFCE0zq0X6eXXfO9k7RX0xGvZV2nEYelbhsOAYPeCxirRK420 utO8tfk5BEWTzNfxGRpYQDO99/QD6eQfyjHetHtxqfL5j+rM6KeYHYifqKU7uWkxvf I2Houu0synwGz7Ek0YNmdIpIiJuQ/s/CicVZemnpIwxlTwLo7KLUf+wmC1wnQ1nF1B 6bJ4aXr05FAgKOBwanTckDZZSUQW7XckX/UNT3zR3FgnTw/lli92TCw1HsqH1i5vOn uMh43NuuWxVZg== Date: Fri, 06 Sep 2024 15:07:59 +0000 To: 73071@debbugs.gnu.org From: John Kehayias Subject: [PATCH mesa-updates 7/8] gnu: llvm-for-mesa: Build all targets. Message-ID: <0ff4c2660a52582beaeb88706fee678da4847e73.1725634153.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 01788e3613bfb797c2abb2beca352ac0d07a3256 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: 73071 Cc: John Kehayias , aurtzy@gmail.com, 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 (-) This change is needed for updating mesa to 24.2.1. Otherwise, mesa fails t= o build. For example, linking intel_clc fails with errors of libclang-cpp.so having undefined references to various LLVM targets. It is possible that just some LLVM targets could be built or a modified version of the clang input for mesa (now required) could be used to try to reduce the closure size as before. * gnu/packages/llvm.scm (llvm-for-mesa)[arguments]: Don't set the LLVM_TARGETS_TO_BUILD configure flag. Also, don't remove it from the inherited configure-flags. Fix indentation. Change-Id: I4a2b7239e6ea77b0d3bce10bdf945691faa84994 --- gnu/packages/llvm.scm | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 7fcb15891d..800fe29599 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -22,7 +22,7 @@ ;;; Copyright =C2=A9 2021 Lars-Dominik Braun ;;; Copyright =C2=A9 2021, 2022 Guillaume Le Vaillant ;;; Copyright =C2=A9 2022, 2024 Greg Hogan -;;; Copyright =C2=A9 2022 John Kehayias +;;; Copyright =C2=A9 2022, 2024 John Kehayias ;;; Copyright =C2=A9 2022 Cl=C3=A9ment Lassieur ;;; Copyright =C2=A9 2022 Zhu Zihao ;;; Copyright =C2=A9 2023 Hilton Chain @@ -2166,21 +2166,18 @@ (define-public llvm-for-mesa ,@modules)) ((#:configure-flags cf ''()) #~(cons* - ;; AMDGPU is needed by the vulkan drivers. - #$(string-append "-DLLVM_TARGETS_TO_BUILD=3D" - (system->llvm-target) ";AMDGPU") - #$@(if (%current-target-system) - '("-DBUILD_SHARED_LIBS:BOOL=3DTRUE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=3DTRUE") + #$@(if (%current-target-system) + '("-DBUILD_SHARED_LIBS:BOOL=3DTRUE" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=3DTRUE") '()) - ;; Skipping tools and utils decreases the output by ~100 MiB= . - "-DLLVM_BUILD_TOOLS=3DNO" - (remove - (cut string-match - #$(if (%current-target-system) - "-DLLVM_(LINK_LLVM_DYLIB|TARGETS_TO_BUILD|INSTAL= L_UTILS).*" - "-DLLVM_(TARGETS_TO_BUILD|INSTALL_UTILS).*") <>) - #$cf))) + ;; Skipping tools and utils decreases the output by ~100 MiB. + "-DLLVM_BUILD_TOOLS=3DNO" + (remove + (cut string-match + #$(if (%current-target-system) + "-DLLVM_(LINK_LLVM_DYLIB|INSTALL_UTILS).*" + "-DLLVM_INSTALL_UTILS.*") <>) + #$cf))) ((#:phases phases '%standard-phases) #~(modify-phases #$phases #$@(if (%current-target-system) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 11:08:22 2024 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:08:22 +0000 Received: from localhost ([127.0.0.1]:53832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaZR-00054v-FX for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:08:22 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:44825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaZP-00054g-H9 for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:08:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635294; x=1725894494; bh=K62tQnT6x8qIfj1/z3bDDlMi8R1oN7YlMo6nQ8Ks9A0=; 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=SHTqpxBy+KLukIXrtGcrOhK25D4N4Q0vyJprD2ZfaF00TO8T1jKeOHnpzH00jiNtC f9WC0eVbOM/49nVhBXt96i4IBDD+ckeUzJ1cN88iJgqhTNPZHGe1CygV2WSkDMmqXu zfTi249f5TGVciaZt05333wuWySZdjWUhyz6ixsaSXa3b+Y7nZVLBcdfSV7UR6fKbQ N/G17m+zMWwGCtkUBOkS21XbDL828+H0nJbGCO4a3byEsFuOMTs9F0GwpVxWXHdXqo 2wd/zDrtwZqYgJFUwgZkOkwK6rYxiXIt7hx22zfm2RkWDJSvsbkd16VHycx0f7j+hV JxJiaV3iHKJgA== Date: Fri, 06 Sep 2024 15:08:08 +0000 To: 73071@debbugs.gnu.org From: John Kehayias Subject: [PATCH mesa-updates 8/8] gnu: mesa: Update to 24.2.2. Message-ID: In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 90cc0872112bb0c9fd540be2fe1c0f258ad1913c 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: 73071 Cc: John Kehayias , aurtzy@gmail.com, 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 (-) Note the clang input for mesa was in inputs for aarch64-linux but more generally in native-inputs for mesa-opencl. Moved to native-inputs for all (mesa does not retain a reference to clang). * gnu/packages/gl.scm (mesa): Update to 24.2.2. [inputs]: Move clang-18 when building for aarch64-linux to ... [native-inputs]: ... here for all architectures. Add python-ply, and python-pyyaml. Use libclc for all architectures. (mesa-opencl)[inputs, native-inputs]: Remove fields. * gnu/packages/python-xyz.scm (python-pyyaml, python-ply): Add a comment ab= out being dependencies of mesa. Change-Id: Ie262e6ea5a31fda0e410277256c203ea3caed96b --- gnu/packages/gl.scm | 49 ++++++++++++++----------------------- gnu/packages/python-xyz.scm | 2 ++ 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index ab53b1761a..ab18a3e5a7 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -15,7 +15,7 @@ ;;; Copyright =C2=A9 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright =C2=A9 2020 Kei Kebreau ;;; Copyright =C2=A9 2021 Ivan Gankevich -;;; Copyright =C2=A9 2021, 2022, 2023 John Kehayias +;;; Copyright =C2=A9 2021-2024 John Kehayias ;;; Copyright =C2=A9 2022 Petr Hodina ;;; Copyright =C2=A9 2023 Kaelyn Takata ;;; Copyright =C2=A9 2023, 2024 Zheng Junjie <873216071@qq.com> @@ -298,7 +298,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "24.0.4") + (version "24.2.2") (source (origin (method url-fetch) @@ -308,7 +308,7 @@ (define-public mesa "mesa-" version ".tar.xz"))) (sha256 (base32 - "1w25lwdrb0ffrx2fjk9izbvpcgf9ypfc7v32zybwvjwql0qbvzlh")))) + "00hxi7wjp368kh5qq2v25nyzjrf0grsx55w55fg4bgpd0hqps1zx")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. @@ -321,35 +321,32 @@ (define-public mesa libxxf86vm xorgproto)) (inputs - (append - (if (target-aarch64?) - (list clang-18) - '()) - (list elfutils ;libelf required for r600 when usi= ng llvm - expat - (force libva-without-mesa) - libxml2 - libxrandr - libxvmc - llvm-for-mesa - vulkan-loader - wayland - wayland-protocols - `(,zstd "lib")))) + (list elfutils ;libelf required for r600 when using= llvm + expat + (force libva-without-mesa) + libxml2 + libxrandr + libxvmc + llvm-for-mesa + vulkan-loader + wayland + wayland-protocols + `(,zstd "lib"))) (native-inputs (append (list bison + clang-18 flex gettext-minimal glslang + libclc pkg-config python-libxml2 ;for OpenGL ES 1.1 and 2.0 support python-mako + python-ply + python-pyyaml python-wrapper (@ (gnu packages base) which)) - (if (target-aarch64?) - (list libclc) - '()) (if (%current-target-system) (list cmake-minimal-cross pkg-config-for-build @@ -594,15 +591,7 @@ (define-public mesa-opencl (arguments (substitute-keyword-arguments (package-arguments mesa) ((#:configure-flags flags) - #~(cons "-Dgallium-opencl=3Dstandalone" #$flags)))) - (inputs - (modify-inputs (package-inputs mesa) - (prepend libclc))) - (native-inputs - (if (target-aarch64?) - (package-native-inputs mesa) - (modify-inputs (package-native-inputs mesa) - (prepend clang-18)))))) + #~(cons "-Dgallium-opencl=3Dstandalone" #$flags)))))) (define-public mesa-opencl-icd (package/inherit mesa-opencl diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 21e04e75e9..416db71d68 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6133,6 +6133,7 @@ (define-public python-itsdangerous environments and back.") (license license:bsd-3))) +;; WARNING: This package is a dependency of mesa. (define-public python-pyyaml (package (name "python-pyyaml") @@ -20995,6 +20996,7 @@ (define-public python-pika network support library.") (license license:bsd-3))) +;; WARNING: This package is a dependency of mesa. (define-public python-ply (package (name "python-ply") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 11:13:03 2024 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:13:03 +0000 Received: from localhost ([127.0.0.1]:53850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smadz-0005MM-Ce for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:13:03 -0400 Received: from mail-4321.protonmail.ch ([185.70.43.21]:34943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smadx-0005Li-QK for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:13:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635204; x=1725894404; bh=vxPWCk5xuoIKRCeHtea5CUdt9j3H3Sksm0AdWELBkYg=; 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=AwQ7/MgsnFeSR6qqEjHkuV5WOcK2DtWpWgD2g9DrCWDMxH3YTWzxLGIHDVeJXuF/o 9FF6QQO7C/RR62hcTJTe7kzvlFHhbm1xq5PbGqM64nsNlWiHB9eJXYDdxbJ359iqzX aIGbtUOy5rqxQPUmGRbPG8sL+98aeNQSlVD+XQ9vv6pVIuKMwpZl/1MkpMKotQJVOv zqLvs0QSwBkSl09svmAaCSq5SicfDODiof4gMsTPR4NaSlEz0pFBw9/l4gXHlVmHMJ KoiLPEsIhefRHR+WuzjNak0HZtJyAn/UT7NUZTq1g2xiwSRFznRXeWdIt6/yZ03g0N VAqrEz9JA2rVA== Date: Fri, 06 Sep 2024 15:06:38 +0000 To: 73071@debbugs.gnu.org From: John Kehayias Subject: [PATCH mesa-updates 2/8] gnu: wayland-protocols: Update to 1.37. Message-ID: <5b487027aa79c9f1547b28f635a2122d0e0b8d5a.1725634153.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 353ec03817d17bb7e871f337a2c714d2156fbc4d 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: 73071 Cc: John Kehayias , aurtzy@gmail.com, 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 (-) * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.37. Change-Id: I32837fc9c6609532557c31cf94b0f87e999680d8 --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index cb1d625d24..de83ed95d6 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1367,7 +1367,7 @@ (define-public wayland (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.32") + (version "1.37") (source (origin (method url-fetch) (uri (string-append "https://gitlab.freedesktop.org/wayland/= " @@ -1375,7 +1375,7 @@ (define-public wayland-protocols name "-" version ".tar.xz")) (sha256 (base32 - "04dsn79409mryxs6maq9kfhca97gvl3pr1ggjnv9d0hc6jfpjnbl")))) + "09pk3qhpc29x1a6srpqqw9dcvalg33vfmp14d276is7j4klrn3m7")))) (build-system meson-build-system) (inputs (list wayland)) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 08 23:43:52 2024 Received: (at submit) by debbugs.gnu.org; 9 Sep 2024 03:43:52 +0000 Received: from localhost ([127.0.0.1]:60413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snVJg-00080z-1U for submit@debbugs.gnu.org; Sun, 08 Sep 2024 23:43:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:35970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snVJd-00080r-EP for submit@debbugs.gnu.org; Sun, 08 Sep 2024 23:43:50 -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 1snVJZ-0005aZ-OT for guix-patches@gnu.org; Sun, 08 Sep 2024 23:43:46 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snVJX-00025G-6s for guix-patches@gnu.org; Sun, 08 Sep 2024 23:43:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725853413; x=1726112613; bh=otJHJQafXRnLcZHi8SsC9pxSfdRGA66z7AS6Se2ARAU=; 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=n79clEc1NsbUQSt4FhTTu6x4p5VnbsmApul2ywlPeeo31lbt9qCYdzRi4ZBtoo8R0 FVpL1DIZwdCxgbx/qhiZsBFXwRKxGJSSTg0mqjnqDyT3a5kMGCLqZQ8ec4dg2ThYCQ 183dOgD2rCGDYvmCOyuaBx4YiqJZYXpX1RF8euBaptSZIrBXJD86yZ+EmXMNRZORgj jnWx6wOFtqUFT/D2jptFU0rqkmfisUzM2i9Yw9AjXfc7oW1CjpA0CdI+T1ytqW6Heb qwICK3fF349MwzkM5JzZL3QmC9Dnmg6g+h8MiUerOggPVK5Ffp1CgrTLtuJUsOHwEx hTQNwXEyeVypg== Date: Mon, 09 Sep 2024 03:43:27 +0000 To: guix-patches@gnu.org From: John Kehayias Subject: Re: [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2 Message-ID: <87zfoha3vs.fsf@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 4257b7055371d48b77e763a3d32d85679566e3d8 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_bc4eUgV7AGf2TeEP48p6YMbQqVRu2TbsJHAJhiEI" Received-SPF: pass client-ip=185.70.40.131; envelope-from=john.kehayias@protonmail.com; helo=mail-40131.protonmail.ch 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_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: aurtzy@gmail.com, 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: -2.3 (--) This is a multi-part message in MIME format. --b1_bc4eUgV7AGf2TeEP48p6YMbQqVRu2TbsJHAJhiEI Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Just a note that on IRC it was pointed out that we lost the i915 driver in = mesa. I adjusted the configure flags to restore some changes that were lost= , simplifying the configure-flags a little. That patch is attached and is l= ive on mesa-updates (along with some other changes, but not related directl= y to this series). On Fri, Sep 06, 2024 at 03:00 PM, John Kehayias wrote: > Hello Guix, > > This is a series of patches to update mesa to the latest, 24.2.2, some > dependencies, and fix a vulkan issue . > Along the way I updated llvm-for-mesa and mesa inputs, which unifies the > changes made to build on aarch64-linux, for instance. Hopefully this doe= sn't > introduce regressions. To that end, I've pushed this series now to the > mesa-updates branch to see how building on Cuirass goes. (A previous ver= sion > was there already, but I have updated/rebased and now finally sending thi= s.) > > Some notes: > > 1. The closure size of mesa has increased, something like from 374 MiB to= 542 > MiB, mostly due to itself (not sure why) and then also from llvm. This i= s > from going from v15 to v18 and as you'll see in a patch I had to enable > building all targets. Possibly this can be alleviated by building a smal= ler > clang for mesa? > > 2. Previous discussion was about getting NVK (which requires rust) built = in > the last mesa update. I'm not sure the current status but will check wit= h > those that were working on it before .= I > believe it is no longer experimental, so we should try to include it. > > Hopefully the patch changes and brief comments explain all, but please do > provide any feedback, changes, fixes, etc. The branch has just been reba= sed > on master but we can rebase as needed or if there are some critical error= s on > these patches I missed. > > Thanks! > John > > PS: I guess python-team will get this series as I added two comments (no = code > changes) to python packages now needed for mesa. One already has a huge > number of dependents anyway, but good to note I suppose. > > John Kehayias (6): > gnu: libdrm: Update to 2.4.123. > gnu: wayland-protocols: Update to 1.37. > gnu: Remove wayland-protocols-next. > gnu: llvm-for-mesa: Update to llvm-18. > gnu: llvm-for-mesa: Build all targets. > gnu: mesa: Update to 24.2.2. > > nathan (2): > gnu: vulkan-headers: Hard-code libvulkan.so file name. > gnu: volk: Hard-code path of vulkan-loader for dynamic loading > > gnu/packages/freedesktop.scm | 17 ++----------- > gnu/packages/gl.scm | 49 ++++++++++++++---------------------- > gnu/packages/kde-plasma.scm | 2 +- > gnu/packages/llvm.scm | 29 ++++++++++----------- > gnu/packages/python-xyz.scm | 2 ++ > gnu/packages/vulkan.scm | 41 ++++++++++++++++++++++++++---- > gnu/packages/xdisorg.scm | 4 +-- > 7 files changed, 75 insertions(+), 69 deletions(-) > > > base-commit: d4fbd1ab341de85c1e5c77e0f7adc5aae056be15 --b1_bc4eUgV7AGf2TeEP48p6YMbQqVRu2TbsJHAJhiEI Content-Type: text/x-patch; name=0001-gnu-mesa-Update-configure-flags.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-mesa-Update-configure-flags.patch RnJvbSA2ODQ1ZWI4OGI4MDE2OTJmMTg4OTE3MTQ4NzczNmZhNmVhNjI2NGFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KTWVzc2FnZS1JRDogPDY4NDVlYjg4YjgwMTY5MmYxODg5MTcxNDg3NzM2 ZmE2ZWE2MjY0YWEuMTcyNTg0ODM5Mi5naXQuam9obi5rZWhheWlhc0Bwcm90b25tYWlsLmNvbT4N CkZyb206IEpvaG4gS2VoYXlpYXMgPGpvaG4ua2VoYXlpYXNAcHJvdG9ubWFpbC5jb20+DQpEYXRl OiBTdW4sIDggU2VwIDIwMjQgMjA6MTM6MzMgLTA0MDANClN1YmplY3Q6IFtQQVRDSCAxLzJdIGdu dTogbWVzYTogVXBkYXRlIGNvbmZpZ3VyZSBmbGFncy4NCg0KUHJldmlvdXNseSwgaW4gMWVkMDI4 M2ZjYzEyYjRiNDhmNWI2MWJlMDI2YTdiODMyZDk3ODFkYywgbWVzYSdzIGNvbmZpZ3VyYXRpb24N Cm9wdGlvbnMgd2VyZSBhbHRlcmVkIHRvIHVzZSAiYXV0byIgYXMgbmVlZGVkLCB3aGlsZSBpdCBs b29rcyBsaWtlIHRoaXMgd2FzDQppbmFkdmVydGVudGx5IGNoYW5nZWQgaW4gOWIyYTNlMDIzZjcw OTBkMTljOThlNzU4MjIyMDM0MGRmMzk2MjU1NS4gIFRoaXMgbWVhbnQNCmk5MTUgZHJvcHBlZCBm cm9tIHg4Ni94ODZfNjQuICBUaGlzIGNvbW1pdCByZXN0b3JlcyB0aGUgImF1dG8iIGJlaGF2aW9y IHdoZXJlDQppdCBtYXRjaGVkIG91ciBwcmV2aW91cyBkcml2ZXIgbGlzdCAob3IgcmVzdG9yZWQg bWlzc2luZyBkcml2ZXJzKS4gIFNlZSBtZXNhJ3MNCm1lc29uLmJ1aWxkIGZvciBhbGwgb3B0aW9u cy4NCg0KKiBnbnUvcGFja2FnZXMvZ2wuc2NtIChtZXNhKVthcmd1bWVudHNdOiBGb3IgZ2FsbGl1 bS1kcml2ZXJzLCB1c2UNCiJzb2Z0cGlwZSxsbHZtcGlwZSIgaW5zdGVhZCBvZiB0aGUgZGVwcmVj YXRlZCAic3dyYXN0IiBvcHRpb24uICBVc2UgImF1dG8iDQppbiBnYWxsaXVtLWRyaXZlcnMgYW5k IHZ1bGthbi1kcml2ZXJzIHdoZXJlIGl0IHByb3ZpZGVzIHRoZSBzYW1lIGRyaXZlcg0KbGlzdCAo b3IgcmVzdG9yZXMgb25lcyBkcm9wcGVkIGZyb20geDg2L3g4Nl82NCkuICBDb21tZW50IG9uIGRp ZmZlcmVuY2VzIGZyb20NCiJhdXRvIiB3aGVyZSB3ZSBkb24ndCB1c2UgaXQuDQoNCkNoYW5nZS1J ZDogSTkyMDcwMWY3MWQxOTU3OGY0OTEzZmRhNzM3MjI3Mzk1NWYwYTk4NDcNCi0tLQ0KIGdudS9w YWNrYWdlcy9nbC5zY20gfCAyMSArKysrKysrKysrKy0tLS0tLS0tLS0NCiAxIGZpbGUgY2hhbmdl ZCwgMTEgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pDQoNCmRpZmYgLS1naXQgYS9nbnUv cGFja2FnZXMvZ2wuc2NtIGIvZ251L3BhY2thZ2VzL2dsLnNjbQ0KaW5kZXggYWIxOGEzZTVhNy4u YzQxN2YxMTU3MSAxMDA2NDQNCi0tLSBhL2dudS9wYWNrYWdlcy9nbC5zY20NCisrKyBiL2dudS9w YWNrYWdlcy9nbC5zY20NCkBAIC0zNjAsMTYgKzM2MCwxOCBAQCAoZGVmaW5lLXB1YmxpYyBtZXNh DQogICAgICAgI34obGlzdA0KICAgICAgICAgICMkQChjb25kDQogICAgICAgICAgICAgICgodGFy Z2V0LWFhcmNoNjQ/KQ0KKyAgICAgICAgICAgICAgOzsgVGhpcyBpbmNsdWRlcyBtb3JlIGRyaXZl cnMgdGhhbiAiYXV0byI6IGFzYWhpLCByMzAwLCByNjAwDQogICAgICAgICAgICAgICAnKCItRGdh bGxpdW0tZHJpdmVycz1hc2FoaSxldG5hdml2LGZyZWVkcmVubyxrbXNybyxsaW1hLFwNCi1ub3V2 ZWF1LHBhbmZyb3N0LHIzMDAscjYwMCxzdmdhLHN3cmFzdCx0ZWdyYSx2M2QsdmM0LHZpcmdsLHpp bmsiKSkNCitub3V2ZWF1LHBhbmZyb3N0LHIzMDAscjYwMCxzdmdhLHNvZnRwaXBlLGxsdm1waXBl LHRlZ3JhLHYzZCx2YzQsdmlyZ2wsemluayIpKQ0KICAgICAgICAgICAgICAoKHRhcmdldC1hcm0z Mj8pDQorICAgICAgICAgICAgICA7OyBUaGlzIGluY2x1ZGVzIG1vcmUgZHJpdmVycyB0aGFuICJh dXRvIjogcjMwMCwgcjYwMA0KICAgICAgICAgICAgICAgJygiLURnYWxsaXVtLWRyaXZlcnM9ZXRu YXZpdixmcmVlZHJlbm8sa21zcm8sbGltYSxub3V2ZWF1LFwNCi1wYW5mcm9zdCxyMzAwLHI2MDAs c3ZnYSxzd3Jhc3QsdGVncmEsdjNkLHZjNCx2aXJnbCx6aW5rIikpDQorcGFuZnJvc3QscjMwMCxy NjAwLHN2Z2Esc29mdHBpcGUsbGx2bXBpcGUsdGVncmEsdjNkLHZjNCx2aXJnbCx6aW5rIikpDQog ICAgICAgICAgICAgICgob3IgKHRhcmdldC1wcGM2NGxlPykgKHRhcmdldC1wcGMzMj8pICh0YXJn ZXQtcmlzY3Y2ND8pKQ0KLSAgICAgICAgICAgICAgJygiLURnYWxsaXVtLWRyaXZlcnM9bm91dmVh dSxyMzAwLHI2MDAscmFkZW9uc2ksc3ZnYSxzd3Jhc3QsdmlyZ2wsemluayIpKQ0KKyAgICAgICAg ICAgICAgOzsgVGhpcyBpbmNsdWRlIG1vcmUgZHJpdmVycyB0aGFuICJhdXRvIjogc3ZnYQ0KKyAg ICAgICAgICAgICAgJygiLURnYWxsaXVtLWRyaXZlcnM9bm91dmVhdSxyMzAwLHI2MDAscmFkZW9u c2ksc3ZnYSxzb2Z0cGlwZSxsbHZtcGlwZSx2aXJnbCx6aW5rIikpDQogICAgICAgICAgICAgIChl bHNlDQotICAgICAgICAgICAgICAnKCItRGdhbGxpdW0tZHJpdmVycz1jcm9jdXMsaXJpcyxub3V2 ZWF1LHIzMDAscjYwMCxyYWRlb25zaSxcDQotc3ZnYSxzd3Jhc3QsdmlyZ2wsemluayIpKSkNCisg ICAgICAgICAgICAgICcoIi1EZ2FsbGl1bS1kcml2ZXJzPWF1dG8iKSkpDQogICAgICAgICAgOzsg RW5hYmxlIHZhcmlvdXMgb3B0aW9uYWwgZmVhdHVyZXMuICBUT0RPOiBvcGVuY2wgcmVxdWlyZXMg bGliY2xjLA0KICAgICAgICAgIDs7IG9teCByZXF1aXJlcyBsaWJvbXhpbC1iZWxsYWdpbw0KICAg ICAgICAgICItRHBsYXRmb3Jtcz14MTEsd2F5bGFuZCINCkBAIC0zODQsMTYgKzM4NiwxNSBAQCAo ZGVmaW5lLXB1YmxpYyBtZXNhDQogICAgICAgICAgIi1EZ2JtPWVuYWJsZWQiDQogICAgICAgICAg Ii1Ec2hhcmVkLWdsYXBpPWVuYWJsZWQiDQogDQotICAgICAgICAgOzsgRXhwbGljaXRseSBlbmFi bGUgVnVsa2FuIG9uIHNvbWUgYXJjaGl0ZWN0dXJlcy4NCiAgICAgICAgICAjJEAoY29uZA0KICAg ICAgICAgICAgICAoKG9yICh0YXJnZXQteDg2LTMyPykgKHRhcmdldC14ODYtNjQ/KSkNCisgICAg ICAgICAgICAgIDs7IFRoaXMgZG9lc24ndCBpbmNsdWRlIG5vdXZlYXUgKHdoaWNoIGlzIGluICJh dXRvIikgYXMgaXQgbmVlZHMNCisgICAgICAgICAgICAgIDs7IHJ1c3QuDQorICAgICAgICAgICAg ICA7OyBUT0RPOiBFbmFibGUgbm91dmVhdS9OVksuDQogICAgICAgICAgICAgICAnKCItRHZ1bGth bi1kcml2ZXJzPWludGVsLGludGVsX2hhc3ZrLGFtZCxzd3Jhc3QiKSkNCi0gICAgICAgICAgICAg KChvciAodGFyZ2V0LXBwYzY0bGU/KSAodGFyZ2V0LXBwYzMyPykpDQotICAgICAgICAgICAgICAn KCItRHZ1bGthbi1kcml2ZXJzPWFtZCxzd3Jhc3QiKSkNCiAgICAgICAgICAgICAgKCh0YXJnZXQt YWFyY2g2ND8pDQorICAgICAgICAgICAgICA7OyBUaGlzIGRpZmZlcnMgZnJvbSAiYXV0byIgd2hp Y2ggb25seSBpbmNsdWRlcyBzd3Jhc3QgYW5kIGludGVsDQogICAgICAgICAgICAgICAnKCItRHZ1 bGthbi1kcml2ZXJzPWZyZWVkcmVubyxhbWQsYnJvYWRjb20sc3dyYXN0IikpDQotICAgICAgICAg ICAgICgodGFyZ2V0LXJpc2N2NjQ/KQ0KLSAgICAgICAgICAgICAgJygiLUR2dWxrYW4tZHJpdmVy cz1hbWQsc3dyYXN0IikpDQogICAgICAgICAgICAgIChlbHNlDQogICAgICAgICAgICAgICAnKCIt RHZ1bGthbi1kcml2ZXJzPWF1dG8iKSkpDQogDQoNCmJhc2UtY29tbWl0OiBkNGZiZDFhYjM0MWRl ODVjMWU1Yzc3ZTBmN2FkYzVhYWUwNTZiZTE1DQpwcmVyZXF1aXNpdGUtcGF0Y2gtaWQ6IDg1Zjhi MTRmZmIzZmY3Yjg2Y2FmYmI5MmU0Njk2YmUwNjhmNGUzNTkNCnByZXJlcXVpc2l0ZS1wYXRjaC1p ZDogMjU5MGNmNjNiMGFiOWYyODNhNjliMzJlMzY1ZjJlYTVkYzJkYTUzNQ0KcHJlcmVxdWlzaXRl LXBhdGNoLWlkOiAyNDkyY2U1MTYzNTljYWM4YmZhMDMyY2M3NmI2MWE0YzkyZmJlZWYyDQpwcmVy ZXF1aXNpdGUtcGF0Y2gtaWQ6IGQ4ZTc1MTIzZTE3YTZmNTVjYTdhN2NkNWRkODM3ZDI1ZWMyMmMw ZmENCnByZXJlcXVpc2l0ZS1wYXRjaC1pZDogMTY3NzUyZjA2N2NkMzY1YjJiZDM2OTExY2Q5YzA4 NGE1ODcyYTVlZQ0KcHJlcmVxdWlzaXRlLXBhdGNoLWlkOiA2NGY4M2Q4OTk2N2Y4MmViNzIzZjQ1 YTVlZjYwNTA0MzM3Zjk2N2YxDQpwcmVyZXF1aXNpdGUtcGF0Y2gtaWQ6IGMyNjI2NWJkNjBkZWVk Mjc0ZGI0Mjc0YjI5MzRjMWVhODliNmNjOGYNCnByZXJlcXVpc2l0ZS1wYXRjaC1pZDogYmMyYTU5 MTJmOWViYTY2ZjFhMjM0ZmVjZGMxOTE0YTQ0NGJlOTA0MQ0KLS0gDQoyLjQ1LjINCg0K --b1_bc4eUgV7AGf2TeEP48p6YMbQqVRu2TbsJHAJhiEI-- From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 12:16:52 2024 Received: (at 73071) by debbugs.gnu.org; 9 Sep 2024 16:16:52 +0000 Received: from localhost ([127.0.0.1]:33925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snh4N-0006rO-Vt for submit@debbugs.gnu.org; Mon, 09 Sep 2024 12:16:52 -0400 Received: from mail-io1-f47.google.com ([209.85.166.47]:61830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snh4L-0006rA-Hc for 73071@debbugs.gnu.org; Mon, 09 Sep 2024 12:16:50 -0400 Received: by mail-io1-f47.google.com with SMTP id ca18e2360f4ac-82cd93a6617so67947039f.3 for <73071@debbugs.gnu.org>; Mon, 09 Sep 2024 09:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725898539; x=1726503339; 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=NLzcZcZoHHfeHAcb+ArYV62Yf3ea2aOiVj67cmQ8lEE=; b=ipZr8SS/+juOamt2Oce4spt4yhfegpzTX56AD99mcsfw838AbPvcM6O0Fk6Fswnz3Y B5qH13B+nwqKWNBmxcV3C4hYAh9ELEiTBaiMYfGetNxb49lHN0D3vU6OzjcFZSRQxAKW vFbEEvQx/h6qPLy6gBSyz7+ldzFptkAwnpLm/lx9RDzFb3Nx0tYxDNIbMi5g06z6Fem3 Pbe6QrR1eNTULVaLL4kjke9qeXDPgkjp2Q4It0YE0488HFoalFiuxXsTqfS6Mbza+pPq 1KsUdcQKT0efX0uK7UgFprNLbV9fV+/9d3VbU/RG71WT3ei4EIy5ZzYJzP9966tWUa07 wBVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725898539; x=1726503339; 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=NLzcZcZoHHfeHAcb+ArYV62Yf3ea2aOiVj67cmQ8lEE=; b=pPGcf9X03NDBKGPzmd9Xv+OXUB/z4pETdAgLWdcDml5YAH7sy9VIkSr+kJZT0qddDH WKobKFNXnCvK7O8vpwCAdxBOjJEw8bPQIoeFo7sbszn/HTg9+/payBYRCV5jLTeM9Qlp 41Iz2zH88n+Thnpiiw12P4lXEmmT406uWxMiTSJgWUhELcX7J/LS6j5P6Jt3cNn3prXm 9mKEYsrg4WONZxuQ90ZZsR3ECFb3WUZbNrxusp5tEopDFGFBwUu690pT417uOLMRsFuQ 82J8joGy9XKtenIeNd3gKc+TtvtHRbvSns0KhcsRb3M9pm+X7fvstErvZtux9aLUYdib URKQ== X-Gm-Message-State: AOJu0YzSCfQIy8i1AmQc66kxEPYUjIlBYyUbq2LSORD5ecwa4OKZGond 0Pu7+sTE2/JP83mjZSu47yLqK5Z6T8PbOtxXlLDKUa26AbyxHlbBSB+oPA== X-Google-Smtp-Source: AGHT+IHtM3MnZs0GN4Lc3v439DWRykae0K+T2jhoF3FcuwYTrdD2CF84qHM871vtvhik/aq3lTDsFA== X-Received: by 2002:a05:6602:1347:b0:82a:1f14:997f with SMTP id ca18e2360f4ac-82a9618b0bdmr1497880139f.4.1725898539129; Mon, 09 Sep 2024 09:15:39 -0700 (PDT) Received: from localhost.localdomain ([2600:4808:a053:7600::e413]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-82aa7382a53sm146289539f.30.2024.09.09.09.15.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 09:15:38 -0700 (PDT) From: aurtzy To: 73071@debbugs.gnu.org Subject: [PATCH mesa-updates] gnu: mesa: Enable NVK driver for x86_64 architecture. Date: Mon, 9 Sep 2024 12:12:11 -0400 Message-ID: <1bc738374fbd269f8b5c8e3e299aefa17117f58c.1725898038.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Debbugs-Cc: John Kehayias , Efraim Flashner Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73071 Cc: 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: -1.0 (-) * gnu/packages/gl.scm (mesa): Enable NVK vulkan driver for x86_64 architecture. [native-inputs]: Add rust, rust-bindgen-cli, rust-cbindgen-0.26 for x86_64. [arguments]<#:meson>: Use newer version of meson to satisfy NVK build requirements. <#:configure-flags>: Use "auto" for 'vulkan-drivers' flag when target arch is x86_64. <#:phases>: Add phase to patch rust subproject sources when target arch is x86_64. * gnu/packages/crates-io.scm (rust-paste-1, rust-proc-macro2-1, rust-quote-1, rust-syn-2, rust-unicode-ident-1): Add a comment about being dependencies of mesa. Change-Id: I76e3db5072ca3c718155b188ca64b52766d55f36 --- Hi John, Thanks for the CC, and sorry for not submitting a patch sooner! Since last, I have managed to find a better solution to the issue with substituting rust dependency sources. Briefly on what I have so far: this makes use of writing wrap files with just the "directory" property, having meson fall back to using a local directory that sources are copied to. Doing this resulted in an odd behavior with the overlay directories (i.e. important extra files in subprojects/packagefiles) where they don't seem to be automatically copied as expected when falling back to local files; however, a simple copy resolves it, although I thought it would still be good to note and add a comment about. I initially made the wrap-file-writing a build utility procedure 'patch-wrap-file' (which can be seen my personal config [1]) as it seemed like it could be useful for other meson packages, but for this patch I've inlined it since I'm not confident in its applicability across different projects. I'd be happy to hear thoughts about it if it might be useful, though. [1] https://github.com/aurtzy/guix-config/blob/5cf4c9e277f4ab3a8f1ef87ec5ac47a686da0ad2/my-guix/build/utils.scm#L27 Cheers, aurtzy gnu/packages/crates-io.scm | 5 +++ gnu/packages/gl.scm | 64 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0cdb071ea0..2a40062500 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -51869,6 +51869,7 @@ (define-public rust-password-hash-0.2 ("rust-subtle" ,rust-subtle-2) ("rust-rand-core" ,rust-rand-core-0.6)))))) +;; WARNING: This package is a dependency of mesa. (define-public rust-paste-1 (package (name "rust-paste") @@ -56703,6 +56704,7 @@ (define-public rust-proc-macro-nested-0.1 "Support for nested proc-macro-hack invocations.") (license (list license:expat license:asl2.0)))) +;; WARNING: This package is a dependency of mesa. (define-public rust-proc-macro2-1 (package (name "rust-proc-macro2") @@ -60144,6 +60146,7 @@ (define-public rust-quinn-udp-0.1 ("rust-tokio" ,rust-tokio-1) ("rust-tracing" ,rust-tracing-0.1)))))) +;; WARNING: This package is a dependency of mesa. (define-public rust-quote-1 (package (name "rust-quote") @@ -76939,6 +76942,7 @@ (define-public rust-symphonia-utils-xiph-0.4 codecs and formats.") (license license:mpl2.0))) +;; WARNING: This package is a dependency of mesa. (define-public rust-syn-2 (package (name "rust-syn") @@ -86599,6 +86603,7 @@ (define-public rust-unicode-id-0.3 according to Unicode Standard Annex #31.") (license (list license:expat license:asl2.0)))) +;; WARNING: This package is a dependency of mesa. (define-public rust-unicode-ident-1 (package (name "rust-unicode-ident") diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c417f11571..3939f1ba1f 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Liliana Marie Prikler ;;; Copyright © 2024 Artyom V. Poptsov +;;; Copyright © 2024 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ (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 documentation) @@ -56,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) @@ -75,7 +78,8 @@ (define-module (gnu packages gl) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (ice-9 match) - #:use-module ((srfi srfi-1) #:hide (zip))) + #:use-module ((srfi srfi-1) #:hide (zip)) + #:use-module (srfi srfi-26)) (define-public glu (package @@ -352,10 +356,19 @@ (define-public mesa pkg-config-for-build wayland wayland-protocols) + '()) + (if (target-x86-64?) + ;; NVK dependencies + (list rust + (module-ref (resolve-interface '(gnu packages rust-apps)) + 'rust-bindgen-cli) + (module-ref (resolve-interface '(gnu packages rust-apps)) + 'rust-cbindgen-0.26)) '()))) (outputs '("out" "bin")) (arguments (list + #:meson meson-1.5 #:configure-flags #~(list #$@(cond @@ -387,7 +400,7 @@ (define-public mesa "-Dshared-glapi=enabled" #$@(cond - ((or (target-x86-32?) (target-x86-64?)) + ((target-x86-32?) ;; This doesn't include nouveau (which is in "auto") as it needs ;; rust. ;; TODO: Enable nouveau/NVK. @@ -481,6 +494,53 @@ (define-public mesa (("'lp_test_arit', ") "")))) (_ '((display "No tests to disable on this architecture.\n")))))) + #$@(if (target-x86-64?) + #~((add-after 'unpack 'patch-subproject-sources + (lambda _ + ;; Patch each relevant subproject source URL in wrapfiles to + ;; use the store, which avoids an attempt to download them + ;; mid-build. + (for-each + (match-lambda + ((name source) + (let ((wrap-file (string-append + "subprojects/" name ".wrap")) + (subproject-dest (string-append + "subprojects/" name)) + (overlay-dir (string-append + "subprojects/packagefiles/" name))) + (copy-recursively source subproject-dest) + ;; Normally when the patch_directory wrap file property + ;; is specified, meson automatically copies from + ;; packagefiles, but this is not the case here (only + ;; happens when downloading source?) so we manually copy + ;; overlay-dir to subproject-dest. + (when (file-exists? overlay-dir) + (copy-recursively overlay-dir subproject-dest)) + (call-with-output-file wrap-file + (lambda (port) + (format port "[wrap-file] +directory = ~a +" + name)))))) + '#+(map (lambda (pkg) + (let ((name (package-upstream-name* pkg)) + (version (package-version pkg))) + (list (package-upstream-name* pkg) + (file-append pkg + "/share/cargo/src/" + name "-" version)))) + (let ((from-crates-io + (cut module-ref + (resolve-interface + '(gnu packages crates-io)) + <>))) + (list (from-crates-io 'rust-syn-2) + (from-crates-io 'rust-unicode-ident-1) + (from-crates-io 'rust-quote-1) + (from-crates-io 'rust-proc-macro2-1) + (from-crates-io 'rust-paste-1)))))))) + #~()) (add-before 'configure 'fix-dlopen-libnames (lambda* (#:key inputs #:allow-other-keys) (let ((out #$output)) base-commit: c1ca70a98024a1e9dd6fedded1d31ad763b8b282 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 15 22:59:58 2024 Received: (at 73071) by debbugs.gnu.org; 16 Sep 2024 02:59:58 +0000 Received: from localhost ([127.0.0.1]:50811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sq1y1-0007Wy-Cs for submit@debbugs.gnu.org; Sun, 15 Sep 2024 22:59:58 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:35005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sq1xy-0007Wh-6v for 73071@debbugs.gnu.org; Sun, 15 Sep 2024 22:59:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1726455573; x=1726714773; bh=alIG6BGDUDYDO0jSPk0pVkEQ5qs/eMUw+9yXtTDu7h4=; 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=VYF64BYr/tKiy6Z/GiA0Gs/+jZdKbjSzHt95HT9gTNUu67+PV9iZ1/oMxdYY7cTvj RnoCvHAceyTd57ecEOHSkb84k1qcQ7pmzJas1D5wOmYgqao55YLGRWblo0kA2BLx5C q9QvZiWE3/xb40MvBVRxzIKnfJdaytNWDagAHdoc3dcctOV4xzYBxHXE+6aVjfpBP3 OnrPjipcVzqUTIhe1VJddGEbXo9MRm+d5ZuS/OcmkLZc63ejDpvRPC4lhAX8vOdWVi J7JW1SVQiJRctaEZz9VFOZJmADeroq3YHlTooqeqa0YadNFgSHUbGBR9mGQ8mXErcG ++TqX7e3T9f+g== Date: Mon, 16 Sep 2024 02:59:29 +0000 To: aurtzy From: John Kehayias Subject: Re: [bug#73071] [PATCH mesa-updates] gnu: mesa: Enable NVK driver for x86_64 architecture. Message-ID: <877cbcpalv.fsf@protonmail.com> In-Reply-To: <1bc738374fbd269f8b5c8e3e299aefa17117f58c.1725898038.git.aurtzy@gmail.com> References: <1bc738374fbd269f8b5c8e3e299aefa17117f58c.1725898038.git.aurtzy@gmail.com> Feedback-ID: 7805494:user:proton X-Pm-Message-ID: d0f8053ad6abea4451d7314d54ce331df8d25186 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: 73071 Cc: 73071@debbugs.gnu.org, Efraim Flashner 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! On Mon, Sep 09, 2024 at 12:12 PM, aurtzy wrote: > * gnu/packages/gl.scm (mesa): Enable NVK vulkan driver for x86_64 > architecture. > [native-inputs]: Add rust, rust-bindgen-cli, rust-cbindgen-0.26 for x86_6= 4. > [arguments]<#:meson>: Use newer version of meson to satisfy NVK build > requirements. > <#:configure-flags>: Use "auto" for 'vulkan-drivers' flag when target arc= h is > x86_64. > <#:phases>: Add phase to patch rust subproject sources when target arch i= s > x86_64. > * gnu/packages/crates-io.scm (rust-paste-1, rust-proc-macro2-1, rust-quot= e-1, > rust-syn-2, rust-unicode-ident-1): Add a comment about being dependencies= of > mesa. > > Change-Id: I76e3db5072ca3c718155b188ca64b52766d55f36 > --- > > Hi John, > > Thanks for the CC, and sorry for not submitting a patch sooner! > No problem, I let things go for a bit too, thanks for this work! > Since last, I have managed to find a better solution to the issue with > substituting rust dependency sources. Briefly on what I have so far: thi= s > makes use of writing wrap files with just the "directory" property, havin= g > meson fall back to using a local directory that sources are copied to. D= oing > this resulted in an odd behavior with the overlay directories (i.e. impor= tant > extra files in subprojects/packagefiles) where they don't seem to be > automatically copied as expected when falling back to local files; howeve= r, a > simple copy resolves it, although I thought it would still be good to not= e and > add a comment about. > > I initially made the wrap-file-writing a build utility procedure > 'patch-wrap-file' (which can be seen my personal config [1]) as it seemed= like > it could be useful for other meson packages, but for this patch I've inli= ned > it since I'm not confident in its applicability across different projects= . > I'd be happy to hear thoughts about it if it might be useful, though. > > [1] > Very nice! Yes, more utilities to help with unbundling essentially will be helpful. I don't know if I ever wrote a wrap file or just patched the directory bit into the meson file directly. I would have to look this over, but a utility function (or via keyword argument in meson-build-system?) would be great. As for the main patch: I've built locally and see nouveau as a vulkan driver on x86_64 but not i686. That's about all I can test though. The change to #:meson means other archs will rebuild too, but I don't know if they got far anyway (so we can cancel old derivations). Perhaps a new mesa point release will be out this week? Then I could bump the version, rebase, and rebuild with this patch. Thoughts? Other than that, I made a minor tweak to the changelog (remove first line, name the phase) locally, but have not done a rebase/push on mesa-updates. Let me give it a few days for other comments and if there are any other rebuilds to go with it. Thanks again! John > Cheers, > > aurtzy > > gnu/packages/crates-io.scm | 5 +++ > gnu/packages/gl.scm | 64 ++++++++++++++++++++++++++++++++++++-- > 2 files changed, 67 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm > index 0cdb071ea0..2a40062500 100644 > --- a/gnu/packages/crates-io.scm > +++ b/gnu/packages/crates-io.scm > @@ -51869,6 +51869,7 @@ (define-public rust-password-hash-0.2 > ("rust-subtle" ,rust-subtle-2) > ("rust-rand-core" ,rust-rand-core-0.6)))))) > > +;; WARNING: This package is a dependency of mesa. > (define-public rust-paste-1 > (package > (name "rust-paste") > @@ -56703,6 +56704,7 @@ (define-public rust-proc-macro-nested-0.1 > "Support for nested proc-macro-hack invocations.") > (license (list license:expat license:asl2.0)))) > > +;; WARNING: This package is a dependency of mesa. > (define-public rust-proc-macro2-1 > (package > (name "rust-proc-macro2") > @@ -60144,6 +60146,7 @@ (define-public rust-quinn-udp-0.1 > ("rust-tokio" ,rust-tokio-1) > ("rust-tracing" ,rust-tracing-0.1)))))) > > +;; WARNING: This package is a dependency of mesa. > (define-public rust-quote-1 > (package > (name "rust-quote") > @@ -76939,6 +76942,7 @@ (define-public rust-symphonia-utils-xiph-0.4 > codecs and formats.") > (license license:mpl2.0))) > > +;; WARNING: This package is a dependency of mesa. > (define-public rust-syn-2 > (package > (name "rust-syn") > @@ -86599,6 +86603,7 @@ (define-public rust-unicode-id-0.3 > according to Unicode Standard Annex #31.") > (license (list license:expat license:asl2.0)))) > > +;; WARNING: This package is a dependency of mesa. > (define-public rust-unicode-ident-1 > (package > (name "rust-unicode-ident") > diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm > index c417f11571..3939f1ba1f 100644 > --- a/gnu/packages/gl.scm > +++ b/gnu/packages/gl.scm > @@ -21,6 +21,7 @@ > ;;; Copyright =C2=A9 2023, 2024 Zheng Junjie <873216071@qq.com> > ;;; Copyright =C2=A9 2024 Liliana Marie Prikler > ;;; Copyright =C2=A9 2024 Artyom V. Poptsov > +;;; Copyright =C2=A9 2024 aurtzy > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -41,6 +42,7 @@ (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 documentation) > @@ -56,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) > @@ -75,7 +78,8 @@ (define-module (gnu packages gl) > #:use-module (guix gexp) > #:use-module (guix utils) > #:use-module (ice-9 match) > - #:use-module ((srfi srfi-1) #:hide (zip))) > + #:use-module ((srfi srfi-1) #:hide (zip)) > + #:use-module (srfi srfi-26)) > > (define-public glu > (package > @@ -352,10 +356,19 @@ (define-public mesa > pkg-config-for-build > wayland > wayland-protocols) > + '()) > + (if (target-x86-64?) > + ;; NVK dependencies > + (list rust > + (module-ref (resolve-interface '(gnu packages rust-apps)= ) > + 'rust-bindgen-cli) > + (module-ref (resolve-interface '(gnu packages rust-apps)= ) > + 'rust-cbindgen-0.26)) > '()))) > (outputs '("out" "bin")) > (arguments > (list > + #:meson meson-1.5 > #:configure-flags > #~(list > #$@(cond > @@ -387,7 +400,7 @@ (define-public mesa > "-Dshared-glapi=3Denabled" > > #$@(cond > - ((or (target-x86-32?) (target-x86-64?)) > + ((target-x86-32?) > ;; This doesn't include nouveau (which is in "auto") as it= needs > ;; rust. > ;; TODO: Enable nouveau/NVK. > @@ -481,6 +494,53 @@ (define-public mesa > (("'lp_test_arit', ") "")))) > (_ > '((display "No tests to disable on this architecture.\= n")))))) > + #$@(if (target-x86-64?) > + #~((add-after 'unpack 'patch-subproject-sources > + (lambda _ > + ;; Patch each relevant subproject source URL in w= rapfiles to > + ;; use the store, which avoids an attempt to down= load them > + ;; mid-build. > + (for-each > + (match-lambda > + ((name source) > + (let ((wrap-file (string-append > + "subprojects/" name ".wrap"= )) > + (subproject-dest (string-append > + "subprojects/" name)) > + (overlay-dir (string-append > + "subprojects/packagefiles= /" name))) > + (copy-recursively source subproject-dest) > + ;; Normally when the patch_directory wrap f= ile property > + ;; is specified, meson automatically copies= from > + ;; packagefiles, but this is not the case h= ere (only > + ;; happens when downloading source?) so we = manually copy > + ;; overlay-dir to subproject-dest. > + (when (file-exists? overlay-dir) > + (copy-recursively overlay-dir subproject-= dest)) > + (call-with-output-file wrap-file > + (lambda (port) > + (format port "[wrap-file] > +directory =3D ~a > +" > + name)))))) > + '#+(map (lambda (pkg) > + (let ((name (package-upstream-name* pk= g)) > + (version (package-version pkg))) > + (list (package-upstream-name* pkg) > + (file-append pkg > + "/share/cargo/src= /" > + name "-" version)= ))) > + (let ((from-crates-io > + (cut module-ref > + (resolve-interface > + '(gnu packages crates-io)) > + <>))) > + (list (from-crates-io 'rust-syn-2) > + (from-crates-io 'rust-unicode-id= ent-1) > + (from-crates-io 'rust-quote-1) > + (from-crates-io 'rust-proc-macro= 2-1) > + (from-crates-io 'rust-paste-1)))= ))))) > + #~()) > (add-before 'configure 'fix-dlopen-libnames > (lambda* (#:key inputs #:allow-other-keys) > (let ((out #$output)) > > base-commit: c1ca70a98024a1e9dd6fedded1d31ad763b8b282 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 16 21:51:36 2024 Received: (at 73071) by debbugs.gnu.org; 17 Sep 2024 01:51:36 +0000 Received: from localhost ([127.0.0.1]:53686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqNNP-0007PD-L9 for submit@debbugs.gnu.org; Mon, 16 Sep 2024 21:51:36 -0400 Received: from mail-il1-f177.google.com ([209.85.166.177]:49514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqNNN-0007Ox-0m for 73071@debbugs.gnu.org; Mon, 16 Sep 2024 21:51:34 -0400 Received: by mail-il1-f177.google.com with SMTP id e9e14a558f8ab-3a046d4c465so17097185ab.3 for <73071@debbugs.gnu.org>; Mon, 16 Sep 2024 18:51:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726537813; x=1727142613; darn=debbugs.gnu.org; h=in-reply-to:from:content-language:subject:references:cc:to :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=pgDK+ypqOvEFqriZLGBC7CD66uoFEJ6Hku+P4DxpDOY=; b=a1ohH/8EcB6ShAl8LtWZ30u9rjY7HftTg2U0MXFvs6gjg+HJj66PvjTWWiSwUMmmq1 TiXanNDbPgis+WTdAkv5JPTJdiQkXIEL1LRlolwnktrZiqvDD39T8eg+ApQfPp5VTJSm 3iBgnBYUj7h+OfZEBlCJqpFf88ERyrgdQ4KG0e2/lWLov7dOx37Qb16XtUIfK3fbvzPT 7QOWB7WEb1hAIS986FUpqH44tUoV0tf+m+JJd6b0zm7SY5l7Adsmk0yDw2mdefSyyD0+ v8xKTtSNILyrc4bngRa1mxwmfKVysxKed2HPbRd1NOqkp6g5A2cFxf6mq6Md2m/Y2oqk ydmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726537813; x=1727142613; h=in-reply-to:from:content-language:subject:references:cc:to :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=pgDK+ypqOvEFqriZLGBC7CD66uoFEJ6Hku+P4DxpDOY=; b=YE+lHbSqEJnD+v+uFUWBDmT2V2mlgsdhe9lEkeRMvfHaoA5/f4I/rd7tjRnVxc+Jct sBHhE6AxtufgnOBtaHwf/5Ug+9kOaUHqjtkv3nNNhaKpX+B46DLpsxY6RjIhoKUoEZWq QVbgdWdzq6Zq30EDOk8ANhv+mrWqk3Tc49Un6tC2j8xd9VOoQJ5bU7Vi1iRW0lpRw7Br b65iU17dfBQJPOcDnABHeQCVQ+XU/IFZlcu3G8Rs4LPJvRzcnWyT2NCS0HrcyH9pUAb3 BsTWgQjGzEGNyLuaUFxYkbN5iv2McgfecTP9EV80Vd5Aql01huou9iHo6bQHahOOJZzR Nz6w== X-Gm-Message-State: AOJu0Yzv9z4CEdH5xkBo/Ax2zfYj/0Pi+BtTlQ9wRw2qSocrcL1NqCt7 wFhryDg+XpbV8ZJSmZbKrzmTulUmqaf9x7S375rn3jrCxoj+Y+TaPqXgNA== X-Google-Smtp-Source: AGHT+IHlj3ubqr5Uwn24oTlvSpcXEImRCetRSK7fHKTQMYkFpZhefjKSSXh6ZeqTtp8QV0pNNG6TGw== X-Received: by 2002:a05:6e02:1a0f:b0:3a0:98cd:3754 with SMTP id e9e14a558f8ab-3a098cd3ab4mr65521565ab.4.1726537812514; Mon, 16 Sep 2024 18:50:12 -0700 (PDT) Received: from ?IPV6:2600:4808:a053:7600::e413? ([2600:4808:a053:7600::e413]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3a092b83b33sm19752195ab.0.2024.09.16.18.50.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Sep 2024 18:50:11 -0700 (PDT) Content-Type: multipart/alternative; boundary="------------HnxJgSCX7UtMHp1z0XQk93Z1" Message-ID: <3a438e24-05a0-4a7b-95d9-d91fa61047bd@gmail.com> Date: Mon, 16 Sep 2024 21:50:08 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: 73071@debbugs.gnu.org References: <877cbcpalv.fsf@protonmail.com> Subject: Re: [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2 Content-Language: en-US From: aurtzy In-Reply-To: <877cbcpalv.fsf@protonmail.com> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73071 Cc: John Kehayias , 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: -1.0 (-) This is a multi-part message in MIME format. --------------HnxJgSCX7UtMHp1z0XQk93Z1 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, I have an additional question/concern that's come up, but to address your comments first: On 9/15/24 22:59, John Kehayias wrote: >> Since last, I have managed to find a better solution to the issue with >> substituting rust dependency sources. Briefly on what I have so far: this >> makes use of writing wrap files with just the "directory" property, having >> meson fall back to using a local directory that sources are copied to. Doing >> this resulted in an odd behavior with the overlay directories (i.e. important >> extra files in subprojects/packagefiles) where they don't seem to be >> automatically copied as expected when falling back to local files; however, a >> simple copy resolves it, although I thought it would still be good to note and >> add a comment about. >> >> I initially made the wrap-file-writing a build utility procedure >> 'patch-wrap-file' (which can be seen my personal config [1]) as it seemed like >> it could be useful for other meson packages, but for this patch I've inlined >> it since I'm not confident in its applicability across different projects. >> I'd be happy to hear thoughts about it if it might be useful, though. >> >> [1] >> > Very nice! Yes, more utilities to help with unbundling essentially > will be helpful. I don't know if I ever wrote a wrap file or just > patched the directory bit into the meson file directly. I would have > to look this over, but a utility function (or via keyword argument in > meson-build-system?) would be great. Okay! I'll have a look at the keyword argument approach as well and see if I can make a proposal for changes and further comments sometime soon. > As for the main patch: I've built locally and see nouveau as a vulkan > driver on x86_64 but not i686. That's about all I can test though. The > change to #:meson means other archs will rebuild too, but I don't know > if they got far anyway (so we can cancel old derivations). Perhaps a > new mesa point release will be out this week? Then I could bump the > version, rebase, and rebuild with this patch. Thoughts? I didn't consider this when writing the patch, but would it be a good idea to only use meson-1.5 for x86_64? We could avoid rebuilds that way. Looks like a new mesa release is planned for the 18th [1]. > Other than that, I made a minor tweak to the changelog (remove first > line, name the phase) locally, but have not done a rebase/push on > mesa-updates. Let me give it a few days for other comments and if > there are any other rebuilds to go with it. Regarding my concern (unrelated to NVK): I've had issues with a nonfree application segfaulting which I narrowed down to a mesa commit from a few months ago [2] [3] and hit a dead end with (until today). It's only this single program which I had ever noticed the issue with so I pushed it aside, but it just occurred to me that this seems like a change that could affect other cases my daily driving has not covered. Further investigation today has revealed that adding libglvnd as an input to mesa fixes this, although from what I can tell reading past discussions on adding it, it seems like a complicated issue [4]. Thoughts about this situation? [1] https://docs.mesa3d.org/release-calendar.html#calendar [2] https://gitlab.freedesktop.org/mesa/mesa/-/issues/11666 [3] https://gitlab.freedesktop.org/mesa/mesa/-/commit/50fc7cc290db49288b318c116c6fdc3daaf801e9 [4] https://issues.guix.gnu.org/49339#3 Cheers, aurtzy --------------HnxJgSCX7UtMHp1z0XQk93Z1 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit

Hi,

I have an additional question/concern that's come up, but to address your comments first:

On 9/15/24 22:59, John Kehayias wrote:

Since last, I have managed to find a better solution to the issue with
substituting rust dependency sources.  Briefly on what I have so far: this
makes use of writing wrap files with just the "directory" property, having
meson fall back to using a local directory that sources are copied to.  Doing
this resulted in an odd behavior with the overlay directories (i.e. important
extra files in subprojects/packagefiles) where they don't seem to be
automatically copied as expected when falling back to local files; however, a
simple copy resolves it, although I thought it would still be good to note and
add a comment about.

I initially made the wrap-file-writing a build utility procedure
'patch-wrap-file' (which can be seen my personal config [1]) as it seemed like
it could be useful for other meson packages, but for this patch I've inlined
it since I'm not confident in its applicability across different projects.
I'd be happy to hear thoughts about it if it might be useful, though.

[1] <https://github.com/aurtzy/guix-config/blob/5cf4c9e277f4ab3a8f1ef87ec5ac47a686da0ad2/my-guix/build/utils.scm#L27>


Very nice! Yes, more utilities to help with unbundling essentially
will be helpful. I don't know if I ever wrote a wrap file or just
patched the directory bit into the meson file directly. I would have
to look this over, but a utility function (or via keyword argument in
meson-build-system?) would be great.
Okay! I'll have a look at the keyword argument approach as well and see if I can make a proposal for changes and further comments sometime soon. 
As for the main patch: I've built locally and see nouveau as a vulkan
driver on x86_64 but not i686. That's about all I can test though. The
change to #:meson means other archs will rebuild too, but I don't know
if they got far anyway (so we can cancel old derivations). Perhaps a
new mesa point release will be out this week? Then I could bump the
version, rebase, and rebuild with this patch. Thoughts?

I didn't consider this when writing the patch, but would it be a good idea to only use meson-1.5 for x86_64? We could avoid rebuilds that way.

Looks like a new mesa release is planned for the 18th [1]. 

Other than that, I made a minor tweak to the changelog (remove first
line, name the phase) locally, but have not done a rebase/push on
mesa-updates. Let me give it a few days for other comments and if
there are any other rebuilds to go with it.

Regarding my concern (unrelated to NVK): I've had issues with a nonfree application segfaulting which I narrowed down to a mesa commit from a few months ago [2] [3] and hit a dead end with (until today). It's only this single program which I had ever noticed the issue with so I pushed it aside, but it just occurred to me that this seems like a change that could affect other cases my daily driving has not covered.

Further investigation today has revealed that adding libglvnd as an input to mesa fixes this, although from what I can tell reading past discussions on adding it, it seems like a complicated issue [4]. Thoughts about this situation?

[1] https://docs.mesa3d.org/release-calendar.html#calendar

[2] https://gitlab.freedesktop.org/mesa/mesa/-/issues/11666

[3] https://gitlab.freedesktop.org/mesa/mesa/-/commit/50fc7cc290db49288b318c116c6fdc3daaf801e9

[4] https://issues.guix.gnu.org/49339#3

Cheers,

aurtzy


--------------HnxJgSCX7UtMHp1z0XQk93Z1-- From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 17 20:37:51 2024 Received: (at 73071) by debbugs.gnu.org; 18 Sep 2024 00:37:51 +0000 Received: from localhost ([127.0.0.1]:56253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqiha-0000E3-DU for submit@debbugs.gnu.org; Tue, 17 Sep 2024 20:37:51 -0400 Received: from mail-oa1-f54.google.com ([209.85.160.54]:56764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqihY-0000Dl-8g for 73071@debbugs.gnu.org; Tue, 17 Sep 2024 20:37:49 -0400 Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-2781cb2800eso3090427fac.1 for <73071@debbugs.gnu.org>; Tue, 17 Sep 2024 17:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726619787; x=1727224587; darn=debbugs.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=pFN8B3Z1oK7djTTtSMPSmIKqqo5tTX40jJi6A2v1zQ0=; b=isE7ii6krki+fugh4tfB8sRhYlhtEWCvFRMcHjpvkHtBMwRb/Nd9wYjABpV0Uzy4e2 +qeyt2HqZCZFAJgl3kQH4QhWM0GzHk14636/zcCqXal0QEixDYtU4UDR3TYysKmFr0MO 2QYZR5w9nbQ0Bh9HLRekWvbHDvS2lRWZnI+NNmljYEbeqCYPfRXA00cqIbOJPdxmFYNw lcW0UduVm4A256nRceBsZa6FgaLqdEu/hjm/ducbcecICAFvwK50yOmSaUU1MyWfFDlp ObwCLptC5nxE0t9NGAjhOMKC+/kqWZhLwTeAF9oOCr/Hw+lDO9j/SpXJbQ7f8g8fihZG ucQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726619787; x=1727224587; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pFN8B3Z1oK7djTTtSMPSmIKqqo5tTX40jJi6A2v1zQ0=; b=dxlHClRzYNDaPmYIQpgREzVox52BaD6UIL76EBrOGFygXvMUdjERvPDrxie50tn1gH ghcfqosDWu+QY8uEGCpMxDSiHwL3yAZNrur85PCZ+GG1IiG/ctsxrWpFg6jemweREgvx YWNrq2hOZEZ9vLcCPXnGj6hw2Sl2aYqDNXSA9nIptK0v21QjydreDt1/DfJFIB+fLLDS HE11I8sGdmv+jzLHrLH8V+1n8amcl08eDOjof6aRk7WxoH2k/UpQORNSfieFlJ6ie6+r 5lHVrmV5bbPe3Fy/7Y7hEceJeS9DemmOLQ5kZ4GWuxIdm/664SKwYCE6nmBGKGpirytm 56JQ== X-Gm-Message-State: AOJu0YzdDfndKNiYCGCvqekQzP9qa/ZJAAJrPIxaQYG+hk5jK/sv0YID q9WZs32hTu3ZBhcE2DpeaI9g5JMlhhVFDADON6XjaqSUoaBf5ImuxE592SwgPCQQF9iYAfwAwYA d7OMpVzVFvYNY7xywkzV2ZuDJ6d0kQ5OZ X-Google-Smtp-Source: AGHT+IH0YVZt1B6VnHLk4tp/TqB0SCHJPtkSdm4FVvk77A3KkUEoP2Y1k1oc0NTXd/7TK/YQmoT9kuHj/pUJCYxhxkU= X-Received: by 2002:a05:6870:8199:b0:277:fe14:e68c with SMTP id 586e51a60fabf-27c3f64a86emr12411537fac.33.1726619786876; Tue, 17 Sep 2024 17:36:26 -0700 (PDT) MIME-Version: 1.0 From: The Man Date: Tue, 17 Sep 2024 19:35:51 -0500 Message-ID: Subject: [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2 To: 73071@debbugs.gnu.org Content-Type: multipart/alternative; boundary="0000000000000f20ec062259ffb2" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73071 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 (-) --0000000000000f20ec062259ffb2 Content-Type: text/plain; charset="UTF-8" Hello, In the interest of creating a future where mesa properly works alongside libglvnd i think there's a few options: - simply adding "-Dglvnd=true" to mesa configure-flags and tediously adding libglvnd to the inputs of every package that links to LibGL, as well as patching anything problematic as mentioned in https://issues.guix.gnu.org/49339#8 - create an abomination, the ONE MESA TO RULE THEM ALL. an example follows: (define-public mesa/new (package (inherit mesa) (arguments (substitute-keyword-arguments (package-arguments mesa) ((#:configure-flags flags ''()) #~(append #$flags (list "-Dglvnd=true"))) ((#:phases phases ''()) (with-imported-modules '((guix build union)) #~(modify-phases #$phases (add-before 'validate-runpath 'unionize (lambda _ ;; unionize with libglvnd, fixing all problems (use-modules (ice-9 match) (guix build union)) (union-build (string-append #$output "/tmp") '#$(list (this-package-input "libglvnd")) #:create-all-directories? #t) (copy-recursively (string-append #$output "/tmp") #$output) (delete-file-recursively (string-append #$output "/tmp")) ;; leftovers from building with old mesa. ;; some packages still link to these. ;; remove for rebuilding after applying graft? (symlink (string-append #$output "/lib/libEGL.so.1") (string-append #$output "/lib/libEGL.so.1.0.0")) (symlink (string-append #$output "/lib/libGLESv1_CM.so.1") (string-append #$output "/lib/libGLESv1_CM.so.1.1.0")) (symlink (string-append #$output "/lib/libGLESv2.so.2") (string-append #$output "/lib/libGLESv2.so.2.0.0")) (symlink (string-append #$output "/lib/libGL.so.1") (string-append #$output "/lib/libGL.so.1.2.0")))) (add-after 'install 'fix-paths (lambda _ (substitute* (string-append #$output "/share/glvnd/egl_vendor.d/50_mesa.json") (("libEGL_mesa") (string-append #$output "/lib/libEGL_mesa"))))) (add-after 'fix-paths 'add-external-egl (lambda _ (mkdir-p (string-append #$output "/share/egl/egl_external_platform.d"))))))))) (native-search-paths (append (package-native-search-paths mesa) (list (search-path-specification (variable "__EGL_VENDOR_LIBRARY_DIRS") (files '("share/glvnd/egl_vendor.d"))) (search-path-specification (variable "GBM_BACKENDS_PATH") (files '("lib"))) (search-path-specification (variable "XDG_DATA_DIRS") (files '("share"))) (search-path-specification (variable "__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS") (files '("share/egl/egl_external_platform.d")))))) (inputs (modify-inputs (package-inputs mesa) (prepend libglvnd))))) Using this to graft over mesa is a filthy answer to the "GL problem". no rebuilding necessary, it seems to "just work". Other distributions have settled on packaging mesa build for working with libglvnd and most software seems to expect such. Perhaps there's another solution? --0000000000000f20ec062259ffb2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello, In the interest of creating a future where mesa pro= perly works alongside libglvnd i think there's a few options:

-= simply adding "-Dglvnd=3Dtrue" to mesa configure-flags and tedio= usly adding libglvnd to the inputs of every package that links to LibGL, as= well as patching anything problematic as mentioned in=C2=A0https://issues.guix.gnu.org/49339#8

- create an abomination, the ONE MESA TO RULE THEM ALL.= an example follows:

(define-pub= lic mesa/new
=C2=A0 (package
=C2=A0 =C2=A0 (inherit mesa)
=C2=A0 = =C2=A0 (arguments
=C2=A0 =C2=A0 =C2=A0 (substitute-keyword-arguments (pa= ckage-arguments mesa)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ((#:configure-flags fl= ags ''())
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #~(append #$flags=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (list "-Dglvnd=3Dtrue"= ;)))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ((#:phases phases ''())
=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (with-imported-modules '((guix build un= ion))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #~(modify-phases #$phases
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (add-before 'validate-runpath= 'unionize
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (lambda = _ ;; unionize with libglvnd, fixing all problems
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (use-modules (ice-9 match)
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0(guix build union))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 (union-build (string-append #$output "/tmp&qu= ot;)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 '= ;#$(list (this-package-input "libglvnd"))
=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #:create-all-directories? #t)=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (copy-recursively = (string-append #$output "/tmp") #$output)
=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (delete-file-recursively (string-append= #$output "/tmp"))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 ;; leftovers from building with old mesa.
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ;; some packages still link to th= ese.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ;; remove f= or rebuilding after applying graft?
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 (symlink (string-append #$output "/lib/libEGL.so.= 1")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0(string-append #$output "/lib/libEGL.so.1.0= .0"))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (syml= ink (string-append #$output "/lib/libGLESv1_CM.so.1")
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0(string-append #$output "/lib/libGLESv1_CM.so.1.1.0"))<= br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (symlink (string= -append #$output "/lib/libGLESv2.so.2")
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(strin= g-append #$output "/lib/libGLESv2.so.2.0.0"))
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (symlink (string-append #$output = "/lib/libGL.so.1")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(string-append #$output &qu= ot;/lib/libGL.so.1.2.0"))))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 (add-after 'install 'fix-paths
=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 (lambda _
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 (substitute*
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 (string-append #$output "/share/glvnd/egl_vendor.= d/50_mesa.json")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 (("libEGL_mesa")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (string-append #$output "/lib/l= ibEGL_mesa")))))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (add-aft= er 'fix-paths 'add-external-egl
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 (lambda _
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 (mkdir-p (string-append #$output "/share/egl/egl_externa= l_platform.d")))))))))
=C2=A0 =C2=A0 (native-search-paths (append (= package-native-search-paths mesa)
=C2=A0 =C2=A0 =C2=A0(list
=C2=A0 = =C2=A0 =C2=A0 (search-path-specification
=C2=A0 =C2=A0 =C2=A0 =C2=A0(var= iable "__EGL_VENDOR_LIBRARY_DIRS")
=C2=A0 =C2=A0 =C2=A0 =C2=A0= (files '("share/glvnd/egl_vendor.d")))
=C2=A0 =C2=A0 =C2= =A0 (search-path-specification
=C2=A0 =C2=A0 =C2=A0 =C2=A0(variable &quo= t;GBM_BACKENDS_PATH")
=C2=A0 =C2=A0 =C2=A0 =C2=A0(files '("= ;lib")))
=C2=A0 =C2=A0 =C2=A0 (search-path-specification
=C2=A0 = =C2=A0 =C2=A0 =C2=A0(variable "XDG_DATA_DIRS")
=C2=A0 =C2=A0 = =C2=A0 =C2=A0(files '("share")))
=C2=A0 =C2=A0 =C2=A0 (sea= rch-path-specification
=C2=A0 =C2=A0 =C2=A0 =C2=A0(variable "__EGL_= EXTERNAL_PLATFORM_CONFIG_DIRS")
=C2=A0 =C2=A0 =C2=A0 =C2=A0(files &= #39;("share/egl/egl_external_platform.d"))))))
=C2=A0 =C2=A0 (= inputs (modify-inputs (package-inputs mesa)
=C2=A0 =C2=A0 =C2=A0 (prepen= d libglvnd)))))

Using this to graft over mesa = is a filthy answer to the "GL problem". no rebuilding necessary, = it seems to "just work".=C2=A0

Other distributions have se= ttled on packaging mesa build for working with libglvnd and most software s= eems to expect such.=C2=A0
Perhaps there's another solution?=C2=A0
--0000000000000f20ec062259ffb2-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 19 21:46:58 2024 Received: (at 73071) by debbugs.gnu.org; 20 Sep 2024 01:46:58 +0000 Received: from localhost ([127.0.0.1]:33675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srSja-0005ie-1e for submit@debbugs.gnu.org; Thu, 19 Sep 2024 21:46:58 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:25767) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srSjV-0005iK-QU for 73071@debbugs.gnu.org; Thu, 19 Sep 2024 21:46:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1726796789; x=1727055989; bh=HQqPsRTp91oEgLmXXq8niK/z27rTIB/C5xED6OHZiXo=; 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=fLjBhLcZwFGwoa2E5LFTwDdKDhjWGnMSN0mIgNLj3m458tM9+ki7xra6oLMq2ADLY U8Zz/MeV4YPlox2KKvvxhvjhRirv2LYzsQ8Bxbpt6Pe3RKIi2ODUP3CPLSDicxndg1 3rnPxU0FshvpYYz1FOJleNbGq5AyPy0t5E88XPKkMZAin752b46Eh21JI4/oYlTT6t 8pbyG1CXG0Vcd/DWt997oHWB4BLD8iPEoNMHtsp3gR3w43AK8KnxWk/PGTT+L9qRdk xqSAkpyFTIxrpcpDcXBXHKWzMM3QpthszfBZY+nK5RU8OlKA7wgvIK7bWQ2JVrF++x lYVDBH9eHpTPg== Date: Fri, 20 Sep 2024 01:46:25 +0000 To: aurtzy From: John Kehayias Subject: Re: [bug#73071] [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2 Message-ID: <87plozksgi.fsf@protonmail.com> In-Reply-To: <3a438e24-05a0-4a7b-95d9-d91fa61047bd@gmail.com> References: <877cbcpalv.fsf@protonmail.com> <3a438e24-05a0-4a7b-95d9-d91fa61047bd@gmail.com> Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 44029a3896fd2ef35b1a04d340a99dabf6a5e4f4 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: 73071 Cc: 73071@debbugs.gnu.org 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 Mon, Sep 16, 2024 at 09:50 PM, aurtzy wrote: > I didn't consider this when writing the patch, but would it be a good ide= a to only use meson-1.5 for x86_64? We could > avoid rebuilds that way. > > Looks like a new mesa release is planned for the 18th [1]. > Ah, thanks, never saw the calendar before. I'm going to build the newest release locally, rebase, and push with your patch and this update. From what I can tell, non x86 archs have stalled for over a week; not sure if a new update really sets them behind or what is happening. > Other than that, I made a minor tweak to the changelog (remove first > line, name the phase) locally, but have not done a rebase/push on > mesa-updates. Let me give it a few days for other comments and if > there are any other rebuilds to go with it. > > Regarding my concern (unrelated to NVK): I've had issues with a nonfree a= pplication segfaulting which I narrowed down > to a mesa commit from a few months ago [2] [3] and hit a dead end with (u= ntil today). It's only this single program which > I had ever noticed the issue with so I pushed it aside, but it just occur= red to me that this seems like a change that could > affect other cases my daily driving has not covered. > > Further investigation today has revealed that adding libglvnd as an input= to mesa fixes this, although from what I can > tell reading past discussions on adding it, it seems like a complicated i= ssue [4]. Thoughts about this situation? > Yeah, we should tackle libglvnd in a separate issue. I'm guessing the main benefit is for Guix on foreign distros? It is easy enough to add the input and mesa build with libglvnd support, but as you see in the thread, there are some other changes needed. Nothing too bad it seems, just hasn't been tackled. Patches/testing welcome :) > [1] https://docs.mesa3d.org/release-calendar.html#calendar > > [2] https://gitlab.freedesktop.org/mesa/mesa/-/issues/11666 > > [3] https://gitlab.freedesktop.org/mesa/mesa/-/commit/50fc7cc290db49288b3= 18c116c6fdc3daaf801e9 > > [4] https://issues.guix.gnu.org/49339#3 > > Cheers, > > aurtzy Thanks again! John From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 19 21:52:04 2024 Received: (at 73071) by debbugs.gnu.org; 20 Sep 2024 01:52:04 +0000 Received: from localhost ([127.0.0.1]:33680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srSoV-0005yz-V0 for submit@debbugs.gnu.org; Thu, 19 Sep 2024 21:52:04 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:33893) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srSoU-0005yU-Dx for 73071@debbugs.gnu.org; Thu, 19 Sep 2024 21:52:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1726797097; x=1727056297; bh=K2Y93FAhuiZzjTkwEqah+femlxNS0ENc0knl3bW6UlY=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=lXkbPE0fOMcxKo95Y7BXBrTVPzRo7hvIgP9xgzA69ZDhUyj9n2OtQ+e5H4Z2TVf8p 5Hfqah+OxqB6IcAy9SrD8BoMyVgTfPs/ia3nPjdm9/OkN/s26Xo/tAQAawMU4tRge7 SSsOthVmyaF3rs+OQoS2Byj19lXnJ0wxO+7koj5fZk1A7i4/Le2ZlAky8Bb19XuJ+Q o3GmB2TdmMSf64Ol1QmxvvnuXspVHZB/yQzPLBXOiHovTT35TWmO6h1yHFCFWHhqIc iVXS+AKabOOP22pY2TM7Vt18s4fxBZz/t7xUQs8y1DSfHTA2sAw1PQs0LHF1qpYi9m VHisQ/7KGFzcg== Date: Fri, 20 Sep 2024 01:51:34 +0000 To: The Man From: John Kehayias Subject: Re: [bug#73071] [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2 Message-ID: <87msk3ks7x.fsf@protonmail.com> Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 0691abcf20423e0a7be5902f648d1e561d45a009 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: 73071 Cc: 73071@debbugs.gnu.org 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 The Man :) A note that your email went to no one; the debbugs number address is not an alias for anyone. I happen to see your message via the issues web interface. I would suggest adding in cc's here to whoever you intended. On Tue, Sep 17, 2024 at 07:35 PM, The Man wrote: > Hello, In the interest of creating a future where mesa properly works alo= ngside libglvnd i think there's a few options: > > - simply adding "-Dglvnd=3Dtrue" to mesa configure-flags and tediously ad= ding libglvnd to the inputs of every package > that links to LibGL, as well as patching anything problematic as mentione= d in https://issues.guix.gnu.org/49339#8 > This didn't seem so tidious but a countable number of packages. The building and testing will take more time but it didn't seem too bad at the time at least. > - create an abomination, the ONE MESA TO RULE THEM ALL. an example follow= s: > This looks the same basically as just propagating libglvnd from mesa, but I didn't look too carefully or try it. In any event, we should handle this in a separate issue, get some input, and then we can do this on a branch. My instinct is to go with what was started in the linked issue above; add libglvnd to mesa (propagated?) and fix failing packages assuming it isn't all 4000 or whatever (pretty sure it is not). > (define-public mesa/new > (package > (inherit mesa) > (arguments > (substitute-keyword-arguments (package-arguments mesa) > ((#:configure-flags flags ''()) > #~(append #$flags > (list "-Dglvnd=3Dtrue"))) > ((#:phases phases ''()) > (with-imported-modules '((guix build union)) > #~(modify-phases #$phases > (add-before 'validate-runpath 'unionize > (lambda _ ;; unionize with libglvnd, fixing all problems > (use-modules (ice-9 match) > (guix build union)) > (union-build (string-append #$output "/tmp") > '#$(list (this-package-input "libglvnd")) > #:create-all-directories? #t) > (copy-recursively (string-append #$output "/tmp") #$outpu= t) > (delete-file-recursively (string-append #$output "/tmp")) > ;; leftovers from building with old mesa. > ;; some packages still link to these. > ;; remove for rebuilding after applying graft? > (symlink (string-append #$output "/lib/libEGL.so.1") > (string-append #$output "/lib/libEGL.so.1.0.0")) > (symlink (string-append #$output "/lib/libGLESv1_CM.so.1"= ) > (string-append #$output "/lib/libGLESv1_CM.so.1.= 1.0")) > (symlink (string-append #$output "/lib/libGLESv2.so.2") > (string-append #$output "/lib/libGLESv2.so.2.0.0= ")) > (symlink (string-append #$output "/lib/libGL.so.1") > (string-append #$output "/lib/libGL.so.1.2.0")))= ) > (add-after 'install 'fix-paths > (lambda _ > (substitute* > (string-append #$output "/share/glvnd/egl_vendor.d/50_m= esa.json") > (("libEGL_mesa") > (string-append #$output "/lib/libEGL_mesa"))))) > (add-after 'fix-paths 'add-external-egl > (lambda _ > (mkdir-p (string-append #$output "/share/egl/egl_external= _platform.d"))))))))) > (native-search-paths (append (package-native-search-paths mesa) > (list > (search-path-specification > (variable "__EGL_VENDOR_LIBRARY_DIRS") > (files '("share/glvnd/egl_vendor.d"))) > (search-path-specification > (variable "GBM_BACKENDS_PATH") > (files '("lib"))) > (search-path-specification > (variable "XDG_DATA_DIRS") > (files '("share"))) > (search-path-specification > (variable "__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS") > (files '("share/egl/egl_external_platform.d")))))) > (inputs (modify-inputs (package-inputs mesa) > (prepend libglvnd))))) > > Using this to graft over mesa is a filthy answer to the "GL problem". no = rebuilding necessary, it seems to "just work". > > Other distributions have settled on packaging mesa build for working with= libglvnd and most software seems to expect > such. > Perhaps there's another solution? It is unclear to me in Guix what this all means. I think it would mostly be helpful on foreign distros (so libglvnd can load host's GL stuff) but I don't know. Or perhaps for non-free related stuff (which wouldn't be part of Guix directly in any event). Thanks for the input! John From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 05 13:51:54 2024 Received: (at 73071-done) by debbugs.gnu.org; 5 Nov 2024 18:51:54 +0000 Received: from localhost ([127.0.0.1]:37883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8Oeg-0000p9-0Y for submit@debbugs.gnu.org; Tue, 05 Nov 2024 13:51:54 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:37779) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8Oed-0000ot-7M for 73071-done@debbugs.gnu.org; Tue, 05 Nov 2024 13:51:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1730832704; x=1731091904; bh=sSKaW4kBy3nYk1UWeAqjeQ1ivNuiysu9k0OZtZxoOAw=; 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:List-Unsubscribe:List-Unsubscribe-Post; b=CRGvtIuzuJB33o9ag7SoYS1QHDmht6ofbr2O8G2m+QOJoMVFWhCvVf3mFooNiwy5X OW9QBEL2TGjngWykAaA1pY4Q+UEMH9csPEk6BfGWZfPBv171qVKXFuYXMOm8D2JYhn WC1CNpz+MXOoeMeIV2XhSQqThXOFF3S7w548y6rhsNjjcTZAaYhRY3T4xufL9d56Gf MRJ6OweGqHtYSPYAdpAWFDP45YjttO81xCJEvDKECiQQyQ3h0yjSpoSeV9Tqw4uluJ HHIohv9lh133sumWVYGOOerEiZINBwFNRfbSG9R32/KTsirc5hcG+MeobTUfcAhL0V 4LtQmCd8X83wg== Date: Tue, 05 Nov 2024 18:51:42 +0000 To: aurtzy From: John Kehayias Subject: Re: [bug#73071] [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2 Message-ID: <87ikt1a4zo.fsf@protonmail.com> In-Reply-To: <87plozksgi.fsf@protonmail.com> References: <877cbcpalv.fsf@protonmail.com> <3a438e24-05a0-4a7b-95d9-d91fa61047bd@gmail.com> <87plozksgi.fsf@protonmail.com> Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 2d72d61c4129347b9b40b38257f29adf02f00f6a 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: 73071-done Cc: 73071-done@debbugs.gnu.org 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 Fri, Sep 20, 2024 at 01:46 AM, John Kehayias wrote: > Hello! > > On Mon, Sep 16, 2024 at 09:50 PM, aurtzy wrote: > >> I didn't consider this when writing the patch, but would it be a >> good idea to only use meson-1.5 for x86_64? We could >> avoid rebuilds that way. >> >> Looks like a new mesa release is planned for the 18th [1]. >> > > Ah, thanks, never saw the calendar before. I'm going to build the newest > release locally, rebase, and push with your patch and this update. From > what I can tell, non x86 archs have stalled for over a week; not sure if > a new update really sets them behind or what is happening. > >> Other than that, I made a minor tweak to the changelog (remove first >> line, name the phase) locally, but have not done a rebase/push on >> mesa-updates. Let me give it a few days for other comments and if >> there are any other rebuilds to go with it. >> >> Regarding my concern (unrelated to NVK): I've had issues with a >> nonfree application segfaulting which I narrowed down >> to a mesa commit from a few months ago [2] [3] and hit a dead end >> with (until today). It's only this single program which >> I had ever noticed the issue with so I pushed it aside, but it just >> occurred to me that this seems like a change that could >> affect other cases my daily driving has not covered. >> >> Further investigation today has revealed that adding libglvnd as an >> input to mesa fixes this, although from what I can >> tell reading past discussions on adding it, it seems like a >> complicated issue [4]. Thoughts about this situation? >> > > Yeah, we should tackle libglvnd in a separate issue. I'm guessing the > main benefit is for Guix on foreign distros? It is easy enough to add > the input and mesa build with libglvnd support, but as you see in the > thread, there are some other changes needed. Nothing too bad it seems, > just hasn't been tackled. Patches/testing welcome :) > >> [1] >> >> [2] >> >> [3] >> >> >> [4] >> >> Cheers, >> >> aurtzy > > Thanks again! > John Merged the mesa-updates branch with latest mesa commit 40b6729fd78ea53ac339= 257aea798d625e16894d. Closing. Thanks aurtzy! From unknown Tue Sep 09 13:19:22 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 04 Dec 2024 12:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator