kolan
/
Overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minetest-0.4.5 added

This commit is contained in:
Kolan Sh 2013-03-07 17:52:27 +04:00
parent 6ebb643b6e
commit db51992215
10 changed files with 129 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
games-action/minetest/Manifest
View File

@ -1,9 +1,6 @@
AUX minetest-0.4.3-irrlicht.patch 392 SHA256 b24a6a729c31c940115284e4720efe1b9d5384c0868abac86be42ac2db329335 SHA512 6551bf9b43d0de765e33c2a2a44d500d8ac7360968c60b791f9708458bb82fc3a224b10ecc0e47ab2d7a23cb51f0515e275b8e7d9029b5eec2e5b51b88374b69 WHIRLPOOL c24f7604409ea59a3e2b4f28a34305931b8c3f03b6ecf08cd62c7aac6908c474d305a99bcf773e59bbe44501fb80b4bdff0dffa2a896ebb6cd9c7f2ef1b777f6
AUX minetest-0.4.3-jthread.patch 558 SHA256 a223de98c1f75c89475a71a3c660358e5e34170f028574e309e1dcecdcdc81fb SHA512 278ce16f78596117b4485c5b45d0fadc74f11e464e94657296c0c2dd2222e162c1b38a88a63c4b181ae5871e9efb62405e0225301c9a689b0a9c2aab41e5d6b6 WHIRLPOOL dc89f93c3d2aff52b447378c8e11b9e30b4fee26e620d5f8f5c19c42e9d2c27e4ea41b1e4a0bc08ef7dcf1d5896a81d5e22457306e3273878891199aa44d2b98
AUX minetest-0.4.3-lua.patch 591 SHA256 bdd39451ca02bf16301b7ba139d41c40e49fe3f1a0827b4492dfb495a68c0e48 SHA512 d02d30b129f48835c1cb0a208cd0362af6a20aec248d1732621cf6a1bffc289c4f0946f43662c4b79a2948b6e87e42a02884b629073091d4f859c9608698de03 WHIRLPOOL 4b3877cc57e73f9b89367728c96b3897a33f9017524a00447b6984bc29815128be663bf94faa7094a57bbc6bd0dcbdf07f4ce48931cb7bec1ba7e1e12a43f3e1
AUX minetest-0.4.4-jthread.patch 558 SHA256 a223de98c1f75c89475a71a3c660358e5e34170f028574e309e1dcecdcdc81fb SHA512 278ce16f78596117b4485c5b45d0fadc74f11e464e94657296c0c2dd2222e162c1b38a88a63c4b181ae5871e9efb62405e0225301c9a689b0a9c2aab41e5d6b6 WHIRLPOOL dc89f93c3d2aff52b447378c8e11b9e30b4fee26e620d5f8f5c19c42e9d2c27e4ea41b1e4a0bc08ef7dcf1d5896a81d5e22457306e3273878891199aa44d2b98
AUX minetest-0.4.4-lua.patch 591 SHA256 bdd39451ca02bf16301b7ba139d41c40e49fe3f1a0827b4492dfb495a68c0e48 SHA512 d02d30b129f48835c1cb0a208cd0362af6a20aec248d1732621cf6a1bffc289c4f0946f43662c4b79a2948b6e87e42a02884b629073091d4f859c9608698de03 WHIRLPOOL 4b3877cc57e73f9b89367728c96b3897a33f9017524a00447b6984bc29815128be663bf94faa7094a57bbc6bd0dcbdf07f4ce48931cb7bec1ba7e1e12a43f3e1
AUX minetest-0.4.5-cmake.patch 2623 SHA256 4befb69b403a875d9774258d307fb846eb7c829f86458c7b7eceb8683c204d78 SHA512 d7f38de0e9d785523a6af89af3f6c0ed40035825d913b9bd3db8655152604413ffcaac9d194b3edc6f441bc6dd463e1997c742400272d2c4097b2c70528b5473 WHIRLPOOL 41f5d058064b16a9df6e81366968fdfaf2b9ae318a2a548217ac1e328a5b0a3057327a855cc836e9b0d5f4db503ca3cce09ec9e7a2891ea2014337c5586b0d76
AUX minetest-0.4.5-unbundle.patch 727 SHA256 155c98a1345de0d9d7ddf394505a5b1201bbea8e3c28894aa493fd0519cbb695 SHA512 0a97298d67690ce3e2073015cdce95c17c426a9cfd989dd377135b834749ffa1fce3b6c8d4037b2432cce1035e786193a21e773c4a7f6d9de5b3c980754a46c1 WHIRLPOOL 4d873dc98ca1505ed61da8b1142f53e489ae344fbb78925fa02d85bd86b9dbd7a09432917c603dd4e28cf6c1058ac3f5d63fbf2f3d1356e645a5826543ac655d
AUX minetestserver.confd 313 SHA256 b360d2f80fb9793994a33778ef907a5b9220ba0a6a8a312d75499718cb9b5f81 SHA512 96fe764d78b383f294bce81e8631861057f309fd9d13f9397ca0c715396f3793f201f313a3507c0b190f41891441eb4fe418b5888cb73ffdea0d27969d0172c3 WHIRLPOOL 6be18593d29f593904760e19486eb77b3ac6bb6b02eaf7de54aba7f5cc117ebafa6ab355787015d3fc2baec6ef8368b3dc8e37bf5df9a901595ccc082adae941
AUX minetestserver.initd 570 SHA256 15d567577377cb8c2d6dc6e38b90e83aa08217ce4aa01e5f77b2b636c81c9e41 SHA512 dc0f106812bc52eec9436a9367b8eba0814642e8b74109c870046f8f9575ebb29561c168e05fe2b1faf12c17329cdc6b76442707ffe7dbe8fb7ee8cd4bb797c2 WHIRLPOOL 2ba91a77122142512c3123efc34dd19fd1437b68bcc1a51e17cd40040f3f6fc955927533472b98be047536db26679e45d5d54c2ad8512e9fe67bffd84a655e4e
DIST minetest-0.4.4.tar.gz 2104959 SHA256 127741d361e8642dd5b7e3aaad4b38bae4c19a5d1b8fac8f5acafbc2225f5de0 SHA512 36430c96753659becc33aa8f023da880a15ca209e9167243db7bfcefdf1290b0441889b085a90d744b5a1d0fccaf0fa73c394b315820f56e15218b9edc4c726c WHIRLPOOL 4a3cc86636a7c153681d413789bf7f196c715c1f8d11f868d5f7c9569ef7d07072c92adebf83f1b8c48b132e9976866ab476bf78fd153ebea37604c2e781f8b0
EBUILD minetest-0.4.4.ebuild 2538 SHA256 c70d6edea88f1b4ae60e2cec9f50d32d39bebb54bdf1c149cd4a5925e49b295e SHA512 43c60e917b008b8386324848c2bbd0c9baf343fc4df3b222e95cac510222d62d0576f29eabc6a90d04f0a549e908ded499de884896dd0a604e823127a2ebc221 WHIRLPOOL 139ef97a7e6e53dd449e1d074895cc53923a0e9dc0f55484edb7f33316385fbd86a90c8a10a141af1aa115077c01c2dd286de812bc31fe511a31158c4f8263be
DIST minetest-0.4.5.tar.gz 2539944 SHA256 0d643d5b55fa3eb4de4572ff5cd2ce7976bf5916dfbd488cd2fd291931b5b574 SHA512 98aa614fbc1fd8c0ee05437b65f0b47e342cc25f7a46fe9f97ca381300c1d0e0bb250409ad6901a208a875d7f670e7e7dcfca724e231c96c4a8560686aabbd9d WHIRLPOOL de5658d2dbd2f627f0d30956c302279ffe60cf055aecd485e566d4029550d69f3a3fb248555ca8a44bebe07d452df0b47723ad4745a512cdf1d88022897e14a8
EBUILD minetest-0.4.5.ebuild 2783 SHA256 eeaeab6ad44a713e85dcc477c607c6895782524ef6822c26c9ee8ad7d9a22c56 SHA512 5b3ae88e507d65c66279ac256790dd2d21cf0e39b71b11bf1c67ae01755eb686325f56a6e134377be06079f61a16b03bee65780a33fe57ddb4f93a54729f01e8 WHIRLPOOL b1035e760f356e1b3b51e4ddd175d7bf8b9c6c479ef8716d2c4349849c9757fa7dfe907737004b2fcc27d3049ac3be713d6ee259d45017ca1941d4dcc5cdabdb

