From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id GP1xKIoD6GVtNQAAe85BDQ:P1 (envelope-from ) for ; Wed, 06 Mar 2024 06:47:54 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id GP1xKIoD6GVtNQAAe85BDQ (envelope-from ) for ; Wed, 06 Mar 2024 06:47:54 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=owx90ZuK; 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=1709704074; 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-cc: 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=qvK8U6ssswVORKVg0gLZpywvooymnWHfnYy6LAZN2CA=; b=da/SDAuqR+ydCpj0Gb3fW3E9AjAlLM0mxMie+2VAD/YZTePJGonIsEwVrT+E3gQKyZTfKh iLqexmlAK7uUtMMPIa3ZhEuYkwhxyALMq8uRz5k212DJloxB02g+RRl8sAtovC7bqpF18I fCZsIRfMh02KTJmyJLdFoiUbG/2Uv7xmwZsCHiHU5A5Z8Dwoy2FcCkfLoJxtkOco6Wthi9 CjQFQfWh5kbnaO3+MldeZRmmF2uBuFQXycFKDfEbn3XJD9WZoG/KoO2H+1+8FPulrq1uMQ qfpWaPKTZn0a6yHB+dedQrKDuJDfGPkKky7W2AfaCWGlUZzD9FUmm9JgkZKv1Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=owx90ZuK; 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=1709704074; a=rsa-sha256; cv=none; b=Lo9zlPnqn6sAPdUTh2Kkh7tmHru/HDQ6capJKjg74KodB1tTwU2+urQbiStqumeiOrjddK rGGeXkFOcboMYFAFN1XIaQ4KIkTSn7x56vBZx1ZNH0FTdpgreL5GHDE0ccIF6oUIagQG9y As5ApMN4f4gkGuM7Vm8u4glNGavKDuRFQxfCeUrSuGGjBZcI4Fx02Rekay1E+sf6JmPzSF OszwvU+lk0bJHndyP7KD8/khMBZt1dKLf4q3ZcXgCUSGXlVnZ7XkND4PY9AhkUD4aNPt20 1WwlOlZcOc0G1Mblmf27xCJRluhByDKlpxNLeYYsSaTIe6a3JJcPPHmtyff87w== 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 281216F57A for ; Wed, 6 Mar 2024 06:47:54 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhk7q-0001xu-TQ; Wed, 06 Mar 2024 00:47: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 1rhk7o-0001xm-DG for guix-patches@gnu.org; Wed, 06 Mar 2024 00:47:32 -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 1rhk7o-0005PM-3Z for guix-patches@gnu.org; Wed, 06 Mar 2024 00:47:32 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhk8I-0008CH-Cd for guix-patches@gnu.org; Wed, 06 Mar 2024 00:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69502] [PATCH] gnu: sdl2: Update to 2.30.0. References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Mar 2024 05:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69502 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: dan Cc: 69502@debbugs.gnu.org Received: via spool by 69502-submit@debbugs.gnu.org id=B69502.170970405731480 (code B ref 69502); Wed, 06 Mar 2024 05:48:02 +0000 Received: (at 69502) by debbugs.gnu.org; 6 Mar 2024 05:47:37 +0000 Received: from localhost ([127.0.0.1]:49441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhk7t-0008Bf-5R for submit@debbugs.gnu.org; Wed, 06 Mar 2024 00:47:37 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:61881) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhk7q-0008BQ-1X for 69502@debbugs.gnu.org; Wed, 06 Mar 2024 00:47:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1709704016; x=1709963216; bh=qvK8U6ssswVORKVg0gLZpywvooymnWHfnYy6LAZN2CA=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=owx90ZuKxSek4ZKCNQljzEYaxsJUh8xroxPZ2e2bwxPvHqn/HBJiX0i/aZKkIUdEJ a9SauoWN75FNHUk50qZri/VbVFTCp0FcSgDv6TvrHrUbP3nG57HyShaTGG1BRWH6rW SbQxewukndv1kTgvmRAXqPS8ESP1gzeN+tE/8oPRyHiNA2+9rCIw/UjrGjrp9SYv2T Q8ypJezGR0xJ5jVN5v73JGgXsB9V18Kn/Ik4DSJ8nIBqmnzZOU9FxDEB2fr6GHbQao RRqTlwEV7JlK517gtnAAQuRg+znKcDP/TzThbPN5T77rrHa69uw1YRoE+f912PqPzD yL6xUKjaRXAZw== Date: Wed, 06 Mar 2024 05:46:51 +0000 Message-ID: <87wmqf7vzt.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -4.91 X-Spam-Score: -4.91 X-Migadu-Queue-Id: 281216F57A X-TUID: VnQIhC+izkpM Hi dan, On Sat, Mar 02, 2024 at 05:06 PM, dan wrote: > * 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(-) > > 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 =C2=A9 2020 Oleg Pykhalov > ;;; Copyright =C2=A9 2022 Maxim Cournoyer > ;;; Copyright =C2=A9 2023 Evgeny Pisemsky > -;;; Copyright =C2=A9 2023 dan > +;;; Copyright =C2=A9 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"))= )) I'm guessing the slight style change is from guix style, which can be fine (here seems okay to me and more typical), but > (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 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") > + #$(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))) > > base-commit: 4a0549be52f3f46fbce61342d8de30f7b83130c5 these last changes all seem superfluous to me, not really improving the style. I don't think guix lint had any issues before, so I think we can drop these more random changes after the source change to reduce noise for this commit. Otherwise LGTM and I can take it on mesa-updates soon (next week when I'm back). Thanks! John