From nobody Mon Jun 26 02:31:49 2023 X-Original-To: dev-commits-ports-main@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 4QqBgV1DMDz4jMQq; Mon, 26 Jun 2023 02:31:50 +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 4QqBgV0pRjz3sFs; Mon, 26 Jun 2023 02:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687746710; 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=8qQw6N5aCRogoyCGcB5DREmfzcXmasLb3/sfW8P0SYA=; b=y0Vfl3NJ72XPY1j62Z7noBJH2RfFYsZCIfTWCa6ZjBCHyYJerCWsPDO7clg7EYdOKFjxCH D6V9HCL0Ghed22GbUHAIy4wJ7cnpI8pV8uJFelDSXyxXUhOhBZeQf+pDC0PR3wBzMsjbuN wnSa5lvLRQK+b4fpwv1FWHXbzOyLOXj1Jf8/dE2c+BXMWgPgtspzvlMb1ATcaaOnWABLQ2 22u9cBDmBPJ5tqdjnHTBLnXJIygkI+mql0ClJd8bJo2KQJU6GhAFvNrjBj934+mDiaw3r/ 8zzeDuNp/xvnk+gh+gkKu+3kOGY0rMDmG5727o8D6lV6XDo/lsoPR8ak8XfUTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687746710; 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=8qQw6N5aCRogoyCGcB5DREmfzcXmasLb3/sfW8P0SYA=; b=Ax+pXaYZr3jfM63NWhA44jg/HXMrI8q/ZWUV0Lym+uMhlFn9IYzUKvs32e1ioROwoRblOz Sp1tFEafB6uGULqKKv9NTrOeVTpQIyLeBr1P5cHtXRexPVwSMG8DwgnfOEI63zkrab1nEz AJ6iaZewYFbpOWoXB0PYt92EfpzCpeSce9+4/mrVxlpraQGHItakAmQyVGOLCVxyHc7WIR wRwyQE2QOhqClEBhVXuR7mWgbOwuoCnUjeiN6jIsQXnJDBab+JamNyT8s8Gr5hpbkwKXkA pWwusa1M94cKzQVYk20rxdi4XOuBGCYVY55PSQeTHCf61rX1qFHATTEoya6ISQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687746710; a=rsa-sha256; cv=none; b=VOiTls7DUQOqGt9oGHS6GnTKo7xqzkWBHlxT8DBBCEGWejpSBtNG71ughlmk4wcWv9WLrV D+7Ru/K1M1dftPqry79e2HLmAYVG2kDvQqr6KJ7qFdV/Iaytbnsq/hQ8IPiGOYr+Nq0TBw GLZBnV5rZWyCLmwXmkRNZeZafw4+S7WtpeWSCLmdeij2u7dFV24wWGyD71VtndR/TKmEy+ wQS5hvkrG53CEcStD+QWIgDyocTx34K0FrxRCLS4EtDvvnkrLRd/ESycGKBj1uYMgwcsXo GUm6C98N2dIlfLnuBDz/+v0igLPgwIPkRwwn3eqwofaiQ+/f79X3LGe2QVHxdA== 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 4QqBgT6y8pzs6L; Mon, 26 Jun 2023 02:31:49 +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 35Q2VnZg032304; Mon, 26 Jun 2023 02:31:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35Q2Vnkk032303; Mon, 26 Jun 2023 02:31:49 GMT (envelope-from git) Date: Mon, 26 Jun 2023 02:31:49 GMT Message-Id: <202306260231.35Q2Vnkk032303@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: 10aecf3b195e - main - games/zdoom: fix the build with llvm16 in base List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 10aecf3b195e51a5ee140d4dac8b28ae6cf3198a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/ports/commit/?id=10aecf3b195e51a5ee140d4dac8b28ae6cf3198a commit 10aecf3b195e51a5ee140d4dac8b28ae6cf3198a Author: Kyle Evans AuthorDate: 2023-06-26 02:28:07 +0000 Commit: Kyle Evans CommitDate: 2023-06-26 02:28:44 +0000 games/zdoom: fix the build with llvm16 in base The 'register' keyword now raises an error, so patch out those parts. Patch generally taken from gzdoom commit 3c044ebd5eae343. No functional change as a result of this. --- games/zdoom/files/patch-src_am__map.cpp | 15 +++++++++++++++ games/zdoom/files/patch-src_md5.cpp | 11 +++++++++++ games/zdoom/files/patch-src_p__spec.cpp | 18 ++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/games/zdoom/files/patch-src_am__map.cpp b/games/zdoom/files/patch-src_am__map.cpp new file mode 100644 index 000000000000..fe4a67031a35 --- /dev/null +++ b/games/zdoom/files/patch-src_am__map.cpp @@ -0,0 +1,15 @@ +--- src/am_map.cpp.orig 2016-02-22 02:11:13 UTC ++++ src/am_map.cpp +@@ -1692,9 +1692,9 @@ bool AM_clipMline (mline_t *ml, fline_t *fl) + TOP =8 + }; + +- register int outcode1 = 0; +- register int outcode2 = 0; +- register int outside; ++ int outcode1 = 0; ++ int outcode2 = 0; ++ int outside; + + fpoint_t tmp = { 0, 0 }; + int dx; diff --git a/games/zdoom/files/patch-src_md5.cpp b/games/zdoom/files/patch-src_md5.cpp new file mode 100644 index 000000000000..e25f2660b9ca --- /dev/null +++ b/games/zdoom/files/patch-src_md5.cpp @@ -0,0 +1,11 @@ +--- src/md5.cpp.orig 2016-02-22 02:11:13 UTC ++++ src/md5.cpp +@@ -166,7 +166,7 @@ MD5Transform(DWORD buf[4], const DWORD in[16]) + void + MD5Transform(DWORD buf[4], const DWORD in[16]) + { +- register DWORD a, b, c, d; ++ DWORD a, b, c, d; + + a = buf[0]; + b = buf[1]; diff --git a/games/zdoom/files/patch-src_p__spec.cpp b/games/zdoom/files/patch-src_p__spec.cpp index d2d1d93d7e48..2dcc9ac98429 100644 --- a/games/zdoom/files/patch-src_p__spec.cpp +++ b/games/zdoom/files/patch-src_p__spec.cpp @@ -9,3 +9,21 @@ { { 0, 1 }, { 0, 2 }, { 0, 4 }, { -1, 0 }, { -2, 0 }, { -4, 0 }, +@@ -1826,7 +1826,7 @@ static void P_SpawnScrollers(void) + + switch (special) + { +- register int s; ++ int s; + + case Scroll_Ceiling: + { +@@ -2357,7 +2357,7 @@ static void P_SpawnPushers () + { + int i; + line_t *l = lines; +- register int s; ++ int s; + + for (i = 0; i < numlines; i++, l++) + {