17
games-action/minetest/files/minetest-0.4.3-irrlicht.patch
View File

@ -1,17 +0,0 @@
From: Julian Ospald <hasufell@gentoo.org>
Date: Wed Sep 5 19:42:52 UTC 2012
Subject: cmake module
use shared lib
--- cmake/Modules/FindIrrlicht.cmake
+++ cmake/Modules/FindIrrlicht.cmake
@@ -50,7 +50,7 @@
/usr/include/irrlicht
)
- FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
+ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so
PATHS
/usr/local/lib
/usr/lib

19
games-action/minetest/files/minetest-0.4.3-jthread.patch
View File

@ -1,19 +0,0 @@
From: hasufell <julian.ospald@googlemail.com>
Date: Mon Apr 23 21:34:29 UTC 2012
fix FIND_PATH to correctly find jthread
use shared lib
--- cmake/Modules/FindJthread.cmake
+++ cmake/Modules/FindJthread.cmake
@@ -1,8 +1,8 @@
# Look for jthread, use our own if not found
-FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h)
+FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h PATHS /usr/include/jthread)
-FIND_LIBRARY(JTHREAD_LIBRARY NAMES jthread)
+FIND_LIBRARY(JTHREAD_LIBRARY NAMES libjthread.so)
IF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
SET( JTHREAD_FOUND TRUE )

