diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest index 791bcce4..f1098e29 100644 --- a/games-action/minetest/Manifest +++ b/games-action/minetest/Manifest @@ -1,10 +1 @@ -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 minetest-0.4.6-cmake.patch 2623 SHA256 4befb69b403a875d9774258d307fb846eb7c829f86458c7b7eceb8683c204d78 SHA512 d7f38de0e9d785523a6af89af3f6c0ed40035825d913b9bd3db8655152604413ffcaac9d194b3edc6f441bc6dd463e1997c742400272d2c4097b2c70528b5473 WHIRLPOOL 41f5d058064b16a9df6e81366968fdfaf2b9ae318a2a548217ac1e328a5b0a3057327a855cc836e9b0d5f4db503ca3cce09ec9e7a2891ea2014337c5586b0d76 -AUX minetest-0.4.6-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.5.tar.gz 2539944 SHA256 0d643d5b55fa3eb4de4572ff5cd2ce7976bf5916dfbd488cd2fd291931b5b574 SHA512 98aa614fbc1fd8c0ee05437b65f0b47e342cc25f7a46fe9f97ca381300c1d0e0bb250409ad6901a208a875d7f670e7e7dcfca724e231c96c4a8560686aabbd9d WHIRLPOOL de5658d2dbd2f627f0d30956c302279ffe60cf055aecd485e566d4029550d69f3a3fb248555ca8a44bebe07d452df0b47723ad4745a512cdf1d88022897e14a8 -DIST minetest-0.4.6.tar.gz 2578194 SHA256 a6ea387b25181264eea43194be6137c1a54fac2873f0b811789ba0e24ff5b1b1 SHA512 45754b4c74e87586d77c8ba927e7d08188ba1de31a5e79eb86bb0ce1820bec3cebf9ad2abe31c45a6522b9d5aaee44c96cb68930b24b8aa0c05a7ce3d59ed2d5 WHIRLPOOL 66fbf0f909d36e0e90bc41aad374e90b7e6289a290e0f7fe7862eea710858bd7a03eb0fc2e70d1c5d7f21dfbcd0e51c732d51e681325129fd2c1f8fe0432568d -EBUILD minetest-0.4.5.ebuild 2783 SHA256 eeaeab6ad44a713e85dcc477c607c6895782524ef6822c26c9ee8ad7d9a22c56 SHA512 5b3ae88e507d65c66279ac256790dd2d21cf0e39b71b11bf1c67ae01755eb686325f56a6e134377be06079f61a16b03bee65780a33fe57ddb4f93a54729f01e8 WHIRLPOOL b1035e760f356e1b3b51e4ddd175d7bf8b9c6c479ef8716d2c4349849c9757fa7dfe907737004b2fcc27d3049ac3be713d6ee259d45017ca1941d4dcc5cdabdb -EBUILD minetest-0.4.6.ebuild 3143 SHA256 e5e262239edc9c9a6ee84627e5e842971d74618eeb18e26cbe3cc37b785744fa SHA512 b6225f65ccf6cad296e80e02b4de74472a001935ac8884c44df530d626dbce94ffcff7d3c8cc6d748a49119c93569f6b924326b3ed8eb84dce62364b9f207dfd WHIRLPOOL 5845054d2abad936bc943d738f595f838a1f757e24fe8734a551be56711db7b3b223fee90c6fc3d13f93ef9423039b696987c57147d82b5f8969a3171fd79fa4 +DIST minetest-0.4.8.tar.gz 5157034 SHA256 657329dd4733801617f32f110e527ce6e0fc93d30168683842f881414d28c309 SHA512 2ad93bc449bd6ba77f81584e3aec90af8f8d632c7e8238ac3b7fabe2759636f2a0652ff697b53f1d95e95cf96493b1915ddedf18e5df3ef97d5638adce9c9fd4 WHIRLPOOL bf464ace8dc707c4f2875e7041d432462c6988f7b40a2747b4b1b6c2c6a231581c4ef9b144ba632ffe15d179e1530e2a0a5265355cae852488e84838bced727b diff --git a/games-action/minetest/files/minetest-0.4.5-cmake.patch b/games-action/minetest/files/minetest-0.4.5-cmake.patch deleted file mode 100644 index 7b5f80bd..00000000 --- a/games-action/minetest/files/minetest-0.4.5-cmake.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- 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() - diff --git a/games-action/minetest/files/minetest-0.4.5-unbundle.patch b/games-action/minetest/files/minetest-0.4.5-unbundle.patch deleted file mode 100644 index 91906151..00000000 --- a/games-action/minetest/files/minetest-0.4.5-unbundle.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- src/CMakeLists.txt -+++ src/CMakeLists.txt -@@ -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" -@@ -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) -- - if (JSON_FOUND) - else (JSON_FOUND) - add_subdirectory(json) diff --git a/games-action/minetest/files/minetest-0.4.6-cmake.patch b/games-action/minetest/files/minetest-0.4.6-cmake.patch deleted file mode 100644 index 7b5f80bd..00000000 --- a/games-action/minetest/files/minetest-0.4.6-cmake.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- 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() - diff --git a/games-action/minetest/files/minetest-0.4.6-unbundle.patch b/games-action/minetest/files/minetest-0.4.6-unbundle.patch deleted file mode 100644 index 91906151..00000000 --- a/games-action/minetest/files/minetest-0.4.6-unbundle.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- src/CMakeLists.txt -+++ src/CMakeLists.txt -@@ -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" -@@ -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) -- - if (JSON_FOUND) - else (JSON_FOUND) - add_subdirectory(json) diff --git a/games-action/minetest/files/minetest-0.4.8-as-needed.patch b/games-action/minetest/files/minetest-0.4.8-as-needed.patch new file mode 100644 index 00000000..803ea028 --- /dev/null +++ b/games-action/minetest/files/minetest-0.4.8-as-needed.patch @@ -0,0 +1,35 @@ +commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd +Author: hasufell +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) + target_link_libraries( + ${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} + ) diff --git a/games-action/minetest/files/minetest-0.4.8-lua-luajit-option.patch b/games-action/minetest/files/minetest-0.4.8-lua-luajit-option.patch new file mode 100644 index 00000000..9badeaeb --- /dev/null +++ b/games-action/minetest/files/minetest-0.4.8-lua-luajit-option.patch @@ -0,0 +1,56 @@ +commit d8dbda3636a91eba52c97450b58f767d5a4a376e +Author: hasufell +Date: Mon Nov 25 00:25:55 2013 +0100 + + add USE_LUAJIT option + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a30dc98..a1fee7a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -179,24 +179,29 @@ if(USE_FREETYPE) + endif(USE_FREETYPE) + + +-find_library(LUA_LIBRARY luajit +- NAMES luajit-5.1) +-find_path(LUA_INCLUDE_DIR luajit.h +- NAMES luajit.h +- PATH_SUFFIXES luajit-2.0) +-message (STATUS "LuaJIT library: ${LUA_LIBRARY}") +-message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}") ++option(USE_LUAJIT "Use luajit instead of lua" OFF) + + set(USE_LUAJIT 0) +-if(LUA_LIBRARY AND LUA_INCLUDE_DIR) +- message (STATUS "LuaJIT found.") +- set(USE_LUAJIT 1) +-else(LUA_LIBRARY AND LUA_INCLUDE_DIR) +- message (STATUS "LuaJIT not found, using bundled Lua.") +- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") +- set(LUA_LIBRARY "lua") +- add_subdirectory(lua) +-endif(LUA_LIBRARY AND LUA_INCLUDE_DIR) ++if(USE_LUAJIT) ++ find_library(LUA_LIBRARY luajit ++ NAMES luajit-5.1) ++ find_path(LUA_INCLUDE_DIR luajit.h ++ NAMES luajit.h ++ PATH_SUFFIXES luajit-2.0) ++ if(LUA_LIBRARY AND LUA_INCLUDE_DIR) ++ message (STATUS "LuaJIT found") ++ set(USE_LUAJIT 1) ++ else(LUA_LIBRARY AND LUA_INCLUDE_DIR) ++ message (FATAL_ERROR "LuaJIT not found!") ++ endif(LUA_LIBRARY AND LUA_INCLUDE_DIR) ++else(USE_LUAJIT) ++ find_package(Lua51) ++ if(LUA51_FOUND) ++ message (STATUS "Lua51 found") ++ else(LUA51_FOUND) ++ message (FATAL_ERROR "Lua51 not found!") ++ endif(LUA51_FOUND) ++endif(USE_LUAJIT) + + mark_as_advanced(LUA_LIBRARY) + mark_as_advanced(LUA_INCLUDE_DIR) diff --git a/games-action/minetest/files/minetest-0.4.8-shared-irrlicht.patch b/games-action/minetest/files/minetest-0.4.8-shared-irrlicht.patch new file mode 100644 index 00000000..b552c093 --- /dev/null +++ b/games-action/minetest/files/minetest-0.4.8-shared-irrlicht.patch @@ -0,0 +1,23 @@ +commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84 +Author: hasufell +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() + diff --git a/games-action/minetest/files/minetestserver.initd b/games-action/minetest/files/minetestserver.initd index e0a33d96..24fd5fb6 100644 --- a/games-action/minetest/files/minetestserver.initd +++ b/games-action/minetest/files/minetestserver.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $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" diff --git a/games-action/minetest/minetest-0.4.5.ebuild b/games-action/minetest/minetest-0.4.5.ebuild deleted file mode 100644 index b92edf79..00000000 --- a/games-action/minetest/minetest-0.4.5.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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/minetest/minetest/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+ CCPL-Attribution-ShareAlike-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+curl dedicated nls +server +sound +truetype" - -RDEPEND="dev-db/sqlite:3 - >=dev-games/irrlicht-1.8-r2 - >=dev-lang/lua-5.1.4 - 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 ) - ) - nls? ( virtual/libintl )" -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}-cmake.patch \ - "${FILESDIR}"/${P}-unbundle.patch - - # 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=( - -DRUN_IN_PLACE=0 - -DCUSTOM_SHAREDIR="${GAMES_DATADIR}/${PN}" - -DCUSTOM_BINDIR="${GAMES_BINDIR}" - -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 -} - -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 -} diff --git a/games-action/minetest/minetest-0.4.6.ebuild b/games-action/minetest/minetest-0.4.8.ebuild similarity index 84% rename from games-action/minetest/minetest-0.4.6.ebuild rename to games-action/minetest/minetest-0.4.8.ebuild index 024cbdc4..7d195d6e 100644 --- a/games-action/minetest/minetest-0.4.6.ebuild +++ b/games-action/minetest/minetest-0.4.8.ebuild @@ -1,22 +1,21 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/minetest-0.4.8.ebuild,v 1.1 2013/11/24 23:42:51 hasufell Exp $ EAPI=5 inherit eutils cmake-utils gnome2-utils vcs-snapshot user games DESCRIPTION="An InfiniMiner/Minecraft inspired game" -HOMEPAGE="http://c55.me/minetest/" +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 nls +server +sound +truetype" +IUSE="+curl dedicated leveldb luajit nls +server +sound +truetype" RDEPEND="dev-db/sqlite:3 >=dev-games/irrlicht-1.8-r2 - >=dev-lang/lua-5.1.4 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( @@ -33,6 +32,9 @@ RDEPEND="dev-db/sqlite:3 ) truetype? ( media-libs/freetype:2 ) ) + leveldb? ( dev-libs/leveldb ) + luajit? ( dev-lang/luajit:2 ) + !luajit? ( >=dev-lang/lua-5.1.4 ) nls? ( virtual/libintl )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" @@ -51,8 +53,9 @@ src_unpack() { src_prepare() { epatch \ - "${FILESDIR}"/${P}-cmake.patch \ - "${FILESDIR}"/${P}-unbundle.patch + "${FILESDIR}"/${P}-lua-luajit-option.patch \ + "${FILESDIR}"/${P}-shared-irrlicht.patch \ + "${FILESDIR}"/${P}-as-needed.patch # correct gettext behavior if [[ -n "${LINGUAS+x}" ]] ; then @@ -84,9 +87,10 @@ src_configure() { $(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_use luajit LUAJIT) $(cmake-utils_use_enable truetype FREETYPE) $(cmake-utils_use_enable sound SOUND) - -DWITH_SYSTEM_JTHREAD=OFF + $(cmake-utils_use_enable leveldb LEVELDB) ) cmake-utils_src_configure diff --git a/games-action/minetest_build/Manifest b/games-action/minetest_build/Manifest deleted file mode 100644 index ce34be29..00000000 --- a/games-action/minetest_build/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST minetest_build-0.4.6.tar.gz 4397 SHA256 8bde4a2bcd9fd56f754e4a03dd578484d13fad681f55977008007ba262f52f03 SHA512 9a6283614b69cbe98af42cc64054add5c0a47fccb3ca715ea1ba5e7a226e49b1ba349082087b45b6bc9798ef238aa5954e2e89abb505d9a5017f2908031389da WHIRLPOOL e195d51be4f2f3a8705f7706349914579d18cf3a6b96b74848ac413d7659658ca6812891afcbb636068a807d10886fec965173db70686a95330f0c0ec21c9d75 -EBUILD minetest_build-0.4.6.ebuild 548 SHA256 0833c29fbcad3e8f8ee2413d3cad4a50ec8d30dc784932ebe41eb570ea698cdd SHA512 8053d3cc89105ffbcd4c47b497bac7d2a7d3dbc53a88113e560d85384548ef9e40f66ae382fd6ac23087a12b18dc4398591dfdee6227a5aead921503e7a05670 WHIRLPOOL cdd3198b06cc592e02d1b86c15a09e8307e589fd32a5be2d04d427b76447b8ea94d1306fb6c1c781380102f881c0fb787a1dcaee10561edb25395413f55906ae diff --git a/games-action/minetest_build/minetest_build-0.4.6.ebuild b/games-action/minetest_build/minetest_build-0.4.6.ebuild deleted file mode 100644 index e96b0797..00000000 --- a/games-action/minetest_build/minetest_build-0.4.6.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit games vcs-snapshot - -DESCRIPTION="Build/Minetest" -HOMEPAGE="https://github.com/minetest/build" -SRC_URI="https://github.com/minetest/build/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="~games-action/minetest-${PV}[-dedicated]" - -src_install() { - insinto "${GAMES_DATADIR}"/minetest/games/build - doins -r mods - doins game.conf - - prepgamesdirs -} diff --git a/games-action/minetest_common/Manifest b/games-action/minetest_common/Manifest deleted file mode 100644 index 02296859..00000000 --- a/games-action/minetest_common/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST minetest_common-0.4.6.tar.gz 463438 SHA256 c90378c5ae1f2aa20a78d95ad6abe92de1d467170a6356f42f035c6cff9f457b SHA512 3701bce3f2aa50006bc7f0fc0409aa592956d8981c58958b2fd9cd5de6bbcdee6fcca0fb6a618c1ec446473571bd1fcbc0e08525560ca379db917e4913949949 WHIRLPOOL b498b00bb4165bcfd9fda0aa9ffb32075dacaa437c2758ba485133d03fe1a06750fbd9227dff77da8a4ff5a3acfbe8fc7ab915ee69f254b1bb33a70beb589870 -EBUILD minetest_common-0.4.6.ebuild 540 SHA256 43010254991359c7d807d9dc8f0a7cbe63c27cbe10a60034a20b5c6edbb2a429 SHA512 3bce5915a4e78c2a7b42bcef4f3fbe302e99d1d47079b987c26a03de95ff0f032c430421bc2d384acd46dbd0ada507e46c685a54fe99a53ec7c4a595318d7b3f WHIRLPOOL 86f7f66cda5c9f63f07498552095c0db391f5a5b654431f8a8cd751cd6f52928080f60b776a85f1a46d509977d9392d52a06ee6f5cc19fe3511b89b919ae9ca5 diff --git a/games-action/minetest_common/minetest_common-0.4.6.ebuild b/games-action/minetest_common/minetest_common-0.4.6.ebuild deleted file mode 100644 index d73cfc61..00000000 --- a/games-action/minetest_common/minetest_common-0.4.6.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit games vcs-snapshot - -DESCRIPTION="Minetest Common Mods" -HOMEPAGE="https://github.com/minetest/common" -SRC_URI="https://github.com/minetest/common/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="~games-action/minetest-${PV}[-dedicated]" - -src_install() { - insinto "${GAMES_DATADIR}"/minetest/games/common - doins -r mods - - prepgamesdirs -} diff --git a/games-action/minetest_game/Manifest b/games-action/minetest_game/Manifest deleted file mode 100644 index 3a7ba83c..00000000 --- a/games-action/minetest_game/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST minetest_game-0.4.5.tar.gz 455317 SHA256 51def3efe043f54dd8d628198f5f50c96811b44cf062453beddee2f473a74073 SHA512 40418ef8d8029172ffdb31948be2d8e43f95e35e6f2cde5993525747d8675d37758fae353a779e3149b38476690108c54fda2fc73a443bf04c81801c318758c7 WHIRLPOOL 01603afd4e89170ae57d3b3a80da781eff01ea8929af5e35eb10e0d355ac6e9612afe94a1f0733c3acde33342ab855ca736e4f3831710416fd979fb92ffa90e0 -DIST minetest_game-0.4.6.tar.gz 12059 SHA256 9f9d5e6679c5374c861be0668c04ffc6f767a70f704ef431cc14c1b66a6eb3f6 SHA512 67a411904ad3fad41eadea8a74de242058bd71e19e44697d29d72f96ee86ae3c5a243162713944a9411fc9913604126419a554fcf1f373f6b379fb63f78c5101 WHIRLPOOL 8b09d18e53337a424b15e9e04c0282ee89937f45dc1b12a5b73dd27a5fc06e9445bfcd707634aaeac099314ba30914004c959e1d8813eafe782de7462a7ad708 -EBUILD minetest_game-0.4.5.ebuild 568 SHA256 ffc9af7f210eb73f1c8e249e48e92974d8e8e46a6059400fe42286b73f79896a SHA512 a724433031ca971a949c6f869d457ebc31db2e695ad339d61c761873a7037ae4affff87fbb8fbf5e3e8ab28ec766669e925c0d5773f234770d3e7cc34838f8d5 WHIRLPOOL d96085feabec0fea058b2d439c19a56837649723fad910ecb433eadd52c81a2de41428d3cbc0f611d94ad7d38fdcbe55b813471e5b1175337a612fed66a48686 -EBUILD minetest_game-0.4.6.ebuild 586 SHA256 a46f7ae3290a4cf7eed2eb50dffdc4d4f69405edbbdfa44a9516df57428bc41a SHA512 2ad9e80565780b37e180725132722c689c775a707801618769fcc1281af75559407179039a7b89c01b8fffb93673f734c18ce0cc7679d5786629225399b0d375 WHIRLPOOL 2cfb9af8877e410893ed9f5d767d016ffadfd74055b709988fc809ef4236e2d160f3d05265cc3fbb0e95414eb4366f7aa517e6c101469e0a83501cc32b470b20 diff --git a/games-action/minetest_game/minetest_game-0.4.5.ebuild b/games-action/minetest_game/minetest_game-0.4.5.ebuild deleted file mode 100644 index baa835c7..00000000 --- a/games-action/minetest_game/minetest_game-0.4.5.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit games vcs-snapshot - -DESCRIPTION="Official mod for minetest" -HOMEPAGE="http://c55.me/minetest/" -SRC_URI="http://github.com/minetest/minetest_game/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="~games-action/minetest-${PV}[-dedicated]" - -src_install() { - insinto "${GAMES_DATADIR}"/minetest/games/${PN} - doins -r mods - doins game.conf - - prepgamesdirs -} diff --git a/games-action/minetest_game/minetest_game-0.4.6.ebuild b/games-action/minetest_game/minetest_game-0.4.6.ebuild deleted file mode 100644 index 9f8de310..00000000 --- a/games-action/minetest_game/minetest_game-0.4.6.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit games vcs-snapshot - -DESCRIPTION="Official mod for minetest" -HOMEPAGE="http://c55.me/minetest/" -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] - ~games-action/minetest_common-${PV}" - -src_install() { - insinto "${GAMES_DATADIR}"/minetest/games/${PN} - doins -r mods - doins game.conf - - prepgamesdirs -} diff --git a/games-action/minetest_survival/Manifest b/games-action/minetest_survival/Manifest deleted file mode 100644 index 37c6f4ce..00000000 --- a/games-action/minetest_survival/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST minetest_survival-0.4.6.tar.gz 4402 SHA256 80a20b5bbb49442d3c4298e811a65b53ca593437288e214ab885da081f547ff7 SHA512 7665ad60db592ebe9325ab9fb3c6939a8b67dd8ea8f36589bf0cd1983b63ed4fd8462f9caaf0a8a013b415f1be71dad8ffec31a8f2646260a121bd59fcfa7ed2 WHIRLPOOL be5e8d67430109c906cb62ac94417b791346800cc3cf7c487078dd9c8aa4f222d34531a77170f0aa30097f3c1ba7fd1ce841204baa76b91ec491881ba5e52771 -EBUILD minetest_survival-0.4.6.ebuild 560 SHA256 9987273a5776517dec12a1ce35b0bde5a51123736a2a84a40fc72f4fc42739bc SHA512 5b0a50b24bf86618b9a17d5a09febb08063ef7490649e93d0d131feabeca10c36994905caa2c2c8c51be34e473c1d83b2e1a0965d01df26e82cbc3f8b472e808 WHIRLPOOL f7d1b856ee9bc1480ec2edd0e204dd341d56d00431f9619358a3316f2156df01db68530b1b20ddb3c6e178b27d9a2e94ad82f6a2c1a34ece5b873d28334d59ec diff --git a/games-action/minetest_survival/minetest_survival-0.4.6.ebuild b/games-action/minetest_survival/minetest_survival-0.4.6.ebuild deleted file mode 100644 index 09202771..00000000 --- a/games-action/minetest_survival/minetest_survival-0.4.6.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit games vcs-snapshot - -DESCRIPTION="Survival/Minetest" -HOMEPAGE="https://github.com/minetest/survival" -SRC_URI="https://github.com/minetest/survival/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="~games-action/minetest-${PV}[-dedicated]" - -src_install() { - insinto "${GAMES_DATADIR}"/minetest/games/survival - doins -r mods - doins game.conf - - prepgamesdirs -}