From nobody Tue Oct 25 05:03:23 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MxKZz492Bz4gfGM; Tue, 25 Oct 2022 05:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MxKZz3Rg1z3l8B; Tue, 25 Oct 2022 05:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666674203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szMWi3LMbEvoJfHu8bcfVa9wvwESx5EhbvdYj5RLqac=; b=P5pCrowhc8rZCyuUwAX94wfR6YL0VgtHV3wRi5IhQBGs7hMzPLt5gaRGdYLTy2Gro6WXfd GiobHH2DxdI9AzErYdnHHsblaQ/BIWWL6clWvEXtxPxFA2eOZ9XWxmYoiOuVddHQGP7LU7 9cS09evGkocjRVV51A3jYd+32AV1bm7//L3Z+jGLC8yhGwL8Mqhe26V6LTTCJEvixefjWA ByGMpR3vHcN+Eqa9yfi6vD+qrWvG+LUsvTK6NGHUcNh/iykxl+HdHdlMQ9IdGJ4YjJGNyO M+OieJIIAMuNZmeOsQcJhWCv3Xg0Um6rZZyJuOW+YWjdiAAyK7PFSCXcb8+aEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MxKZz2WcLzTHl; Tue, 25 Oct 2022 05:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29P53NYQ097566; Tue, 25 Oct 2022 05:03:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29P53N9p097565; Tue, 25 Oct 2022 05:03:23 GMT (envelope-from git) Date: Tue, 25 Oct 2022 05:03:23 GMT Message-Id: <202210250503.29P53N9p097565@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kyle Evans Subject: git: 32b4b09f7dbf - main - games/gzdoom: fix runtime against SDL newer than 2.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32b4b09f7dbf1b1e32ffb844a15f7e842e5cda2a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666674203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szMWi3LMbEvoJfHu8bcfVa9wvwESx5EhbvdYj5RLqac=; b=CIbp7ORxHzuXTvFvCwKAbIOkD6Idv+R8qG2xctlX1SXQYMbwkYDjTG2HM3BLE8PjmEljjB JXX4PC6goHvhMdbd5ACfcecEZ2j5Xadgc5e8BJms5R2QMchUO1nDkWab+cG9PdUBlRMYfE f9gRqA7Kj3spHErbJic3oaxdtpu7L1bdsk/dk8hIYxb58fnjhA7Yogh7x4ujS7LLKy1cvE 4la9rlxzdIZ9m88JMc6xPxT1zNkvuEQJCienbrbR0Ty1HpPg95zVb0pks6ScdO+qXsE+AX rji7Wr3N882r0o58gT5lhcHMN4LVdtqm/kGmi01OYVYuod+Cnke6KWFQ8Gj+qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666674203; a=rsa-sha256; cv=none; b=ajL5VG7w8dgwi34R3cENfvzR0kuFzVcOSzq0uPGVUG1+FNOf76wSikolRFeN43yBIFYs5b nnF2n3qoY2Je8yobdxA2ff8HDcpRiaSL7kXK1/RgI0uAx9gr/8hp/8ML+Yso69UYXHyJKI ZAb/uTv+lH1LhYMC4TcrtW8iZz7pJI5swQWLLh2CmEbUVNeNGaxwN0JUZkMLl4m+n0lDaS aF47uFAwMn49GzZITa0Ibivab/OE1RmPrG8p4eYPKeMlSQWexHfzKYJZBYHjFMu/VS48iR SL4l+t3gOx1Ito0eaCoL+a00oxtAYUNJe6lW/NdllbO363bQ0ER3cvpQRyg/WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/ports/commit/?id=32b4b09f7dbf1b1e32ffb844a15f7e842e5cda2a commit 32b4b09f7dbf1b1e32ffb844a15f7e842e5cda2a Author: Kyle Evans AuthorDate: 2022-10-24 22:21:49 +0000 Commit: Kyle Evans CommitDate: 2022-10-25 05:02:40 +0000 games/gzdoom: fix runtime against SDL newer than 2.0 The game was supposed to be restricted to newer versions of SDL than 2.0.6, but they inadvertently only checked the patch number of the current SDL version. The provided patch is pulled from a later version of GZDoom and uses the correct SDL version check macro so that newer versions of SDL don't need to get up to patchlevel=6 to work again. MFH: 2022Q4 --- games/gzdoom/Makefile | 2 +- .../patch-src_common_platform_posix_sdl_sdlglvideo.cpp | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/games/gzdoom/Makefile b/games/gzdoom/Makefile index bd7b23c72993..125329bf8d9e 100644 --- a/games/gzdoom/Makefile +++ b/games/gzdoom/Makefile @@ -1,6 +1,6 @@ PORTNAME= gzdoom PORTVERSION= 4.7.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= g CATEGORIES= games diff --git a/games/gzdoom/files/patch-src_common_platform_posix_sdl_sdlglvideo.cpp b/games/gzdoom/files/patch-src_common_platform_posix_sdl_sdlglvideo.cpp new file mode 100644 index 000000000000..6e001316a22b --- /dev/null +++ b/games/gzdoom/files/patch-src_common_platform_posix_sdl_sdlglvideo.cpp @@ -0,0 +1,13 @@ +--- src/common/platform/posix/sdl/sdlglvideo.cpp.orig 2021-10-20 06:18:37 UTC ++++ src/common/platform/posix/sdl/sdlglvideo.cpp +@@ -396,9 +396,7 @@ SDLVideo::SDLVideo () + } + + // Fail gracefully if we somehow reach here after linking against a SDL2 library older than 2.0.6. +- SDL_version sdlver; +- SDL_GetVersion(&sdlver); +- if (!(sdlver.patch >= 6)) ++ if (!SDL_VERSION_ATLEAST(2, 0, 6)) + { + I_FatalError("Only SDL 2.0.6 or later is supported."); + }