24
games-action/minetest/files/minetest-0.4.3-lua.patch
View File

@ -1,24 +0,0 @@
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -142,10 +142,7 @@
find_package(Jthread REQUIRED)
find_package(Sqlite3 REQUIRED)
-# Do not use system-wide installation of Lua, because it'll likely be a
-# different version and/or has different build options.
-set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
-set(LUA_LIBRARY "lua")
+find_package(Lua51 REQUIRED)
configure_file(
"${PROJECT_SOURCE_DIR}/cmake_config.h.in"
@@ -480,9 +477,4 @@
add_subdirectory(sqlite)
endif (SQLITE3_FOUND)
-if (LUA_FOUND)
-else (LUA_FOUND)
- add_subdirectory(lua)
-endif (LUA_FOUND)
-
#end

19
games-action/minetest/files/minetest-0.4.4-jthread.patch
View File

@ -1,19 +0,0 @@
From: hasufell <julian.ospald@googlemail.com>
Date: Mon Apr 23 21:34:29 UTC 2012
fix FIND_PATH to correctly find jthread
use shared lib
--- cmake/Modules/FindJthread.cmake
+++ cmake/Modules/FindJthread.cmake
@@ -1,8 +1,8 @@
# Look for jthread, use our own if not found
-FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h)
+FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h PATHS /usr/include/jthread)
-FIND_LIBRARY(JTHREAD_LIBRARY NAMES jthread)
+FIND_LIBRARY(JTHREAD_LIBRARY NAMES libjthread.so)
IF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
SET( JTHREAD_FOUND TRUE )

88
games-action/minetest/files/minetest-0.4.5-cmake.patch Normal file
View File

