From nobody Tue Oct 25 05:22:44 2022 X-Original-To: dev-commits-ports-branches@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 4MxL1J6N2tz4ghn0; Tue, 25 Oct 2022 05:22:44 +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 4MxL1J5rpwz3mYL; Tue, 25 Oct 2022 05:22:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666675364; 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=Ye2KCku/9blAIMPqQyUJc49iJ7KJYvQse6RLy4pRBSg=; b=ssRW9FpEdGIgoNMsuYfKVomMuLSIC+6cHo51dXK5CAkCFCOT35BSzpeFswcw5ps65OJ5Vq 7kepLlN2iZOvnMk+5NTYSXpftFOsbduFzsS+dUJtNdGNT+UG6MknL7Ifx0jMpK689ZQgxH fTwnunMEZahPLWCh7rp+BqjmnQaUdou05ptQKW79zcs5Xoee+JpGe9V6Ulp8o19vtwPiaB tBNh6ehCQwlJUw4ZCC2vUwl64C9mjIMBmixXu9CBDEYts73RL3q57F6jzkYyF8yYqSe8oQ FD/bh59qZhDA4b0x7bJzBHSZcLydcO3rOy3qr3LXL2LvFWQDbo7sgxy22G8bhQ== 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 4MxL1J4vXlzTm4; Tue, 25 Oct 2022 05:22:44 +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 29P5Milp022678; Tue, 25 Oct 2022 05:22:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29P5MieS022677; Tue, 25 Oct 2022 05:22:44 GMT (envelope-from git) Date: Tue, 25 Oct 2022 05:22:44 GMT Message-Id: <202210250522.29P5MieS022677@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kyle Evans Subject: git: d41a31aa689e - 2022Q4 - games/gzdoom: fix runtime against SDL newer than 2.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q4 X-Git-Reftype: branch X-Git-Commit: d41a31aa689ecd2cbba8ba2416594cb81dc156f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666675364; 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=Ye2KCku/9blAIMPqQyUJc49iJ7KJYvQse6RLy4pRBSg=; b=VS43s05v9FRrNvaj44vWv6CoDPY4h5RujXjcTyFdZTbsmQQmJTEwQJVAJmRCxwZaMLEiLv WPUy4tLY4yHFDKfGcxAVZ9QRNoduj5Jcy+K2CrvdyygAQL9SUGPpSk+lEuIKmX1JMtVQoO fU4zE+3v0MO1SlLXJGNTtlUj4JRfksIM2LJnSjuzRHqzPqmeneIRphrjBTNa+HHUChszUR 5fRcDbxp+B54hzS1xGuggJFxJgHLD4YyMpYjWHSb8g2GlA+f7qCACz43YmZB3BXvvvAdQk Etq4uP7aIqtSgN4hErNf5AoFQHcXiEDxzV8qKcbH/f5H3hyNyuXMN4hNdPXeZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666675364; a=rsa-sha256; cv=none; b=Ej8hZyTcjWf3pFjExXhkVXouH1q0DUjGvBuXd3JmIIus68tm9/zfKQxcx7L63tIlXNtw8L u9wt3azD78VtthXIeJScKh0TJ3Sm1sjOVf1BlUdiRz2S8XdxYA01Ft3CVmjbCmWiy5yGW7 V7anE/x8E2tE3VB8lP302K4t/Ov8cmQ8l7Kpkb7FH22KkM7q78IxNnyLZ5gTXjSWZYRn0V 5tyjcUigJhOrlORs/CDvIAnPI5phSQJtgqtCLol95UPXPbis9h96WqaSAWRelq1hiG3cwX C864X48ffv3u6y4riNTe9nMe7nrzl66S2Gi7bCuR3qQbwAkaKBXk04K0RlOsoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by kevans: URL: https://cgit.FreeBSD.org/ports/commit/?id=d41a31aa689ecd2cbba8ba2416594cb81dc156f5 commit d41a31aa689ecd2cbba8ba2416594cb81dc156f5 Author: Kyle Evans AuthorDate: 2022-10-24 22:21:49 +0000 Commit: Kyle Evans CommitDate: 2022-10-25 05:22:26 +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. (cherry picked from commit 32b4b09f7dbf1b1e32ffb844a15f7e842e5cda2a) --- 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."); + }