diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-22 07:31:18 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-22 07:31:18 +0100 |
commit | 908778078736bd36f7a60a2d576d415cb8e000fa (patch) | |
tree | c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /games-action/minetest/files | |
parent | 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff) |
gentoo resync : 22.05.2021
Diffstat (limited to 'games-action/minetest/files')
6 files changed, 94 insertions, 4 deletions
diff --git a/games-action/minetest/files/minetest-5.4.1-gcc11.patch b/games-action/minetest/files/minetest-5.4.1-gcc11.patch new file mode 100644 index 000000000000..bb37cdf31e07 --- /dev/null +++ b/games-action/minetest/files/minetest-5.4.1-gcc11.patch @@ -0,0 +1,21 @@ +From 7c2826cbc0f36027d4a9781f433150d1c5d0d03f Mon Sep 17 00:00:00 2001 +From: lhofhansl <larsh@apache.org> +Date: Thu, 6 May 2021 10:24:30 -0700 +Subject: [PATCH] Fix build for newer versions of GCC (#11246) + +--- + src/clientiface.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/clientiface.h b/src/clientiface.h +index cc5292b71bf9..dfd97674137c 100644 +--- a/src/clientiface.h ++++ b/src/clientiface.h +@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., + #include <list> + #include <vector> + #include <set> ++#include <memory> + #include <mutex> + + class MapBlock; diff --git a/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch b/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch new file mode 100644 index 000000000000..7f49b427e8ee --- /dev/null +++ b/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch @@ -0,0 +1,39 @@ +Upstream build scripts use either system LuaJIT or bundled PUC Lua 5.1. +Make it possible to use the system version of the latter too. + +--- a/cmake/Modules/FindLua.cmake ++++ b/cmake/Modules/FindLua.cmake +@@ -2,27 +2,12 @@ + # This selects LuaJIT by default + + option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE) +-set(USE_LUAJIT FALSE) +-option(REQUIRE_LUAJIT "Require LuaJIT support" FALSE) +-if(REQUIRE_LUAJIT) +- set(ENABLE_LUAJIT TRUE) +-endif() + if(ENABLE_LUAJIT) +- find_package(LuaJIT) +- if(LUAJIT_FOUND) +- set(USE_LUAJIT TRUE) +- message (STATUS "Using LuaJIT provided by system.") +- elseif(REQUIRE_LUAJIT) +- message(FATAL_ERROR "LuaJIT not found whereas REQUIRE_LUAJIT=\"TRUE\" is used.\n" +- "To continue, either install LuaJIT or do not use REQUIRE_LUAJIT=\"TRUE\".") +- endif() ++ find_package(LuaJIT REQUIRED) ++ set(USE_LUAJIT TRUE) ++ message (STATUS "Using LuaJIT provided by system.") + else() +- message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)") +-endif() +- +-if(NOT USE_LUAJIT) +- message(STATUS "LuaJIT not found, using bundled Lua.") +- set(LUA_LIBRARY lua) +- set(LUA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/lua/src) +- add_subdirectory(lib/lua) ++ find_package(Lua51 REQUIRED) ++ set(USE_LUAJIT FALSE) ++ message(STATUS "Using Lua5.1 provided by system.") + endif() diff --git a/games-action/minetest/files/minetestserver.confd b/games-action/minetest/files/minetestserver.confd index 7a6f9b12ff01..b383fbd3e33b 100644 --- a/games-action/minetest/files/minetestserver.confd +++ b/games-action/minetest/files/minetestserver.confd @@ -4,13 +4,13 @@ USER="minetest" # group -GROUP="@GROUP@" +GROUP="minetest" # pidfile -PIDFILE="/var/run/minetest.pid" +PIDFILE="/run/minetest.pid" # executable -MINETESTBIN="@BINDIR@/minetestserver" +MINETESTBIN="/usr/bin/minetestserver" # additional arguments for the server ARGS="--logfile /var/log/minetest/minetest-server.log" diff --git a/games-action/minetest/files/minetestserver.logrotate b/games-action/minetest/files/minetestserver.logrotate index 0ec4823663aa..2e38adfc5f50 100644 --- a/games-action/minetest/files/minetestserver.logrotate +++ b/games-action/minetest/files/minetestserver.logrotate @@ -1,4 +1,4 @@ -/var/log/minetest/minetest-server.log { +/var/log/minetest/*.log { rotate 5 weekly missingok diff --git a/games-action/minetest/files/minetestserver_default.service b/games-action/minetest/files/minetestserver_default.service new file mode 100644 index 000000000000..e2754abaaf12 --- /dev/null +++ b/games-action/minetest/files/minetestserver_default.service @@ -0,0 +1,15 @@ +[Unit] +Description=Minetest multiplayer server (server config minetest.conf) +Documentation=man:minetestserver(6) +After=network.target + +[Service] +Restart=on-failure +User=minetest +Group=minetest +ExecStart=/usr/bin/minetestserver --config /etc/minetest/minetest.conf --logfile /var/log/minetest/minetest-server.log +StandardOutput=null + +[Install] +WantedBy=multi-user.target + diff --git a/games-action/minetest/files/minetestserver_template.service b/games-action/minetest/files/minetestserver_template.service new file mode 100644 index 000000000000..a945de53e870 --- /dev/null +++ b/games-action/minetest/files/minetestserver_template.service @@ -0,0 +1,15 @@ +[Unit] +Description=Minetest multiplayer server (server config %i.conf) +Documentation=man:minetestserver(6) +After=network.target + +[Service] +Restart=on-failure +User=minetest +Group=minetest +ExecStart=/usr/bin/minetestserver --config /etc/minetest/%i.conf --logfile /var/log/minetest/%i-server.log +StandardOutput=null + +[Install] +WantedBy=multi-user.target + |