From nobody Mon Feb 06 17:52:50 2023 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 4P9Ykp2wVdz3n094; Mon, 6 Feb 2023 17:52: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 4P9Ykp2QPYz4WXq; Mon, 6 Feb 2023 17:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675705970; 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=CfsCyhT2jfFHm48kitTvbfBeXuqEn62t0x2XlDkV5EE=; b=EWbY1F1KQsKyRohJHq9VdwPdTr5EEJWDvUUqav+1PskmWAWb6O8w81NwTp9xa9I3uwerp7 MECz2VraLrMYFjpwuaw3pQKVADYp+vjZmAVPsQiiM/pXOcvwk028m8aVaYfpJDcNQ+g5He JMShM8D7AUyARHXjpPJnmVn4gXW4yoq87hfzubjxyno8R08FgKG3eHDhy26nq1+wIGhQwD hgYPxkPcwWf60Sw552LxmPn4ARnCxBvoHWm0WQzmm/2i6dAK3cf+BNBMXRk5kQCDOHsO8R CibFgAzeEEs/QG8uDT8pd2fvAsnEBqp5xbUSnaavJ/iZUxBPAsiiXLhBplTCnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675705970; 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=CfsCyhT2jfFHm48kitTvbfBeXuqEn62t0x2XlDkV5EE=; b=bM8XUp+6dwWWzdEm57xOFD1hUG8dUUL7beRwCWzwVJ0bFflOa+zQGQRCEhCzDyjFiUoCM0 FYuazrAQXTrMp+gA2oTO4NnzA/Cks1+PUZEMWuny48lTuzfWKdtZ5BEcLbkRhDjILHkSvs cGaDYWZ0a2JxI2DiE+PxTQ+4om9HiPgo1p1v1aW4UV0mRwHWuWTMeVzXuz6c1t41m8SXxC RGVJ7so71uj4YeRGZSncsKK2tYJgfn0TGQ0XTwTKbuqmMSXRuLqkrAOx6OH4K5y4rxyECL NQTe9IRb0vABUNqkymEXDqRmD9YFdtd3QQ8IDei9F4C2KcL5ZS69c+SuXzAemg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675705970; a=rsa-sha256; cv=none; b=joSAQ/sHkEMuqxYB2oigHLbGV4TVshXUMFS1GGUHY+mC52eEhgA44I/BMGj94Tw8jmcF+O n4dyYmgDpEdTI9E9efYKTt2yAJoVQOVdgwshUktYGL1KgZD/ckTr12a4raRUM+Z19ShAoZ S8Wn0r4PixAn1gQYr/v8OENCup3Bj9JB2TBfTPXq4uq9BY9mWSl+6xTxWeckPoVPW5O6Xc oTAZd61OrRZ79wNW9pfvjIOm3nCyaY8jTx01rN1/A8+l3TQ3gF2RhyUj1bEYZYBeiLSHcg jSnKYRE1m7gQimo1OMskUe01yK5t1PGSDQBOc4HqS1qpe+fQqCOX0uElYYoBYw== 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 4P9Ykp1TNczkMP; Mon, 6 Feb 2023 17:52:50 +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 316HqokT073637; Mon, 6 Feb 2023 17:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316HqoLY073636; Mon, 6 Feb 2023 17:52:50 GMT (envelope-from git) Date: Mon, 6 Feb 2023 17:52:50 GMT Message-Id: <202302061752.316HqoLY073636@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 093b4d49280f - main - =?utf-8?Q?games/pioneer:=20update=2020220203=20=E2=86=92=2020230203?= 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 093b4d49280fd471804c3ae8429364f90bb812f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=093b4d49280fd471804c3ae8429364f90bb812f1 commit 093b4d49280fd471804c3ae8429364f90bb812f1 Author: Dmitry Marakasov AuthorDate: 2023-02-03 15:49:28 +0000 Commit: Dmitry Marakasov CommitDate: 2023-02-06 17:52:42 +0000 games/pioneer: update 20220203 → 20230203 --- games/pioneer/Makefile | 3 +-- games/pioneer/distinfo | 6 ++--- games/pioneer/files/patch-CMakeLists.txt | 12 ++++++++++ games/pioneer/files/patch-buildopts.h.cmakein | 10 +++++++++ games/pioneer/files/patch-src_lua_LuaPushPull.h | 30 +++++++++++++++++++++++++ games/pioneer/files/patch-src_lua_LuaShip.cpp | 11 +++++++++ 6 files changed, 67 insertions(+), 5 deletions(-) diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile index 91f1e891aba7..dadf5b9ba77b 100644 --- a/games/pioneer/Makefile +++ b/games/pioneer/Makefile @@ -1,6 +1,5 @@ PORTNAME= pioneer -DISTVERSION= 20220203 -PORTREVISION= 1 +DISTVERSION= 20230203 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org diff --git a/games/pioneer/distinfo b/games/pioneer/distinfo index 1e6fe981fee5..74a0bd8859d3 100644 --- a/games/pioneer/distinfo +++ b/games/pioneer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644231168 -SHA256 (pioneerspacesim-pioneer-20220203_GH0.tar.gz) = 415b55bab7f011f7244348428e13006fa67a926b9be71f2c4ad24e92cfeb051c -SIZE (pioneerspacesim-pioneer-20220203_GH0.tar.gz) = 427362275 +TIMESTAMP = 1675424098 +SHA256 (pioneerspacesim-pioneer-20230203_GH0.tar.gz) = 80eea94e0f7e4d8e6a0c4629bdfb89201f82aae2f59ee7a1f7a487eeeccf27c7 +SIZE (pioneerspacesim-pioneer-20230203_GH0.tar.gz) = 541032264 diff --git a/games/pioneer/files/patch-CMakeLists.txt b/games/pioneer/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..cb5c75eabff1 --- /dev/null +++ b/games/pioneer/files/patch-CMakeLists.txt @@ -0,0 +1,12 @@ +--- CMakeLists.txt.orig 2023-02-03 14:29:13 UTC ++++ CMakeLists.txt +@@ -71,6 +71,9 @@ if (HAS_FECLEAREXCEPT AND HAS_FEENABLEEXCEPT AND HAS_F + set(HAS_FPE_OPS ON) + endif() + ++include(CheckCXXSourceCompiles) ++check_cxx_source_compiles("#include \nvoid foo(size_t){}; void foo(unsigned int){};int main(){}" SIZE_T_AND_UNSIGNED_INT_ARE_DIFFERENT_TYPES) ++ + if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING + "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." diff --git a/games/pioneer/files/patch-buildopts.h.cmakein b/games/pioneer/files/patch-buildopts.h.cmakein new file mode 100644 index 000000000000..5f8eae1bd327 --- /dev/null +++ b/games/pioneer/files/patch-buildopts.h.cmakein @@ -0,0 +1,10 @@ +--- buildopts.h.cmakein.orig 2023-02-03 08:11:26 UTC ++++ buildopts.h.cmakein +@@ -9,6 +9,7 @@ + #cmakedefine01 WITH_OBJECTVIEWER + #cmakedefine01 WITH_DEVKEYS + #cmakedefine01 HAS_FPE_OPS ++#cmakedefine01 SIZE_T_AND_UNSIGNED_INT_ARE_DIFFERENT_TYPES + #cmakedefine REMOTE_LUA_REPL + + #endif /* BUILDOPTS_H */ diff --git a/games/pioneer/files/patch-src_lua_LuaPushPull.h b/games/pioneer/files/patch-src_lua_LuaPushPull.h new file mode 100644 index 000000000000..6c0c26b13cda --- /dev/null +++ b/games/pioneer/files/patch-src_lua_LuaPushPull.h @@ -0,0 +1,30 @@ +--- src/lua/LuaPushPull.h.orig 2023-02-03 08:11:26 UTC ++++ src/lua/LuaPushPull.h +@@ -5,6 +5,7 @@ + #define _LUAPUSHPULL_H + + #include "Lua.h" ++#include "buildopts.h" + #include + + #include +@@ -15,7 +16,9 @@ inline void pi_lua_generic_push(lua_State *l, bool val + inline void pi_lua_generic_push(lua_State *l, int value) { lua_pushinteger(l, value); } + inline void pi_lua_generic_push(lua_State *l, int64_t value) { lua_pushinteger(l, value); } + inline void pi_lua_generic_push(lua_State *l, unsigned int value) { lua_pushinteger(l, value); } ++#if SIZE_T_AND_UNSIGNED_INT_ARE_DIFFERENT_TYPES + inline void pi_lua_generic_push(lua_State *l, size_t value) { lua_pushinteger(l, value); } ++#endif + inline void pi_lua_generic_push(lua_State *l, double value) { lua_pushnumber(l, value); } + inline void pi_lua_generic_push(lua_State *l, const char *value) { lua_pushstring(l, value); } + inline void pi_lua_generic_push(lua_State *l, const std::string &value) +@@ -32,7 +35,9 @@ inline void pi_lua_generic_pull(lua_State *l, int inde + inline void pi_lua_generic_pull(lua_State *l, int index, int &out) { out = luaL_checkinteger(l, index); } + inline void pi_lua_generic_pull(lua_State *l, int index, int64_t &out) { out = luaL_checkinteger(l, index); } + inline void pi_lua_generic_pull(lua_State *l, int index, unsigned int &out) { out = luaL_checkunsigned(l, index); } ++#if SIZE_T_AND_UNSIGNED_INT_ARE_DIFFERENT_TYPES + inline void pi_lua_generic_pull(lua_State *l, int index, size_t &out) { out = luaL_checkunsigned(l, index); } ++#endif + inline void pi_lua_generic_pull(lua_State *l, int index, float &out) { out = luaL_checknumber(l, index); } + inline void pi_lua_generic_pull(lua_State *l, int index, double &out) { out = luaL_checknumber(l, index); } + inline void pi_lua_generic_pull(lua_State *l, int index, const char *&out) { out = luaL_checkstring(l, index); } diff --git a/games/pioneer/files/patch-src_lua_LuaShip.cpp b/games/pioneer/files/patch-src_lua_LuaShip.cpp new file mode 100644 index 000000000000..2bde51af87ba --- /dev/null +++ b/games/pioneer/files/patch-src_lua_LuaShip.cpp @@ -0,0 +1,11 @@ +--- src/lua/LuaShip.cpp.orig 2023-02-03 08:11:26 UTC ++++ src/lua/LuaShip.cpp +@@ -19,7 +19,7 @@ + #include "SpaceStation.h" + #include "ship/PlayerShipController.h" + #include "ship/PrecalcPath.h" +-#include "src/lua.h" ++#include "lua.h" + + /* + * Class: Ship