From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id IGnyCxiu22YRMAAA62LTzQ:P1 (envelope-from ) for ; Sat, 07 Sep 2024 01:36:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id IGnyCxiu22YRMAAA62LTzQ (envelope-from ) for ; Sat, 07 Sep 2024 03:36:24 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=MwtJXSbA; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=cye2uS7R; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725672984; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=+u/vBDYmps9/3St8u+LPl7yXxwL/qMWVEVNJvDTsbvc=; b=L6srKd7a8En3EYxr6s1Sqay5k788M7WV79btXOjpIheWs6Syhm1t09sAV5yuwE6HPWW4Kc jYLON0Z8/kjx1rAOGSR+dyTSn+/yqplY4zCxC4+SOKz6kGsyVjUM2vYrRcDI7qAfyOOUk7 30+SYOOHKUbgj4oGMQzgCRHNEHwNNcSfCx4b3xYh/5pNkcXUDf9Q9+uoIeTrVKgoiFgqx7 F2pAf7yZ2BJ5ramfEIDAx6HLCJZiT6yfXs71+h1DR0qTcx4MlKTA6i7hyodeJCtznJSD6k LajHTCKDUzSNWAIUA2XMqYsPj1HBRuJLWNKURantPAsy4TmNCIb1umsLFxPrmQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=MwtJXSbA; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=cye2uS7R; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725672984; a=rsa-sha256; cv=none; b=gSAGu6i5BDu6ivYFuZuIRvqeJlJJgD8JtEjxw0uJ0dN85YYuU6YFWCwg5U0sg6WqZ9GsLS d8QCYJ1H+bwAmCUS0cvZuJUP8pJUIEpHQ/XOpbe2VMRJWVEZe2Bbh889oMMAsdpkyE8zj/ tIhRLKWWVf2joDHYJLcyizC+eKJ8Jly4CGKFKSvlc9BxJzrq8sVc0x/bv3tpWxrPtVjrfw 6/NX1kxpW2SaOXL4ZCJze+RTuvA34Y67h2IUVa+2pg4D5Naqz4yXc/xAdetlRHsf7yzfDF 6kFjQlWOHVmVwcBtiicDfelnZjP5IPYVi1p98IkAiwE4TAVflUhuw8WYRu5z0w== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3ED68FB45 for ; Sat, 07 Sep 2024 03:36:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smkMY-0000bW-MP; Fri, 06 Sep 2024 21:35:53 -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 1smkK2-0008VY-0m for guix-patches@gnu.org; Fri, 06 Sep 2024 21:33:11 -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 1smkK0-000338-PZ for guix-patches@gnu.org; Fri, 06 Sep 2024 21:33:05 -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=+u/vBDYmps9/3St8u+LPl7yXxwL/qMWVEVNJvDTsbvc=; b=MwtJXSbAs7GT7ypOthe1lVko3Jgh0LKzFMbBdR4E92wK6LwiFLfzgnYuLcTqqBuWrgTsG2LZkhc4K0oz5J5bFLdnKIMEfczjO+1K/7ho/AeDH7osROi4xDbN3OQQwXAKMmff6D6yZZn4sZ4yl6ikb9yl5AWQdjTxQezKwYiAIn5nR8FIK7XIW3xTHRruNqO9nGWsuH/zh8FyfeMfTwogmoO4Vxar+laM3Aw9+KbTttLamDpxVyo0BtY26S7lswNF4txC8Q/fGQHfiyDLokC9ObewCxUvl3VZFv5nCsrEmcdoTYU4rysfJGRItdbrXkjmiQkghkOHymMjzs+W3QJUAQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smkJy-0006Lo-SS for guix-patches@gnu.org; Fri, 06 Sep 2024 21:33:02 -0400 Subject: bug#71109: [PATCH] gnu: vulkan-tools: Wrap binaries with LD_LIBRARY_PATH. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sat, 07 Sep 2024 01:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 71109 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: nathan , 71109-done@debbugs.gnu.org, sughosha@disroot.org Mail-Followup-To: 71109@debbugs.gnu.org, john.kehayias@protonmail.com, sughosha@disroot.org Received: via spool by 71109-done@debbugs.gnu.org id=D71109.172567273624306 (code D ref 71109); Sat, 07 Sep 2024 01:33:02 +0000 Received: (at 71109-done) by debbugs.gnu.org; 7 Sep 2024 01:32:16 +0000 Received: from localhost ([127.0.0.1]:54468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smkJD-0006Jy-MQ for submit@debbugs.gnu.org; Fri, 06 Sep 2024 21:32:16 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:47911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smkJB-0006Jj-9x for 71109-done@debbugs.gnu.org; Fri, 06 Sep 2024 21:32:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725672726; x=1725931926; bh=+u/vBDYmps9/3St8u+LPl7yXxwL/qMWVEVNJvDTsbvc=; 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=cye2uS7RzLvcqUW8h19BPQSdyGrkf0FRxrmxCzoO6rMgs4V0495JtCnwOuvr8fKZB 8nlH6sBDf2jEg6eXlBFHKvw+B9/1H75qRmILR4DwJclnxb616DQLMvDyU/NUDddn+x Q9zHYXvST5hk98nzquGXhQqNjCi8cdt50oeWb3y5M03CKQkRNMThxNjgZz1kJg6PMi nZPoe4ozWT8tmBt1OMZPQQJ55yA54P7fMxupCgD4cCMgMgtoQN0EpiX+Pj+K5UVT6Q jBxiAtAllAwuCRGCA+5G6aDJ/PBeibmJXLv3lZykkf2jzrus/jiodiwdpNoDuuHIq8 J01HIfF2swhCA== Date: Sat, 07 Sep 2024 01:32:04 +0000 Message-ID: <878qw4l04v.fsf@protonmail.com> In-Reply-To: <87bk47kujd.fsf@gnu.org> References: <0f2a806ee6259147a098e8d672d03ed768fde5fa.1716370579.git.sughosha@disroot.org> <66f9f6e2-434b-08e7-b5d5-c9d1cfd99b50@nborghese.com> <87bk47kujd.fsf@gnu.org> Feedback-ID: 7805494:user:proton X-Pm-Message-ID: c21a9982251b1d1d084aa0d95dd9a44d43cd4474 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 From: John Kehayias via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 3ED68FB45 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.99 X-Spam-Score: -6.99 X-TUID: o4/Fz1tnkq9E Hi all, On Wed, Jun 12, 2024 at 12:02 AM, Ludovic Court=C3=A8s wrote: > Hi, > > I spoke a bit too fast: given that many packages depend on > =E2=80=98vulkan-headers=E2=80=99, this should be applied on a branch. > > Attached as the updated patches. > > John, could you apply them on the =E2=80=98mesa-updates=E2=80=99 branch? = (I realized > there=E2=80=99s no formal =E2=80=98mesa=E2=80=99 team contrary to what I = thought; perhaps there > should be one?). > > Thanks, > Ludo=E2=80=99. > My apologies for a being a bit slow here! I've included these patches on mesa-updates (building now) and the full set of patches is tracked here: https://issues.guix.gnu.org/73071 I have used vulkan on that branch without issues so far. And yes, I keep forgetting to make a formal team. I suppose it shouldn't be a "mesa" team but a bit broader (graphics?). I will close this as it is live on mesa-updates and hopefully merged into master before long. (Otherwise I'm afraid it will be forgotten open and it can be tested with the other updates, but please correct me if this should remain open.) Thanks everyone for your work here! John >>>From 577a58ac4d23e7fa749fddb3007a3ad14c40f38d Mon Sep 17 00:00:00 2001 > Message-ID: <577a58ac4d23e7fa749fddb3007a3ad14c40f38d.1718143100.git.ludo= @gnu.org> > From: nathan > Date: Sat, 1 Jun 2024 21:14:13 -0400 > Subject: [PATCH 1/2] gnu: vulkan-headers: Hard-code libvulkan.so file nam= e. > MIME-Version: 1.0 > Content-Type: text/plain; charset=3DUTF-8 > Content-Transfer-Encoding: 8bit > > * 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 > --- > 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 25542c1e064..5ff47be92e2 100644 > --- a/gnu/packages/vulkan.scm > +++ b/gnu/packages/vulkan.scm > @@ -246,7 +246,8 @@ (define-public glslang > ;; include/SPIRV/{bitutils,hex_float}.h are Apache 2.= 0. > license:asl2.0)))) > > -(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") > @@ -263,6 +264,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") > @@ -270,6 +272,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") > @@ -326,7 +347,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") > > base-commit: 7daf9328921f9f7d4fe4839d8e16091bd9f06072 > -- > 2.45.1 > >>>From 2cb9899209d1807cd18e9ed68a634faca48c6d89 Mon Sep 17 00:00:00 2001 > Message-ID: <2cb9899209d1807cd18e9ed68a634faca48c6d89.1718143100.git.ludo= @gnu.org> > In-Reply-To: <577a58ac4d23e7fa749fddb3007a3ad14c40f38d.1718143100.git.lud= o@gnu.org> > References: <577a58ac4d23e7fa749fddb3007a3ad14c40f38d.1718143100.git.ludo= @gnu.org> > From: nathan > Date: Sat, 1 Jun 2024 19:55:24 -0400 > Subject: [PATCH 2/2] gnu: volk: Hard-code path of vulkan-loader for dynam= ic > loading > MIME-Version: 1.0 > Content-Type: text/plain; charset=3DUTF-8 > Content-Transfer-Encoding: 8bit > > 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, = 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=C3=A8s > --- > 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 5ff47be92e2..5d322f3ddb9 100644 > --- a/gnu/packages/vulkan.scm > +++ b/gnu/packages/vulkan.scm > @@ -597,9 +597,19 @@ (define-public volk > "0x4jhc8n9c4k8svmmcaxxs613xbsav7wam94gacddlm738cwp13v"))= )) > (build-system cmake-build-system) > (arguments > - '(#:tests? #f ;no test > - #:configure-flags '("-DVOLK_INSTALL=3DON" "-DVOLK_PULL_IN_VULKAN= =3DON"))) > - (inputs (list vulkan-headers)) > + (list > + #:tests? #f ;no test > + #:configure-flags #~(list "-DVOLK_INSTALL=3DON" "-DVOLK_PULL_IN_VU= LKAN=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 lo= ad