@ -0,0 +1,88 @@
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -387,6 +387,9 @@
${CGUITTFONT_LIBRARY}
)
endif(USE_FREETYPE)
+ set_target_properties(${PROJECT_NAME}
+ PROPERTIES COMPILE_FLAGS "${JTHREAD_CFLAGS}"
+ LINK_FLAGS "${JTHREAD_LDFLAGS}")
endif(BUILD_CLIENT)
if(BUILD_SERVER)
@@ -407,6 +410,9 @@
${CURL_LIBRARY}
)
endif(USE_CURL)
+ set_target_properties(${PROJECT_NAME}server
+ PROPERTIES COMPILE_FLAGS "${JTHREAD_CFLAGS}"
+ LINK_FLAGS "${JTHREAD_LDFLAGS}")
endif(BUILD_SERVER)
--- cmake/Modules/FindJthread.cmake
+++ cmake/Modules/FindJthread.cmake
@@ -1,16 +1,41 @@
# Look for jthread, use our own if not found
-FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h)
-FIND_LIBRARY(JTHREAD_LIBRARY NAMES jthread)
+option(WITH_SYSTEM_JTHREAD "Use systm JThread copy" OFF)
-IF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
- SET( JTHREAD_FOUND TRUE )
-ENDIF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
+IF(WITH_SYSTEM_JTHREAD)
+ IF(UNIX)
+ # try to use pkgconfig file first
+ FIND_PACKAGE(PkgConfig QUIET)
+ pkg_check_modules(_PC_JTHREAD jthread)
+ IF(_PC_JTHREAD_FOUND)
+ SET(JTHREAD_FOUND TRUE)
+ # use CFLAGS/LDFLAGS instead of INCLUDE_DIR/LIBRARY
+ # because we want the full dependencies
+ SET(JTHREAD_CFLAGS ${_PC_JTHREAD_CFLAGS})
+ SET(JTHREAD_LDFLAGS ${_PC_JTHREAD_LDFLAGS})
+ ENDIF(_PC_JTHREAD_FOUND)
+ ENDIF(UNIX)
+
+ # fall back to cmake macros
+ IF(NOT JTHREAD_FOUND)
+ FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h PATHS /usr/include/jthread)
+ FIND_LIBRARY(JTHREAD_LIBRARY NAMES jthread)
+
+ IF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
+ SET( JTHREAD_FOUND TRUE )
+ ENDIF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
+ ENDIF(NOT JTHREAD_FOUND)
+ENDIf(WITH_SYSTEM_JTHREAD)
IF(JTHREAD_FOUND)
- MESSAGE(STATUS "Found system jthread header file in ${JTHREAD_INCLUDE_DIR}")
- MESSAGE(STATUS "Found system jthread library ${JTHREAD_LIBRARY}")
+ IF(_PC_JTHREAD_FOUND)
+ MESSAGE(STATUS "Found system jthread: ${_PC_JTHREAD_VERSION}")
+ ELSE(_PC_JTHREAD_FOUND)
+ MESSAGE(STATUS "Found system jthread header file in ${JTHREAD_INCLUDE_DIR}")
+ MESSAGE(STATUS "Found system jthread library ${JTHREAD_LIBRARY}")
+ ENDIF(_PC_JTHREAD_FOUND)
+# fall back to bundled jthread
ELSE(JTHREAD_FOUND)
SET(JTHREAD_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jthread)
SET(JTHREAD_LIBRARY jthread)
--- cmake/Modules/FindIrrlicht.cmake
+++ cmake/Modules/FindIrrlicht.cmake
@@ -50,10 +50,11 @@
/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()

17
games-action/minetest/files/minetest-0.4.4-lua.patch → games-action/minetest/files/minetest-0.4.5-unbundle.patch
View File

