From patchwork Tue Aug 8 17:49:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 52680 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 B327D27BBEA; Tue, 8 Aug 2023 18:51:32 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 EABE627BBE2 for ; Tue, 8 Aug 2023 18:51:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qTQrI-0000sh-G6; Tue, 08 Aug 2023 13:51:04 -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 1qTQrG-0000sX-Rv for guix-patches@gnu.org; Tue, 08 Aug 2023 13:51:02 -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 1qTQrG-0007ue-KI for guix-patches@gnu.org; Tue, 08 Aug 2023 13:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qTQrG-0007gC-FH for guix-patches@gnu.org; Tue, 08 Aug 2023 13:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65153] [PATCH] gnu: sdl2: Add vulkan-loader to rpath. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Aug 2023 17:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65153 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65153@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169151704029488 (code B ref -1); Tue, 08 Aug 2023 17:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Aug 2023 17:50:40 +0000 Received: from localhost ([127.0.0.1]:37724 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTQqu-0007fX-0u for submit@debbugs.gnu.org; Tue, 08 Aug 2023 13:50:40 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTQqq-0007fJ-Oh for submit@debbugs.gnu.org; Tue, 08 Aug 2023 13:50:38 -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 1qTQql-0000bh-De for guix-patches@gnu.org; Tue, 08 Aug 2023 13:50:31 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qTQqi-0007dF-6p for guix-patches@gnu.org; Tue, 08 Aug 2023 13:50:31 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id BEDB932008FF for ; Tue, 8 Aug 2023 13:50:23 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 08 Aug 2023 13:50:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to; s=fm1; t=1691517023; x=1691603423; bh=pl uXN09EF6EhhdwoQdxFDr9QQjoU/v4mpxmK9iF1M4Q=; b=2nPgq9C3YgvPHJHRt1 THfzlL6idCLpLBi5Hb9Mia6UzPycrYM4bLefsZd0E1R3vM1V3x/8NlYY8ZZwKGx3 F/qUGnVBTFQWXn1UHHFzxjopXmjd0DT3DMYC+Jr+TJl+3cxsNPr7iWAe8zuLMAt4 4XzCe3pi6GE1VoXV4XkGOBxq1giucSfYu/rrF0K83u0ldO2tseo9Fg7606IUGqPf gn2lD2rlNTN3NGqUVginUUUF1asU8fsP0knPKnyJSiqi1jyALed0JugdwVkgCdNg XekDNnyQHFgLYyzKNuFt8u9Vs4mx1vCnpt/vKTHQ55EqvgE2YEC3V/tQ6sizLiig lcZg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1691517023; x=1691603423; bh=pluXN09EF6Ehh dwoQdxFDr9QQjoU/v4mpxmK9iF1M4Q=; b=Dke4MGOxN77qKIxR+rynlMJbnT43A 56zgMilJiVr89DVcSesv5G7/yJMNJQ7DH1miihChjY8G6mBT4ZF+W13ID48uKgfD cm6oQZ6uJeq/d27ji8FgPzT9rWOUlQdtwd3MIAcnOB0SFS6hw5vr4z0O67mL611L u276rJcDz+h3lIrA7lOd2z6azhTTlgGdVc/a1j5c1k8GBj4tEKhb4xKpWH+cffpa RLTghYFzXsyClaMluxuX9Uozb4dAoGk945TnqnwrilPGhK1W34XjoWce0FjiEsPJ U2YAgYWp9yxA0kZotJbRaEA+ZAZcY9P0Yk02UMv7WA61qWvtpFLq+YuKw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrledvgdduudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepgeejhefggffggfeiheekvdekveetgfejteefuddtfeevtdetuddtfeehhefhtd ehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihes uggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 8 Aug 2023 13:50:21 -0400 (EDT) From: dan Date: Wed, 9 Aug 2023 01:49:52 +0800 Message-ID: <20230808174958.16235-1-i@dan.games> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.25; envelope-from=i@dan.games; helo=wout2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: 4547bc6fa3142dca77f7fc912368aeff31bd6e53 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 © 2020 Timotej Lazar ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 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 overrides - ;; the LDFLAG set in sdl’s configure-flags, which isn’t necessary - ;; as sdl2 includes Mesa by default. + ;; SDL dlopens libudev and libvulkan, so make sure they are in + ;; rpath. This overrides the LDFLAG set in sdl’s configure-flags, + ;; which isn’t necessary as sdl2 includes Mesa by default. (string-append "LDFLAGS=-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