Minetest removed from the overlay.
This commit is contained in:
parent
96b417f0e1
commit
a16a100286
|
|
@ -1 +0,0 @@
|
|||
DIST minetest-0.4.10.tar.gz 5291236 SHA256 05d15c8e2c8e53ee9d3006e79c2b59200311a7b879220d8b6f6a6fd2acf806b6 SHA512 0d2f2590df530df9bed11a08a3e67dfa39dae1987b8c1f6a4f4f2ace2c40dea3b5afce445e3b2e17b2bd8a426bdd53d717989018f5da531b1eb10965d953c3bf WHIRLPOOL 016c2bc6f9aed44943f238491c445f48013f76a74f9c09e56c1e70e03fa3ded72b042b9dffa0bed81a9dcdc84358a9be88bbf32119dd45a1e2a9873031be1009
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd
|
||||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Mon Nov 25 00:28:55 2013 +0100
|
||||
|
||||
CMAKE: fix linking order
|
||||
|
||||
this also fixes linking with as-needed wrt
|
||||
https://github.com/minetest/minetest/issues/617
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index a1fee7a..a72bd4a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -427,18 +427,18 @@ if(BUILD_CLIENT)
|
||||
set(minetest_LIBS
|
||||
${PROJECT_NAME}
|
||||
${ZLIB_LIBRARIES}
|
||||
- ${IRRLICHT_LIBRARY}
|
||||
+ ${X11_LIBRARIES}
|
||||
${OPENGL_LIBRARIES}
|
||||
+ ${OPENGLES2_LIBRARIES}
|
||||
${JPEG_LIBRARIES}
|
||||
${BZIP2_LIBRARIES}
|
||||
${PNG_LIBRARIES}
|
||||
- ${X11_LIBRARIES}
|
||||
+ ${IRRLICHT_LIBRARY}
|
||||
${GETTEXT_LIBRARY}
|
||||
${SOUND_LIBRARIES}
|
||||
${SQLITE3_LIBRARY}
|
||||
${LUA_LIBRARY}
|
||||
${JSON_LIBRARY}
|
||||
- ${OPENGLES2_LIBRARIES}
|
||||
${PLATFORM_LIBS}
|
||||
${CLIENT_PLATFORM_LIBS}
|
||||
)
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84
|
||||
Author: hasufell <julian.ospald@googlemail.com>
|
||||
Date: Sat Jun 8 13:40:30 2013 +0200
|
||||
|
||||
CMAKE: use shared lib from Irrlicht
|
||||
|
||||
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
|
||||
index bd00422..4632993 100644
|
||||
--- a/cmake/Modules/FindIrrlicht.cmake
|
||||
+++ b/cmake/Modules/FindIrrlicht.cmake
|
||||
@@ -50,10 +50,11 @@ else()
|
||||
/usr/include/irrlicht
|
||||
)
|
||||
|
||||
- FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
|
||||
+ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht
|
||||
PATHS
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
+ /usr/lib64
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -215,8 +215,6 @@
|
||||
message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
|
||||
else (NOT ${DISABLE_LUAJIT} MATCHES "1")
|
||||
message (STATUS "LuaJIT detection disabled! (DISABLE_LUAJIT=1)")
|
||||
- set(LUA_LIBRARY "")
|
||||
- set(LUA_INCLUDE_DIR "")
|
||||
endif (NOT DISABLE_LUAJIT)
|
||||
|
||||
set(USE_LUAJIT 0)
|
||||
@@ -267,11 +265,22 @@
|
||||
endif (VALID_LUAJIT_VERSION)
|
||||
endif (LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
|
||||
+OPTION(WITH_BUNDLED_LUA "Use bundled lua")
|
||||
+
|
||||
if(NOT USE_LUAJIT)
|
||||
message (STATUS "LuaJIT not found, using bundled Lua.")
|
||||
- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
|
||||
- set(LUA_LIBRARY "lua")
|
||||
- add_subdirectory(lua)
|
||||
+ if (WITH_BUNDLED_LUA)
|
||||
+ set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
|
||||
+ set(LUA_LIBRARY "lua")
|
||||
+ add_subdirectory(lua)
|
||||
+ else (WITH_BUNDLED_LUA)
|
||||
+ find_package(Lua51)
|
||||
+ if(LUA51_FOUND)
|
||||
+ message (STATUS "Lua51 found")
|
||||
+ else(LUA51_FOUND)
|
||||
+ message (FATAL_ERROR "Lua51 not found!")
|
||||
+ endif(LUA51_FOUND)
|
||||
+ endif(WITH_BUNDLED_LUA)
|
||||
endif(NOT USE_LUAJIT)
|
||||
|
||||
mark_as_advanced(LUA_LIBRARY)
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
# /etc/conf.d/minetest-server: config file for /etc/init.d/minetest-server
|
||||
|
||||
# user
|
||||
USER="minetest"
|
||||
|
||||
# group
|
||||
GROUP="@GROUP@"
|
||||
|
||||
# pidfile
|
||||
PIDFILE="/var/run/minetest.pid"
|
||||
|
||||
# executable
|
||||
MINETESTBIN="@BINDIR@/minetestserver"
|
||||
|
||||
# additional arguments for the server
|
||||
ARGS="--logfile /var/lib/minetest/minetest-server.log"
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
#!/sbin/runscript
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/files/minetestserver.initd,v 1.1 2013/08/05 22:31:13 hasufell Exp $
|
||||
|
||||
description="Minetest dedicated server"
|
||||
|
||||
depend() {
|
||||
need net
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "starting server"
|
||||
start-stop-daemon \
|
||||
--start \
|
||||
--quiet \
|
||||
--make-pidfile \
|
||||
--pidfile "${PIDFILE}" \
|
||||
--background \
|
||||
--user ${USER} \
|
||||
--group ${GROUP} \
|
||||
--exec "${MINETESTBIN}" -- ${ARGS}
|
||||
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "stopping server"
|
||||
start-stop-daemon \
|
||||
--stop \
|
||||
--signal 15 \
|
||||
--quiet \
|
||||
--pidfile "${PIDFILE}"
|
||||
|
||||
eend $?
|
||||
}
|
||||
|
|
@ -1,145 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/minetest-0.4.10.ebuild,v 1.1 2014/07/07 13:35:56 hasufell Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils cmake-utils gnome2-utils vcs-snapshot user games
|
||||
|
||||
DESCRIPTION="An InfiniMiner/Minecraft inspired game"
|
||||
HOMEPAGE="http://minetest.net/"
|
||||
SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+curl dedicated leveldb luajit nls redis +server +sound +truetype"
|
||||
|
||||
RDEPEND="dev-db/sqlite:3
|
||||
>=dev-games/irrlicht-1.8-r2
|
||||
sys-libs/zlib
|
||||
curl? ( net-misc/curl )
|
||||
!dedicated? (
|
||||
app-arch/bzip2
|
||||
media-libs/libpng:0
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
x11-libs/libXxf86vm
|
||||
sound? (
|
||||
media-libs/libogg
|
||||
media-libs/libvorbis
|
||||
media-libs/openal
|
||||
)
|
||||
truetype? ( media-libs/freetype:2 )
|
||||
)
|
||||
leveldb? ( dev-libs/leveldb )
|
||||
luajit? ( dev-lang/luajit:2 )
|
||||
!luajit? ( >=dev-lang/lua-5.1.4[deprecated] )
|
||||
nls? ( virtual/libintl )
|
||||
redis? ( dev-libs/hiredis )"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
pkg_setup() {
|
||||
games_pkg_setup
|
||||
|
||||
if use server || use dedicated ; then
|
||||
enewuser ${PN} -1 -1 /var/lib/${PN} ${GAMES_GROUP}
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
vcs-snapshot_src_unpack
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-shared-irrlicht.patch \
|
||||
"${FILESDIR}"/${P}-as-needed.patch \
|
||||
"${FILESDIR}"/${P}-system-lua.patch
|
||||
|
||||
# correct gettext behavior
|
||||
if [[ -n "${LINGUAS+x}" ]] ; then
|
||||
for i in $(cd po ; echo *) ; do
|
||||
if ! has ${i} ${LINGUAS} ; then
|
||||
rm -r po/${i} || die
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# jthread is modified
|
||||
# json is modified
|
||||
rm -r src/{lua,sqlite} || die
|
||||
|
||||
# set paths
|
||||
sed \
|
||||
-e "s#@BINDIR@#${GAMES_BINDIR}#g" \
|
||||
-e "s#@GROUP@#${GAMES_GROUP}#g" \
|
||||
"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON")
|
||||
-DCUSTOM_BINDIR="${GAMES_BINDIR}"
|
||||
-DCUSTOM_DOCDIR="/usr/share/doc/${PF}"
|
||||
-DCUSTOM_LOCALEDIR="/usr/share/locale"
|
||||
-DCUSTOM_SHAREDIR="${GAMES_DATADIR}/${PN}"
|
||||
$(cmake-utils_use_enable curl CURL)
|
||||
$(cmake-utils_use_enable truetype FREETYPE)
|
||||
$(cmake-utils_use_enable nls GETTEXT)
|
||||
-DENABLE_GLES=0
|
||||
$(cmake-utils_use_enable leveldb LEVELDB)
|
||||
$(cmake-utils_use_enable redis REDIS)
|
||||
$(cmake-utils_use_enable sound SOUND)
|
||||
$(cmake-utils_use !luajit DISABLE_LUAJIT)
|
||||
-DRUN_IN_PLACE=0
|
||||
-DWITH_BUNDLED_LUA=0
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake-utils_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
if use server || use dedicated ; then
|
||||
newinitd "${FILESDIR}"/minetestserver.initd minetest-server
|
||||
newconfd "${T}"/minetestserver.confd minetest-server
|
||||
fi
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
games_pkg_preinst
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
gnome2_icon_cache_update
|
||||
|
||||
if ! use dedicated ; then
|
||||
elog
|
||||
elog "optional dependencies:"
|
||||
elog " games-action/minetest_game (official mod)"
|
||||
elog
|
||||
fi
|
||||
|
||||
if use server || use dedicated ; then
|
||||
elog
|
||||
elog "Configure your server via /etc/conf.d/minetest-server"
|
||||
elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
|
||||
elog "Default logfile is ~/minetest-server.log"
|
||||
elog
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
DIST minetest_game-0.4.10.tar.gz 901448 SHA256 7624a1e64124c4438256719ccecfc44fe5139733a076394aedad1f785e50019f SHA512 eaff1fbee4e46811649293534ed2e496f40451bd1cc6527feb66da6d916ad31233b561ddae9bf631b41730ae04a17fe67c3f74ca95e527ca8eb6f45fe5dc0c86 WHIRLPOOL c9cc5b321eb6bbf7f60894f28f84d5ace5b17db34b696f0afe978bd19ee4e9b5b7202775d00b597661ec038fcc6160c0f27aa03ff1a38c559e6d3f9968c82aa7
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-action/minetest_game/minetest_game-0.4.10.ebuild,v 1.1 2014/07/07 13:36:09 hasufell Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit vcs-snapshot games
|
||||
|
||||
DESCRIPTION="The main game for the Minetest game engine"
|
||||
HOMEPAGE="http://github.com/minetest/minetest_game"
|
||||
SRC_URI="http://github.com/minetest/minetest_game/tarball/${PV} -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 CC-BY-SA-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="~games-action/minetest-${PV}[-dedicated]"
|
||||
|
||||
src_unpack() {
|
||||
vcs-snapshot_src_unpack
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "${GAMES_DATADIR}"/minetest/games/${PN}
|
||||
doins -r mods menu
|
||||
doins game.conf minetest.conf
|
||||
|
||||
dodoc README.txt game_api.txt
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
Loading…
Reference in New Issue