From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 2Dn3Mo5/ZWWDYgAAauVa8A:P1 (envelope-from ) for ; Tue, 28 Nov 2023 06:50:06 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2Dn3Mo5/ZWWDYgAAauVa8A (envelope-from ) for ; Tue, 28 Nov 2023 06:50:06 +0100 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 7E3D914941 for ; Tue, 28 Nov 2023 06:50:06 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=eNxWGjSR; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1701150606; 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=X2a8IDVYslJbTfDLXHVYUwL1LMwLMuLf1bWuAG6mmTQ=; b=FvVEsUgnAiOoJY3RVNW7XRYx5+hC4bwwbjjoVJ4mEXXsZlNF1dbenoSTOdcV4yT0tWh+dq 0vjOuraRcP6ON7vkVbqFs6Eo1APfgc3xZyrdgPdMihXz5ftqs9i08kx7I3mYxJQZAL4+Uy YoliPmxwJteyzlrKlS/10zn/jL62kuxdjXkH62+Mlwix6kqXnWgCB7inPulQsTV0QkattE Lvu2Y4hWxGSIAgWCrYI2LHAfeX3ZmzyRDhYUYGelh/iTIfnnxt4e+mv3aByZJTJzz13ZSa xNqcSj9PcFP0Px09ON8nly8X14mcSo4tIaj1gE/J7LL1G6AAqjq3EaF2Xapi/A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1701150606; a=rsa-sha256; cv=none; b=PV4zS42/IDnO4kffjAoL5e+GAgGweRBv24RATCJpXuteCj00mgf+lR/qWTZyN4WOU1iCg4 NsXzydGrLZIE+5F0DGsVlinrL5eH92JhIVCXNNpmCZsZv3QJC3O9nPWjVFcLp2hpJDCsuz Ug0UqP08o0BMXZ8ass0xDUmU/yrBmSX0jdJxYWeler3zBRCeWsw7Otc4f1A4q3LhLVhOJC 4MH0bPFD1RwqCp+7RxJoIpHTDjt4rpbfLpF39sI4XhYO8vHg/4b5aPNOQ3Zpkwk40bpQsG K7xAi8Z42NTHPVJcRdOJNa9C65Wz5zVDQmiFGzOKKPsPASY52UE0HSYZaB7sNA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=eNxWGjSR; dmarc=pass (policy=none) header.from=gnu.org; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7qys-0005oS-Mo; Tue, 28 Nov 2023 00:49:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r7qyq-0005nj-5d for guix-patches@gnu.org; Tue, 28 Nov 2023 00:49:56 -0500 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 1r7qyp-00072J-Te for guix-patches@gnu.org; Tue, 28 Nov 2023 00:49:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r7qyw-0008F5-It for guix-patches@gnu.org; Tue, 28 Nov 2023 00:50:02 -0500 Subject: bug#65153: [PATCH] gnu: sdl2: Add vulkan-loader to rpath. References: <20230808174958.16235-1-i@dan.games> In-Reply-To: <20230808174958.16235-1-i@dan.games> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 28 Nov 2023 05:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 65153 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: dan Cc: 65153-done@debbugs.gnu.org Mail-Followup-To: 65153@debbugs.gnu.org, john.kehayias@protonmail.com, i@dan.games Received: via spool by 65153-done@debbugs.gnu.org id=D65153.170115058431650 (code D ref 65153); Tue, 28 Nov 2023 05:50:02 +0000 Received: (at 65153-done) by debbugs.gnu.org; 28 Nov 2023 05:49:44 +0000 Received: from localhost ([127.0.0.1]:45323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7qyd-0008EQ-DB for submit@debbugs.gnu.org; Tue, 28 Nov 2023 00:49:44 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:36747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7qyb-0008EB-Hr for 65153-done@debbugs.gnu.org; Tue, 28 Nov 2023 00:49:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1701150568; x=1701409768; bh=X2a8IDVYslJbTfDLXHVYUwL1LMwLMuLf1bWuAG6mmTQ=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=eNxWGjSRagmCiy1iDM7cZ2CdQtfBQnLs+5uRa7nWMco9NyayP1toA87B3n6mfF50I clb/MpTCOdFy2U6zeUomIChrg7VQxWwVM2qfzghV8pi3Vlsm0FFbOsFPuY++JeGYuy uV37ATRLk66WKQIiO9f5R80T2CRLKS8TqJuacCIPNajcGU3dHL/Tz9SSu5XFGkss7Y XvDAF/Ok66vjGgR4rdtfxowvawfnB8JFpl4MsmQ00OFrA9pDqQT9O7B+8mUF+35k8i Www2Z9vO07SBCrKYrZcCGuqm/iF5AQBrpPxC0bTMlCPfEwUlJI7+XP/zglFXYie/v0 +bgCIVjAtF63A== Date: Tue, 28 Nov 2023 05:49:12 +0000 Message-ID: <87plzu8m23.fsf@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-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-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -6.63 X-Spam-Score: -6.63 X-Migadu-Queue-Id: 7E3D914941 X-TUID: aKWqnB+03tHM On Wed, Aug 09, 2023 at 01:49 AM, dan wrote: > * gnu/packages/sdl.scm (sdl2) > [arguments]: Append the path to libvulkan.so to rpath. > [inputs]: Add vulkan-loader. > --- > gnu/packages/sdl.scm | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm > index 86ec1c033b..bb9fb19f9e 100644 > --- a/gnu/packages/sdl.scm > +++ b/gnu/packages/sdl.scm > @@ -14,6 +14,7 @@ > ;;; Copyright =C2=A9 2020 Timotej Lazar > ;;; Copyright =C2=A9 2020 Oleg Pykhalov > ;;; Copyright =C2=A9 2022 Maxim Cournoyer > +;;; Copyright =C2=A9 2023 dan > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -59,6 +60,7 @@ (define-module (gnu packages sdl) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages pulseaudio) > #:use-module (gnu packages gl) > + #:use-module (gnu packages vulkan) > #:use-module (gnu packages xdisorg) > #:use-module (gnu packages xiph) > #:use-module (gnu packages xorg) > @@ -132,11 +134,13 @@ (define-public sdl2 > #$flags)) > ((#:make-flags flags ''()) > #~(cons* > - ;; SDL dlopens libudev, so make sure it is in rpath. This ove= rrides > - ;; the LDFLAG set in sdl=E2=80=99s configure-flags, which isn= =E2=80=99t necessary > - ;; as sdl2 includes Mesa by default. > + ;; SDL dlopens libudev and libvulkan, so make sure they are i= n > + ;; rpath. This overrides the LDFLAG set in sdl=E2=80=99s conf= igure-flags, > + ;; which isn=E2=80=99t necessary as sdl2 includes Mesa by def= ault. > (string-append "LDFLAGS=3D-Wl,-rpath," > - #$(this-package-input "eudev") "/lib") > + #$(this-package-input "eudev") "/lib" > + ",-rpath," > + #$(this-package-input "vulkan-loader") "/lib") > #$flags)))) > (inputs > ;; SDL2 needs to be built with ibus support otherwise some systems > @@ -151,6 +155,7 @@ (define-public sdl2 > ibus-minimal > libxkbcommon > libxcursor ;enables X11 cursor support > + vulkan-loader > wayland > wayland-protocols))) > (license license:bsd-3))) > @@ -681,3 +686,4 @@ (define-public guile2.2-sdl2 > > (define-public guile3.0-sdl2 > (deprecated-package "guile3.0-sdl2" guile-sdl2)) > +sdl2 > > base-commit: 4547bc6fa3142dca77f7fc912368aeff31bd6e53 Pushed as 50521348c89140705ca157a7d77f4acda24c26c7 thanks!