Received: by mail.netbsd.org (Postfix, from userid 605) id 8C6A384DA9; Thu, 2 Mar 2023 03:13:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BB80B84F10 for ; Thu, 2 Mar 2023 03:13:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id WjPfdqCIKOb6 for ; Thu, 2 Mar 2023 03:13:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 207DD84D3B for ; Thu, 2 Mar 2023 03:13:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 19FA2FA90; Thu, 2 Mar 2023 03:13:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_167772683436270" MIME-Version: 1.0 Date: Thu, 2 Mar 2023 03:13:54 +0000 From: "Charlotte Koch" Subject: CVS commit: pkgsrc/games/ironwail To: pkgsrc-changes@NetBSD.org Reply-To: charlotte@netbsd.org X-Mailer: log_accum Message-Id: <20230302031354.19FA2FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_167772683436270 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: charlotte Date: Thu Mar 2 03:13:54 UTC 2023 Modified Files: pkgsrc/games/ironwail: distinfo Added Files: pkgsrc/games/ironwail/patches: patch-Quake_main_sdl.c Log Message: games/ironwail: Remove faulty runtime SDL2 detection To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/ironwail/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/games/ironwail/patches/patch-Quake_main_sdl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_167772683436270 Content-Disposition: inline Content-Length: 3104 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/ironwail/distinfo diff -u pkgsrc/games/ironwail/distinfo:1.1 pkgsrc/games/ironwail/distinfo:1.2 --- pkgsrc/games/ironwail/distinfo:1.1 Wed Feb 15 03:26:35 2023 +++ pkgsrc/games/ironwail/distinfo Thu Mar 2 03:13:53 2023 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1 2023/02/15 03:26:35 charlotte Exp $ +$NetBSD: distinfo,v 1.2 2023/03/02 03:13:53 charlotte Exp $ BLAKE2s (ironwail-0.6.0.tar.gz) = 4499d02b4ae3b94d05bef07d17028dba6a139f6d5833acfaeacb73d8ffe7c222 SHA512 (ironwail-0.6.0.tar.gz) = 05d963496259d6acade8314962f6b141b5ccb9e784ca70ace6f8c57cf06f0ae7f57a6a42f57fe55d9e9be3796c669e40ab9917a9abcabaacff1fdf5ea70d2ad8 Size (ironwail-0.6.0.tar.gz) = 5634065 bytes SHA1 (patch-Quake_Makefile) = 894947fba3fbc1f91dff381266f178accce08461 +SHA1 (patch-Quake_main_sdl.c) = ea3e9741d0fcabbaa02d00bc4f7f5be7e74b5f35 Added files: Index: pkgsrc/games/ironwail/patches/patch-Quake_main_sdl.c diff -u /dev/null pkgsrc/games/ironwail/patches/patch-Quake_main_sdl.c:1.1 --- /dev/null Thu Mar 2 03:13:54 2023 +++ pkgsrc/games/ironwail/patches/patch-Quake_main_sdl.c Thu Mar 2 03:13:53 2023 @@ -0,0 +1,55 @@ +$NetBSD: patch-Quake_main_sdl.c,v 1.1 2023/03/02 03:13:53 charlotte Exp $ + +Remove faulty SDL2 version check. + +Original commit from upstream: + +commit 2a67d5bcb236212b0cd8ed7abae9e7089af34ff2 +Author: Ozkan Sezer +Date: Tue May 24 20:55:04 2022 +0300 + + removed SDL version checks at runtime for compatibility with new SDL2: + + With the new SDL2 versioning scheme, SDL_VERSIONNUM macro overflows the + minor version into the thousands digit after 2.9.0, e.g. encodes 2.23.0 + as 4300, and we used to reject that thinking it is SDL v3 or something. + +--- Quake/main_sdl.c.orig 2023-02-27 23:22:39.979960547 -0800 ++++ Quake/main_sdl.c 2023-02-27 23:27:28.947967635 -0800 +@@ -22,20 +22,9 @@ + */ + + #include "quakedef.h" +-#if defined(SDL_FRAMEWORK) || defined(NO_SDL_CONFIG) + #include +-#else +-#include "SDL.h" +-#endif + #include + +-/* need at least SDL_2.0.0 */ +-#define SDL_MIN_X 2 +-#define SDL_MIN_Y 0 +-#define SDL_MIN_Z 0 +-#define SDL_REQUIREDVERSION (SDL_VERSIONNUM(SDL_MIN_X,SDL_MIN_Y,SDL_MIN_Z)) +-#define SDL_NEW_VERSION_REJECT (SDL_VERSIONNUM(3,0,0)) +- + static void Sys_AtExit (void) + { + SDL_Quit(); +@@ -48,15 +37,6 @@ + SDL_GetVersion(&v); + + Sys_Printf("Found SDL version %i.%i.%i\n",sdl_version->major,sdl_version->minor,sdl_version->patch); +- if (SDL_VERSIONNUM(sdl_version->major,sdl_version->minor,sdl_version->patch) < SDL_REQUIREDVERSION) +- { /*reject running under older SDL versions */ +- Sys_Error("You need at least v%d.%d.%d of SDL to run this game.", SDL_MIN_X,SDL_MIN_Y,SDL_MIN_Z); +- } +- if (SDL_VERSIONNUM(sdl_version->major,sdl_version->minor,sdl_version->patch) >= SDL_NEW_VERSION_REJECT) +- { /*reject running under newer (1.3.x) SDL */ +- Sys_Error("Your version of SDL library is incompatible with me.\n" +- "You need a library version in the line of %d.%d.%d\n", SDL_MIN_X,SDL_MIN_Y,SDL_MIN_Z); +- } + + if (SDL_Init(0) < 0) + { --_----------=_167772683436270--