@ -1,24 +1,27 @@
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -142,10 +142,7 @@
find_package(Jthread REQUIRED)
find_package(Sqlite3 REQUIRED)
@@ -179,10 +179,8 @@
set(CGUITTFONT_LIBRARY cguittfont)
endif(USE_FREETYPE)
-# Do not use system-wide installation of Lua, because it'll likely be a
-# different version and/or has different build options.
-set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
-set(LUA_LIBRARY "lua")
+# Do not use bundled libraries if system libraries are available
+find_package(Lua51 REQUIRED)
configure_file(
"${PROJECT_SOURCE_DIR}/cmake_config.h.in"
@@ -480,9 +477,4 @@
add_subdirectory(sqlite)
endif (SQLITE3_FOUND)
@@ -586,11 +584,6 @@
add_subdirectory(cguittfont)
endif (BUILD_CLIENT AND USE_FREETYPE)
-if (LUA_FOUND)
-else (LUA_FOUND)
- add_subdirectory(lua)
-endif (LUA_FOUND)
-
#end
if (JSON_FOUND)
else (JSON_FOUND)
add_subdirectory(json)

37
games-action/minetest/minetest-0.4.4.ebuild → games-action/minetest/minetest-0.4.5.ebuild
View File

@ -1,40 +1,40 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
EAPI=5
inherit eutils cmake-utils gnome2-utils vcs-snapshot user games
DESCRIPTION="An InfiniMiner/Minecraft inspired game"
HOMEPAGE="http://c55.me/minetest/"
SRC_URI="http://github.com/celeron55/minetest/tarball/${PV} -> ${P}.tar.gz"
SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz"
LICENSE="LGPL-2.1+ CCPL-Attribution-ShareAlike-3.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="dedicated nls +server"
IUSE="+curl dedicated nls +server +sound +truetype"
RDEPEND="dev-db/sqlite:3
dev-lang/lua
>=dev-libs/jthread-1.2
>=dev-games/irrlicht-1.8-r2
>=dev-lang/lua-5.1.4
sys-libs/zlib
media-libs/glu
curl? ( net-misc/curl )
!dedicated? (
app-arch/bzip2
media-libs/libogg
media-libs/libpng:0
media-libs/libvorbis
media-libs/openal
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 )
)
nls? ( virtual/libintl )"
# XXX: support shared lib for irrlicht
DEPEND="${RDEPEND}
media-libs/glu
>=dev-games/irrlicht-1.7
nls? ( sys-devel/gettext )"
pkg_setup() {
@ -51,9 +51,12 @@ src_unpack() {
src_prepare() {
epatch \
"${FILESDIR}"/${P}-lua.patch
"${FILESDIR}"/${P}-cmake.patch \
"${FILESDIR}"/${P}-unbundle.patch
#rm -r src/{jthread,lua,sqlite} || die
# jthread is modified
# json is modified
rm -r src/{lua,sqlite} || die
# set paths
sed \
@ -70,6 +73,10 @@ src_configure() {
-DCUSTOM_DOCDIR="/usr/share/doc/${PF}"
$(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON")
$(cmake-utils_use_enable nls GETTEXT)
$(cmake-utils_use_enable curl CURL)
$(cmake-utils_use_enable truetype FREETYPE)
$(cmake-utils_use_enable sound SOUND)
-DWITH_SYSTEM_JTHREAD=OFF
)
cmake-utils_src_configure

4
games-action/minetest_game/Manifest
View File

@ -1,2 +1,2 @@
DIST minetest_game-0.4.4.tar.gz 451470 SHA256 4bef31fd706ddecb72234b88a70b94e26065f9326c345b3a04b89b21e51eca86 SHA512 0ff051171ccc16bded0127ac6effd513729e986913d197d32a254f61a72385c6cd14fc29424032aa66b537a12c9c3f4d0488f54a15ff3c35b41a696bd3d300a0 WHIRLPOOL 89f5150a4786343effefc84fba16dd1b5fb39360812b1bcac3f57030a93aa3fcd1abed94f589a2e41d668f35e4186694bee95b8c1aa5a3b942149673b0450cc7
EBUILD minetest_game-0.4.4.ebuild 644 SHA256 c481d90c0bca56d1fd40adb5505a8a00d503a505e6bf2aca7c3cd3a56b3af703 SHA512 283a35632ad2236e7c8d66a157c6779f86929e67a16e36118bf9f3572fc5c73e2619f17e8c49b2c5a040eac9d3672685899da548279558258b7c304d43963807 WHIRLPOOL 49b7743d37ed1e08cc553ecfce420c56aa0f463642153c79fe394acaa48779f366410d68d83f127159d6e76875f1c1071bbf7dc9dd0e971af9d0b0dc0e110578
DIST minetest_game-0.4.5.tar.gz 455317 SHA256 51def3efe043f54dd8d628198f5f50c96811b44cf062453beddee2f473a74073 SHA512 40418ef8d8029172ffdb31948be2d8e43f95e35e6f2cde5993525747d8675d37758fae353a779e3149b38476690108c54fda2fc73a443bf04c81801c318758c7 WHIRLPOOL 01603afd4e89170ae57d3b3a80da781eff01ea8929af5e35eb10e0d355ac6e9612afe94a1f0733c3acde33342ab855ca736e4f3831710416fd979fb92ffa90e0
EBUILD minetest_game-0.4.5.ebuild 568 SHA256 ffc9af7f210eb73f1c8e249e48e92974d8e8e46a6059400fe42286b73f79896a SHA512 a724433031ca971a949c6f869d457ebc31db2e695ad339d61c761873a7037ae4affff87fbb8fbf5e3e8ab28ec766669e925c0d5773f234770d3e7cc34838f8d5 WHIRLPOOL d96085feabec0fea058b2d439c19a56837649723fad910ecb433eadd52c81a2de41428d3cbc0f611d94ad7d38fdcbe55b813471e5b1175337a612fed66a48686

10
games-action/minetest_game/minetest_game-0.4.4.ebuild → games-action/minetest_game/minetest_game-0.4.5.ebuild
View File

@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
inherit eutils cmake-utils gnome2-utils vcs-snapshot games
EAPI=5
inherit games vcs-snapshot
DESCRIPTION="Official mod for minetest"
HOMEPAGE="http://c55.me/minetest/"
SRC_URI="http://github.com/celeron55/minetest_game/tarball/${PV} -> ${P}.tar.gz"
SRC_URI="http://github.com/minetest/minetest_game/tarball/${PV} -> ${P}.tar.gz"
LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
SLOT="0"
@ -16,10 +16,6 @@ IUSE=""
RDEPEND="~games-action/minetest-${PV}[-dedicated]"
src_unpack() {
vcs-snapshot_src_unpack
}
src_install() {
insinto "${GAMES_DATADIR}"/minetest/games/${PN}
doins -r mods