From patchwork Sat Mar 2 09:06:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61281 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 8766E27BBEA; Sat, 2 Mar 2024 09:07:55 +0000 (GMT) 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 CACDB27BBE9 for ; Sat, 2 Mar 2024 09:07:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rgLLD-0001gB-Is; Sat, 02 Mar 2024 04:07:35 -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 1rgLLC-0001ft-4x for guix-patches@gnu.org; Sat, 02 Mar 2024 04:07:34 -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 1rgLLB-0000xx-Sx for guix-patches@gnu.org; Sat, 02 Mar 2024 04:07:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rgLLd-000493-NC for guix-patches@gnu.org; Sat, 02 Mar 2024 04:08:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69502] [PATCH] gnu: sdl2: Update to 2.30.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Mar 2024 09:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69502 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69502@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170937045815894 (code B ref -1); Sat, 02 Mar 2024 09:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Mar 2024 09:07:38 +0000 Received: from localhost ([127.0.0.1]:38008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgLLF-00048I-Px for submit@debbugs.gnu.org; Sat, 02 Mar 2024 04:07:38 -0500 Received: from lists.gnu.org ([209.51.188.17]:33474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgLLC-00048A-OO for submit@debbugs.gnu.org; Sat, 02 Mar 2024 04:07:36 -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 1rgLKj-0001bi-V5 for guix-patches@gnu.org; Sat, 02 Mar 2024 04:07:05 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rgLKh-0000re-Pq for guix-patches@gnu.org; Sat, 02 Mar 2024 04:07:05 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D05365C0038 for ; Sat, 2 Mar 2024 04:07:01 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sat, 02 Mar 2024 04:07:01 -0500 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:subject :subject:to:to; s=fm2; t=1709370421; x=1709456821; bh=Ap2ICsvTeS LYfiks2r1hISUDd6Wtc7WvZdTAg5T7ofw=; b=DwDcKIfVKFvCypHNgsrh/5Tdsg t53HWV94Y0L5UlZhcdiWfLpgADHDaMsU6vfIHuvKTENwvnDeCxziN+xLSI6AGLMP Sh52SqXGfxlBC4JE3GXKnCymDaWfhDtGxrs5VK3N+8q5J8MQKx/hmQpruxjwVIpA bUTJQoQZDMmp6KpKzzIGrcvBBdBQ/zM5zk2U+hxCwXcuCszhWj5khI4oIzI86wvS 5FjrkeITTkOYb7X4cjw8IP8ucrZPWOOIjO/CrnfGERjtwPvsdsofl02vz6BzJg/J 3VPx2/GUndcyrNUTyWnQufJAq+D6MxUbpkIYS+0VSbsx0c54bqROP0XQ7+mg== 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:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1709370421; x=1709456821; bh=Ap2ICsvTeSLYfiks2r1hISUDd6Wt c7WvZdTAg5T7ofw=; b=riqCIshXnd43xEWAvmDptQqq77l1cVb+DTx0F9eRtyl1 MvmaErgu6owaHhPEPWDmWlkOzl5/NxVHS2vrLmQC/gyQ7Vs5YBjKN1soeVyjKO4p oPSayR/F6eUpinwVsomwC0RRagJEhzklt2BDjRa1HUFNK/rD3YmBs/m4KssZsOZW p/SUIOtlcFE1pbyNGWQYG9oo/InzSjVQNT5xmRzl8/5ZJ9kHFkp7eO0NMWqu/L6d jp5mGHNNVLDYyobIAOnJ9pRF/9OwKoRaVyJ9X/NQrSxvQaA7isAxy75A4ETTMgyY qYdM2UYjiKUP5G3+27j0REDwJzPSLGT9VNRK+BRgTw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrhedvgdduvdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfehhfeileehleetleevhfdvvdffkeetleevfeelveefvefhjeffuefhffdvue fhnecuffhomhgrihhnpehlihgsshgulhdrohhrghdpshholhhushdqphhrohhjvggtthdr tghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 2 Mar 2024 04:07:00 -0500 (EST) From: dan Date: Sat, 2 Mar 2024 17:06:42 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.29; envelope-from=i@dan.games; helo=out5-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, T_SCC_BODY_TEXT_LINE=-0.01 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): Update to 2.30.0. Change-Id: I6c029cc5732e286816550871e519d79b1a13e70f --- gnu/packages/sdl.scm | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) base-commit: 4a0549be52f3f46fbce61342d8de30f7b83130c5 diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 3a4aafcaa7..2bb41b9ca2 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Evgeny Pisemsky -;;; Copyright © 2023 dan +;;; Copyright © 2023, 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,30 +118,32 @@ (define-public sdl2 (package (inherit sdl) (name "sdl2") - (version "2.28.5") - (source (origin - (method url-fetch) - (uri - (string-append "https://libsdl.org/release/SDL2-" - version ".tar.gz")) - (sha256 - (base32 - "1r36cspzv6h8abiqbbkrgm17g975p9wiziir2xabj3721dyv6b1k")))) + (version "2.30.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://libsdl.org/release/SDL2-" version + ".tar.gz")) + (sha256 + (base32 "1c27ci93j4kgxdmpflaww8kwnz58b1chyp1i34almyp0away9qin")))) (arguments (substitute-keyword-arguments (package-arguments sdl) ((#:configure-flags flags) #~(append '("--disable-wayland-shared" "--enable-video-kmsdrm" "--disable-kmsdrm-shared") #$flags)) - ((#:make-flags flags ''()) + ((#:make-flags flags + ''()) #~(cons* ;; 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") + #$(this-package-input "vulkan-loader") + "/lib") #$flags)))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems @@ -150,11 +152,11 @@ (define-public sdl2 ;; For more information, see: https://dev.solus-project.com/T1721 (modify-inputs (package-inputs sdl) (append dbus - eudev ;for discovering input devices + eudev ;for discovering input devices glib ibus-minimal libxkbcommon - libxcursor ;enables X11 cursor support + libxcursor ;enables X11 cursor support vulkan-loader wayland wayland-protocols)))