From patchwork Fri Sep 6 15:05:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67665 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EA06B27BBEA; Fri, 6 Sep 2024 16:06:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5F79827BBE9 for ; Fri, 6 Sep 2024 16:06:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaXF-0001bQ-TU; Fri, 06 Sep 2024 11:06:05 -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 1smaXD-0001bF-Ce for guix-patches@gnu.org; Fri, 06 Sep 2024 11:06:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smaXD-0003Kl-2X for guix-patches@gnu.org; Fri, 06 Sep 2024 11:06:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=9NyotAYBP+YhpkrJu74VSsxdgq2l7NLMeIV/LZXw4ms=; b=hWyonfCW5ekZsOGPXdrcNjEOhFSOotXMh3Q1oPHdhk43VtlAn5x8D1Iho+KepOY6tJfgkgjpKKLG5AQVyobeuLE5wnsPBXf+/ZEbjOLZ8FbfersZnOexMJOGLP/g+Cb1Wr6UuVAGMwMTTCtGM3v2BonR2rRPrtMx0LeDLIRludhlRwFu1FBF+vYW1OQqUiuMtSIKQhgkzoJLNhn61GQx5ekv7507NRAhVTC00qYAOF7kaGFP9TAi3wKzMnxg6zLycUTMa9vT4sZfCFfMSOIxZkQJKYSfyRGRCT6ZDqxvJgeRidOAVcCtHXJrobCgEkW64UI/knxAb3HbDuqUlHQrog==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaXC-0004yy-Hh for guix-patches@gnu.org; Fri, 06 Sep 2024 11:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 1/8] gnu: libdrm: Update to 2.4.123. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563515519117 (code B ref 73071); Fri, 06 Sep 2024 15:06:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.123. Change-Id: I28ace4f3f121a7177cfc78de8e50364753114e8c --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.45.2 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 From patchwork Fri Sep 6 15:06:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67672 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0D81227BBEA; Fri, 6 Sep 2024 16:14:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B518227BBE2 for ; Fri, 6 Sep 2024 16:14:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaez-00027p-Ud; Fri, 06 Sep 2024 11:14:06 -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 1smaex-00020v-9J for guix-patches@gnu.org; Fri, 06 Sep 2024 11:14:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smaew-00040D-T8 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:14:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=vxPWCk5xuoIKRCeHtea5CUdt9j3H3Sksm0AdWELBkYg=; b=F8G5sFKxNR2Rcn50mcl/mYUEdvDAxdsC8yoC4FXe7F2Oc7BT7pSlnbLEYRjmp/OW9XZk/rCdJDOjYyeHky/qmNCgEZ1Y/M9ni+6+X7Anf6p/6s+WtiUMzbz72CPASEPm0LNfx94KL/URx2k1So5Bu3cz56EcWmaUQWcQ5E4Gxlph4o1Xw3ZUyCLtEyPz40qoQfbl9IBqkYT0x2xQj9klQ2Qf0plYQedkAWJYbs6oR7txhikrwoF1rLX4YZsrNeO9H1RJ0wi3ca3vZaEjR2gh2WEY2lW70Uy2O+w53Ot+O/Wg0mmz0fItCsbqulnOWQ7DHXU00kPhF7cGAh354A+jyg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaew-0005O2-D7 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 2/8] gnu: wayland-protocols: Update to 1.37. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563558320610 (code B ref 73071); Fri, 06 Sep 2024 15:14:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.37. Change-Id: I32837fc9c6609532557c31cf94b0f87e999680d8 --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.45.2 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)) From patchwork Fri Sep 6 15:07:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67668 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 85F2427BBEA; Fri, 6 Sep 2024 16:08:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4049A27BBE2 for ; Fri, 6 Sep 2024 16:08:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaZG-0007ZF-Qe; Fri, 06 Sep 2024 11:08:10 -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 1smaZ9-00075Z-4N for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smaZ8-0003Sh-NC for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=uEnI3jDzmXCKs4ALkehooRUE1rbuorn47UoZuAzA9+A=; b=EVsBtGI79BhXBvDV6Zp8Zl0ZZ80T+NSLOSheiOWY3g7BcXAqnmCZl7QiTln+02oj2vWZ9xZ/u4HPLJs7Qqm6jrwFLsUt+2TRcFnbU9n4qza+IajRaXQrx+o2g28Nu+hUDuPnuV63R+CPiZfYExSIhbyHZMtngyP5MD++rp2rSzASEYlwoQaSauQWuAymvP0xnt9OgUvdl35sSYLfNx6W/qawgivaI8UzhO6Q5B3F0tO1ovF0eUE6smbHDobWMviX6uQrItTUPyG1vulD8Qpjp1IHNJVI9VIyUeio1AHCGMzlP4Fdh8sYKgUoSaBaSdWb5Na4aWQhqzwaW7mEAaHzuw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaZ8-00053d-1l for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 3/8] gnu: Remove wayland-protocols-next. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563523219329 (code B ref 73071); Fri, 06 Sep 2024 15:08:01 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) -- 2.45.2 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/wayland/" - "wayland-protocols/-/releases/" version "/downloads/" - "wayland-protocols-" version ".tar.xz")) - (sha256 - (base32 - "14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vzbi")))))) - (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 From patchwork Fri Sep 6 15:07:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67666 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AF4F027BBEA; Fri, 6 Sep 2024 16:08:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EFCCF27BBE2 for ; Fri, 6 Sep 2024 16:08:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaZB-0007Dk-Hu; Fri, 06 Sep 2024 11:08:05 -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 1smaZ9-00076B-96 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smaZ9-0003Sj-00 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=Hx+4LLjq9fszJThul22pTkiXdP+/ZXxVnksxMx3a2eE=; b=MDsKh41LdC3q/XCw3eMGqBhrIAHnnQCn7EHJBDHmGp4hZ7SADF+91E5+D43wigLbr8/dl5djGybn4J6Bqb3JuxZy9hpbXhR7jC3PMw3lv13ZzsFmzadPBSxDvLLNPc05ArisFIkTWyvAvtyh1RvzaN1bw8ZjJRBOpKhjYJ+CpfGR5EuSBwVIfvpqG4uXRQqEbgXjmg2F+UIY4vmMEX5Fvn7BhQ8jlSlKbsUHvYEx0APGfHlWDTl8ZJh7FM4lGXtdfrMdBtEDaVQPyDdTqK1AIKfArGACuEj6t+UjFZjYtb1MJlWa+A7hJePndbBDixG3I8qESLG2w6lv68WRhm04bw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaZ8-00053l-Fc for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 4/8] gnu: vulkan-headers: Hard-code libvulkan.so file name. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , nathan , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563524319354 (code B ref 73071); Fri, 06 Sep 2024 15:08:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: nathan * gnu/packages/vulkan.scm (vulkan-headers): Rename to… (vulkan-headers/no-loader): … this. (vulkan-headers): New variable. (vulkan-loader): Depend on ‘vulkan-headers/no-loader’. Change-Id: Ic674a4d965d8049e388d75137111ed0253ca3b18 Co-authored-by: Ludovic Courtès Signed-off-by: John Kehayias --- gnu/packages/vulkan.scm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) -- 2.45.2 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-loader) + ((#: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") From patchwork Fri Sep 6 15:07:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67667 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E440227BBEA; Fri, 6 Sep 2024 16:08:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A6BAB27BBE2 for ; Fri, 6 Sep 2024 16:08:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaZC-0007IF-Gb; Fri, 06 Sep 2024 11:08:08 -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 1smaZ9-00078I-Pp for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smaZ9-0003St-H2 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=RUMqlnaKCQQgSYOcxrzFHuN1UOoQY03zpD+SyZMv4wk=; b=ZfYQC2/n7OwJbLVliQKUFkpkqcqzk4bRR2bxpKsW4QVbI637O4N329br9UtbPNgeEdgDy+19hsTmtDzV8qGGPIlpsr1JIiUnepBoU0QubxBa5lz4lgJd+rLjwJYZMk6SzlMoDyZu+Cn9p4F1WD7hvA6+zYZG1oNUKOlHL3lg+oN0oKd4hRkXAeesVeRfwf0m9yJo1opBtI2t4/IkTrLtX6EQ7oN05/XFL8zPeoCrjJtrODJp4F5Pp6O125g2LxUaOGKqcCjWye3y/pxqlhAmlAJsxlaY8BS3iUwVXl1E91muyJoTlnhCyCP5LhpqTMRCCMB6aQBgIaVXD/6BmBQxXA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaZ9-00053s-0H for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 5/8] gnu: volk: Hard-code path of vulkan-loader for dynamic loading Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , nathan , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563526219398 (code B ref 73071); Fri, 06 Sep 2024 15:08:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: nathan Until now, we’d 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, not 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ès Signed-off-by: John Kehayias --- gnu/packages/vulkan.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) -- 2.45.2 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=ON" "-DVOLK_PULL_IN_VULKAN=ON"))) - (inputs (list vulkan-headers)) + (list + #:tests? #f ;no test + #:configure-flags #~(list "-DVOLK_INSTALL=ON" "-DVOLK_PULL_IN_VULKAN=ON") + #: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 From patchwork Fri Sep 6 15:07:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67669 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8FA6027BBEA; Fri, 6 Sep 2024 16:08:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 521F327BBE2 for ; Fri, 6 Sep 2024 16:08:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaZE-0007J9-41; Fri, 06 Sep 2024 11:08:08 -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 1smaZA-0007A4-8J for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smaZ9-0003Sy-W1 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=3QuD1enhSII2XPlPVxw7oWPa1tRNJHZDbGtM7otmlPs=; b=ackgt+gDy+sehDLWgODDSWvFN6s1qijXe5bQgphhYZnTHoK7YHIuiJ4ksA9eZ3NN1TK4vbpmHatSWEy+M0JUzXOVzPPbStBLWxXYdn3PtDNQIty2/3qDoZDboznw0g7ICDiNZKnHAZLMFMAoO6Or9cwb9Ed6fwSAveP4xtXknwuLkeg5DaIlvDFvktr73fSUaTtIiWZKZsoimt/ZT43XgEDqU/LwD6ZChQn47HVxuZxAVPmGV+y3nLlX4pZ+zOeSq7HWGQsUotcFO6dLFCH7UbDizmfDpJXMIr+sla0FAI4gGSDgskXLyz3GkBG9td3gFsNnHF7PfSXESznN9jyEbw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaZ9-000540-FT for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 6/8] gnu: llvm-for-mesa: Update to llvm-18. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563527319424 (code B ref 73071); Fri, 06 Sep 2024 15:08:03 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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(-) -- 2.45.2 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 using 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") From patchwork Fri Sep 6 15:07:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67670 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 228D927BBEA; Fri, 6 Sep 2024 16:09:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B239227BBE2 for ; Fri, 6 Sep 2024 16:09:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaa9-0002Hq-VZ; Fri, 06 Sep 2024 11:09:06 -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 1smaa7-0002HR-JQ for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smaa6-0003XY-G9 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=xBxUhjI+hJzkso+BzQruSK1bBQD5lEhT+e/ZPcVQKfk=; b=umI0YikZuJj0qY7okRNpN94qNbIsjEQ+OhAACfsRoKlkjQVW4+50qxouOHgcA1dvKyUdeyZq7W6eTOFbKkqU86f52pmlRb9eHMxI/vFN26v2mGszgFP6KLhWvlpXboyj35xDsbmiVrH/b6KUe6bULsSfm7Dq5epOsRQ0wZIWBjEM8j+59mq6bpb9L2p3YEabInKRDE1y8/NY7zxWuReX8xaBtSepuFpiYs/DFpzkaqybvJ3vb5hrth7WbvZDb5AXgiqzPF0HDp4FQjjJJdUjzyA99VRHaBwbVg8XvNQVW/V4ZQm+jkzNMGB/RfpAhWM+AzqE1UeiXAzHLIcU6INvIQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaa5-00055s-VF for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 7/8] gnu: llvm-for-mesa: Build all targets. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563529119504 (code B ref 73071); Fri, 06 Sep 2024 15:09:01 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This change is needed for updating mesa to 24.2.1. Otherwise, mesa fails to 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(-) -- 2.45.2 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 © 2021 Lars-Dominik Braun ;;; Copyright © 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2022, 2024 Greg Hogan -;;; Copyright © 2022 John Kehayias +;;; Copyright © 2022, 2024 John Kehayias ;;; Copyright © 2022 Clément Lassieur ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 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=" - (system->llvm-target) ";AMDGPU") - #$@(if (%current-target-system) - '("-DBUILD_SHARED_LIBS:BOOL=TRUE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") + #$@(if (%current-target-system) + '("-DBUILD_SHARED_LIBS:BOOL=TRUE" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") '()) - ;; Skipping tools and utils decreases the output by ~100 MiB. - "-DLLVM_BUILD_TOOLS=NO" - (remove - (cut string-match - #$(if (%current-target-system) - "-DLLVM_(LINK_LLVM_DYLIB|TARGETS_TO_BUILD|INSTALL_UTILS).*" - "-DLLVM_(TARGETS_TO_BUILD|INSTALL_UTILS).*") <>) - #$cf))) + ;; Skipping tools and utils decreases the output by ~100 MiB. + "-DLLVM_BUILD_TOOLS=NO" + (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) From patchwork Fri Sep 6 15:08:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67671 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 16AEC27BBE9; Fri, 6 Sep 2024 16:09:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 62FBF27BBE2 for ; Fri, 6 Sep 2024 16:09:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaaB-0002IG-7z; Fri, 06 Sep 2024 11:09:07 -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 1smaa7-0002HQ-JH for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smaa6-0003Xa-WF for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=K62tQnT6x8qIfj1/z3bDDlMi8R1oN7YlMo6nQ8Ks9A0=; b=F8ccBZ+NAHpZroEtkOOkHruCJykHLVQBmB0M4n8I4G1z0pwJ2PowkHbmld5bs85yVTi5fk7kRBSUjmGv0VYdqnJeSWb/4KEXsZr3EckPT36XXL1IfG9OKDE51bAHclu12MnbJhBfgjsN9LQRsMR26cRgHUD3NCoi4kC+/qEGatVYopqY47GlDS7lWfsamjN7+wXQBRLMKFKphGiskpuOG8V5D07kGbeeCqFvQ2YEzkHCAvZo6M7Ti3bECdNNd1pPqbXn1rKMbc6ofBpTuSLjKrqNi5ljlQLe1Igk1OdJMquiCDt3dFaHYel8oguhCZFclaip9n64tQCNkd3Fj5/lwQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaa6-000561-FG for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 8/8] gnu: mesa: Update to 24.2.2. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563530219529 (code B ref 73071); Fri, 06 Sep 2024 15:09:02 +0000 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 Message-ID: In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 90cc0872112bb0c9fd540be2fe1c0f258ad1913c MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 about 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(-) -- 2.45.2 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 © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Kei Kebreau ;;; Copyright © 2021 Ivan Gankevich -;;; Copyright © 2021, 2022, 2023 John Kehayias +;;; Copyright © 2021-2024 John Kehayias ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 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 using 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=standalone" #$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=standalone" #$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")