* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/files/, games-action/minetest/
@ 2020-02-22 22:10 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2020-02-22 22:10 UTC (permalink / raw
To: gentoo-commits
commit: 6051083a35f39976b4200bdb69f0c6c0d38ea1b3
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 22 22:09:03 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 22:09:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6051083a
games-action/minetest: Drop old 5.1.0-r1
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-action/minetest/Manifest | 1 -
games-action/minetest/files/5.1.0-FindJson.patch | 31 -----
games-action/minetest/minetest-5.1.0-r1.ebuild | 140 -----------------------
3 files changed, 172 deletions(-)
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 32bddbc98b7..c808144d7b0 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,2 +1 @@
-DIST minetest-5.1.0.tar.gz 8939376 BLAKE2B 5c56bd74a573632636937c5e5a45eb864ec627962b73573a763be7326c2a3fa95ad87683d655725b29d29d91270812beef33c21b3eb100627f21befeb2dbfac5 SHA512 f2cad4720c1003536cc3c619c18234a95cae1dee8fb54b46a2ef5fd24108a4c945efcb0a461926ef3ede7b8bec41ed6620806212fe11f4142bbf31fe4f0f659e
DIST minetest-5.1.1.tar.gz 9002025 BLAKE2B 8258850a0f45125a09e0a4cf5eda7a8860be4f0a5e564767952e27fc8509593bf0615c1457a0ee168f6eeedcf1065e288b787d74e1d0a2180870bc1bae818bfc SHA512 4a36a86a3e5f8f5246ff3410e9ab182631f38292bea077e7dbc25fdc1520e5a479ffbd5ec447000fb4999ab252a59bf976299e6fecda1f8cd47f40549885766b
diff --git a/games-action/minetest/files/5.1.0-FindJson.patch b/games-action/minetest/files/5.1.0-FindJson.patch
deleted file mode 100644
index 3d48b0a0924..00000000000
--- a/games-action/minetest/files/5.1.0-FindJson.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 706b6aad06a112f55105f08b6acd130b276a06ca Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Sat, 16 Nov 2019 13:14:24 -0500
-Subject: [PATCH] Fix find_path for newer jsoncpp installations
-
-The upstream JsonCpp project has renamed the `json/features.h` file to
-`json/json_features.h`. This patch fixes the JsonCpp installation search
-by looking for `json/allocator.h` which has not been renamed on newer
-versions of JsonCpp.
-
-Fixes: https://github.com/minetest/minetest/issues/9119
----
- cmake/Modules/FindJson.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake
-index 26339a29..53ddf459 100644
---- a/cmake/Modules/FindJson.cmake
-+++ b/cmake/Modules/FindJson.cmake
-@@ -8,7 +8,7 @@ option(ENABLE_SYSTEM_JSONCPP "Enable using a system-wide JSONCPP. May cause seg
-
- if(ENABLE_SYSTEM_JSONCPP)
- find_library(JSON_LIBRARY NAMES jsoncpp)
-- find_path(JSON_INCLUDE_DIR json/features.h PATH_SUFFIXES jsoncpp)
-+ find_path(JSON_INCLUDE_DIR json/allocator.h PATH_SUFFIXES jsoncpp)
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(JSONCPP DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR)
---
-2.24.0
-
diff --git a/games-action/minetest/minetest-5.1.0-r1.ebuild b/games-action/minetest/minetest-5.1.0-r1.ebuild
deleted file mode 100644
index 018526a2e71..00000000000
--- a/games-action/minetest/minetest-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
-HOMEPAGE="https://www.minetest.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client +curl doc +leveldb ncurses nls postgres redis +server +sound spatial +truetype"
-REQUIRED_USE="|| ( client server )"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-games/irrlicht
- dev-lang/luajit:2
- dev-libs/gmp:0=
- dev-libs/jsoncpp:=
- sys-libs/zlib
- client? (
- app-arch/bzip2
- media-libs/libpng:0=
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXxf86vm
- sound? (
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- )
- truetype? ( media-libs/freetype:2 )
- )
- curl? ( net-misc/curl )
- leveldb? ( dev-libs/leveldb:= )
- ncurses? ( sys-libs/ncurses:0= )
- nls? ( virtual/libintl )
- postgres? ( >=dev-db/postgresql-9.5:= )
- redis? ( dev-libs/hiredis:= )
- server? (
- acct-group/minetest
- acct-user/minetest
- )
- spatial? ( sci-libs/libspatialindex:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
- nls? ( sys-devel/gettext )"
-
-PATCHES="${FILESDIR}/${PV}-FindJson.patch"
-
-src_prepare() {
- cmake_src_prepare
- # set paths
- sed \
- -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
- -e "s#@GROUP@#${PN}#g" \
- "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-
- # remove bundled libraries
- rm -rf lib || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CLIENT=$(usex client)
- -DBUILD_SERVER=$(usex server)
- -DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
- -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
- -DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
- -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
- -DENABLE_CURL=$(usex curl)
- -DENABLE_CURSES=$(usex ncurses)
- -DENABLE_FREETYPE=$(usex truetype)
- -DENABLE_GETTEXT=$(usex nls)
- -DENABLE_GLES=0
- -DENABLE_LEVELDB=$(usex leveldb)
- -DENABLE_LUAJIT=1
- -DENABLE_POSTGRESQL=$(usex postgres)
- -DENABLE_REDIS=$(usex redis)
- -DENABLE_SPATIAL=$(usex spatial)
- -DENABLE_SOUND=$(usex sound)
- -DENABLE_SYSTEM_GMP=1
- -DENABLE_SYSTEM_JSONCPP=1
- -DRUN_IN_PLACE=0
- )
-
- use server && mycmakeargs+=(
- -DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc ; then
- cmake_src_compile doc
- HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
- fi
-}
-
-src_install() {
- cmake_src_install
-
- if use server ; then
- keepdir /var/log/minetest
- fowners minetest:minetest /var/log/minetest
-
- newconfd "${T}"/minetestserver.confd minetest-server
- newinitd "${FILESDIR}"/minetestserver.initd minetest-server
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if use server ; then
- elog
- elog "Configure your server via /etc/conf.d/minetest-server"
- elog
- fi
-
- elog
- elog "The version 5.x series is not compatible to the version 0.4 series."
- elog "This applies to clients and servers, other content such as mods,"
- elog "texture packs and worlds is unaffected and backwards-compatible"
- elog "as usual."
- elog
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/files/, games-action/minetest/
@ 2020-06-24 14:29 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-06-24 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 1ffce436ef2bfa2d7eba140f72b4d9e0c70a8e75
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Mon May 25 19:26:05 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 14:29:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ffce436
games-action/minetest: Add logrotate configuration file
Closes: https://bugs.gentoo.org/725122
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15969
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
games-action/minetest/files/minetestserver.logrotate | 5 +++++
games-action/minetest/minetest-5.2.0.ebuild | 3 +++
2 files changed, 8 insertions(+)
diff --git a/games-action/minetest/files/minetestserver.logrotate b/games-action/minetest/files/minetestserver.logrotate
new file mode 100644
index 00000000000..87917034945
--- /dev/null
+++ b/games-action/minetest/files/minetestserver.logrotate
@@ -0,0 +1,5 @@
+/var/log/minetest/minetest-server.log {
+ rotate 5
+ weekly
+ copytruncate
+}
diff --git a/games-action/minetest/minetest-5.2.0.ebuild b/games-action/minetest/minetest-5.2.0.ebuild
index 73950475263..9f99e55d2d4 100644
--- a/games-action/minetest/minetest-5.2.0.ebuild
+++ b/games-action/minetest/minetest-5.2.0.ebuild
@@ -114,6 +114,9 @@ src_install() {
newconfd "${T}"/minetestserver.confd minetest-server
newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/minetestserver.logrotate minetest-server
fi
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/files/, games-action/minetest/
@ 2021-05-12 12:40 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2021-05-12 12:40 UTC (permalink / raw
To: gentoo-commits
commit: c6d606c90397919c91e51daf3f0f0557727f1271
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed May 12 12:22:58 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed May 12 12:40:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d606c9
games-action/minetest: support lua5-1 target
Minetest *does* support PUC Lua 5.1, it's just that upstream build
scripts only account for using the bundled sources. Patch the upstream
FindLua.cmake so that unless LuaJIT support is requested, the system
version of PUC Lua is used.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/minetest-5.4.1-system_puc_lua.patch | 39 ++++++++++++++++++++++
games-action/minetest/minetest-5.4.1.ebuild | 8 +++--
2 files changed, 45 insertions(+), 2 deletions(-)
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 00000000000..7f49b427e8e
--- /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/minetest-5.4.1.ebuild b/games-action/minetest/minetest-5.4.1.ebuild
index 6304747349e..453757efe39 100644
--- a/games-action/minetest/minetest-5.4.1.ebuild
+++ b/games-action/minetest/minetest-5.4.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( luajit )
+LUA_COMPAT=( lua5-1 luajit )
inherit cmake lua-single xdg
@@ -62,6 +62,10 @@ BDEPEND="
)
nls? ( sys-devel/gettext )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch
+)
+
src_prepare() {
cmake_src_prepare
@@ -91,7 +95,7 @@ src_configure() {
-DENABLE_GETTEXT=$(usex nls)
-DENABLE_GLES=0
-DENABLE_LEVELDB=$(usex leveldb)
- -DENABLE_LUAJIT=1
+ -DENABLE_LUAJIT=$(usex lua_single_target_luajit)
-DENABLE_POSTGRESQL=$(usex postgres)
-DENABLE_PROMETHEUS=$(usex prometheus)
-DENABLE_REDIS=$(usex redis)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/files/, games-action/minetest/
@ 2021-05-13 15:33 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2021-05-13 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 28122e85fb3f6261a96d82ebbfb2ab917a564858
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 15:26:48 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu May 13 15:33:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28122e85
games-action/minetest: allow building with gcc-11
Backported upstream commit, should only be necessary
until the next release.
Closes: https://bugs.gentoo.org/789474
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../minetest/files/minetest-5.4.1-gcc11.patch | 21 +++++++++++++++++++++
games-action/minetest/minetest-5.4.1-r1.ebuild | 1 +
2 files changed, 22 insertions(+)
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 00000000000..bb37cdf31e0
--- /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/minetest-5.4.1-r1.ebuild b/games-action/minetest/minetest-5.4.1-r1.ebuild
index dfd64db5a93..401043e9775 100644
--- a/games-action/minetest/minetest-5.4.1-r1.ebuild
+++ b/games-action/minetest/minetest-5.4.1-r1.ebuild
@@ -63,6 +63,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
PATCHES=(
+ "${FILESDIR}"/${PN}-5.4.1-gcc11.patch
"${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/files/, games-action/minetest/
@ 2022-09-07 9:08 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2022-09-07 9:08 UTC (permalink / raw
To: gentoo-commits
commit: 44c4388090c24c1878564cbb29f735f5c126ce81
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 7 09:04:53 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Sep 7 09:08:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c43880
games-action/minetest: suppress upstream optimisation flags
Upstream build scripts add -O3 -funroll-loops -fomit-frame-pointers to
CXXFLAGS, and since they are appended rather than prepended they may
override optimisation flags set by the user.
Closes: https://bugs.gentoo.org/868540
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/minetest-5.6.0-no_upstream_optflags.patch | 15 +++++++++++++++
.../{minetest-5.6.0.ebuild => minetest-5.6.0-r1.ebuild} | 2 ++
2 files changed, 17 insertions(+)
diff --git a/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch b/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch
new file mode 100644
index 000000000000..68d71679924b
--- /dev/null
+++ b/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch
@@ -0,0 +1,15 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -756,11 +756,10 @@
+ endif()
+ endif()
+
+- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS} -pipe -funroll-loops")
++ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS}")
+ if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
+ else()
+- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fomit-frame-pointer")
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux"
+ AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
+ AND CMAKE_CXX_COMPILER_VERSION MATCHES "^9\\.")
diff --git a/games-action/minetest/minetest-5.6.0.ebuild b/games-action/minetest/minetest-5.6.0-r1.ebuild
similarity index 97%
rename from games-action/minetest/minetest-5.6.0.ebuild
rename to games-action/minetest/minetest-5.6.0-r1.ebuild
index 586774932b7f..6d626a4d0046 100644
--- a/games-action/minetest/minetest-5.6.0.ebuild
+++ b/games-action/minetest/minetest-5.6.0-r1.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+CMAKE_BUILD_TYPE="Release"
LUA_COMPAT=( lua5-1 luajit )
inherit cmake flag-o-matic lua-single systemd xdg
@@ -64,6 +65,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch
+ "${FILESDIR}"/${PN}-5.6.0-no_upstream_optflags.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/files/, games-action/minetest/
@ 2023-04-10 10:27 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2023-04-10 10:27 UTC (permalink / raw
To: gentoo-commits
commit: 7d03b2bfe44e7f5974b056a162d839e6e6f7694a
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 10:20:49 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 10:27:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d03b2bf
games-action/minetest: drop 5.6.1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
games-action/minetest/Manifest | 1 -
.../files/minetest-5.4.1-system_puc_lua.patch | 39 ------
.../minetest-5.6.0-no_upstream_optflags.patch | 15 ---
games-action/minetest/minetest-5.6.1.ebuild | 144 ---------------------
4 files changed, 199 deletions(-)
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 1e0795095a0c..59134e017841 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,2 +1 @@
-DIST minetest-5.6.1.tar.gz 9924663 BLAKE2B 509b8073a4e82ecff008f692ebdd7a8f35ff5222ba1095937d24870404cca848b80891887837e03d86c117568f9bbee1f92fb958640e06107230673e79d7f813 SHA512 15d2ce3b1150f077ff933a04f0ba8e02c71ee60a0edb636d1511d4e90244a34a14d7e5c4b47bee4de96cd179249a5a6963d7a092084f46c0fa54c9ff431a5265
DIST minetest-5.7.0.tar.gz 10115973 BLAKE2B 0f7e8864188004d57115c83508706b1cf1d6db0cba1a3002d603d4665e6d014ea2ec31df0a77a65da014467e21c331e3a27762018483a5bf4b2e024e3f7bdfc3 SHA512 6a934db5fd2c7c14fcfa87fb306662fa1ccf20a0eee056aea5c4c863986875017a4fa58ddf14319d385ee0400d00fb6a90f68b8f34527c98a746c6410360a529
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
deleted file mode 100644
index 7f49b427e8ee..000000000000
--- a/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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/minetest-5.6.0-no_upstream_optflags.patch b/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch
deleted file mode 100644
index 68d71679924b..000000000000
--- a/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -756,11 +756,10 @@
- endif()
- endif()
-
-- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS} -pipe -funroll-loops")
-+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS}")
- if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
- else()
-- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fomit-frame-pointer")
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux"
- AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
- AND CMAKE_CXX_COMPILER_VERSION MATCHES "^9\\.")
diff --git a/games-action/minetest/minetest-5.6.1.ebuild b/games-action/minetest/minetest-5.6.1.ebuild
deleted file mode 100644
index 12b9726f46c3..000000000000
--- a/games-action/minetest/minetest-5.6.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LUA_COMPAT=( lua5-1 luajit )
-
-inherit cmake flag-o-matic lua-single systemd xdg
-
-DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
-HOMEPAGE="https://www.minetest.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial test"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
- || ( client server )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}
- $(lua_gen_impl_dep 'deprecated' lua5-1)
- app-arch/zstd
- dev-db/sqlite:3
- dev-libs/gmp:0=
- dev-libs/jsoncpp:=
- sys-libs/zlib
- client? (
- >=dev-games/irrlicht-mt-1.9.0.8
- media-libs/freetype:2
- media-libs/libpng:0=
- media-libs/libjpeg-turbo
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXxf86vm
- sound? (
- media-libs/libvorbis
- media-libs/openal
- )
- )
- curl? ( net-misc/curl )
- leveldb? ( dev-libs/leveldb:= )
- ncurses? ( sys-libs/ncurses:0= )
- nls? ( virtual/libintl )
- postgres? ( >=dev-db/postgresql-9.5:= )
- prometheus? ( dev-cpp/prometheus-cpp )
- redis? ( dev-libs/hiredis:= )
- server? (
- acct-group/minetest
- acct-user/minetest
- >=dev-games/irrlicht-mt-headers-1.9.0.8
- )
- spatial? ( sci-libs/libspatialindex:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch
- "${FILESDIR}"/${PN}-5.6.0-no_upstream_optflags.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # remove bundled libraries other than bitop
- rm -rf lib/{gmp,jsoncpp,lua} || die
-
- # To avoid TEXTRELs on riscv
- append-flags -fPIC
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CLIENT=$(usex client)
- -DBUILD_SERVER=$(usex server)
- -DBUILD_UNITTESTS=$(usex test)
- -DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
- -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
- -DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
- -DCUSTOM_MANDIR="${EPREFIX}/usr/share/man"
- -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
- -DENABLE_CURL=$(usex curl)
- -DENABLE_CURSES=$(usex ncurses)
- -DENABLE_GETTEXT=$(usex nls)
- -DENABLE_GLES=no
- -DENABLE_LEVELDB=$(usex leveldb)
- -DENABLE_LUAJIT=$(usex lua_single_target_luajit)
- -DENABLE_POSTGRESQL=$(usex postgres)
- -DENABLE_PROMETHEUS=$(usex prometheus)
- -DENABLE_REDIS=$(usex redis)
- -DENABLE_SPATIAL=$(usex spatial)
- -DENABLE_SOUND=$(usex sound)
- -DENABLE_SYSTEM_GMP=1
- -DENABLE_SYSTEM_JSONCPP=1
- -DRUN_IN_PLACE=0
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc; then
- cmake_src_compile doc
- HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
- fi
-}
-
-src_install() {
- cmake_src_install
-
- if use server; then
- keepdir /etc/minetest
- fowners root:minetest /etc/minetest
- fperms 2750 /etc/minetest
-
- keepdir /var/log/minetest
- fowners minetest:minetest /var/log/minetest
-
- newconfd "${FILESDIR}"/minetestserver.confd minetest-server
- newinitd "${FILESDIR}"/minetestserver.initd minetest-server
-
- systemd_newunit "${FILESDIR}"/minetestserver_default.service minetest-server.service
- systemd_newunit "${FILESDIR}"/minetestserver_template.service minetest-server@.service
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/minetestserver.logrotate minetest-server
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-10 10:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-12 12:40 [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/files/, games-action/minetest/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2023-04-10 10:27 Marek Szuba
2022-09-07 9:08 Marek Szuba
2021-05-13 15:33 Marek Szuba
2020-06-24 14:29 Joonas Niilola
2020-02-22 22:10 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox