Commit 94dca814 authored by xming's avatar xming Committed by Natanael Copa

community/minetest

upgraded to 0.4.13
parent 7a6e9c8c
# Contributor: <xmingske@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer:
pkgname=minetest
pkgver=0.4.12
pkgrel=1
pkgver=0.4.13
pkgrel=0
pkgdesc="An infinite-world block sandbox game and a game engine"
url="http://minetest.net/"
arch="all"
......@@ -13,13 +13,11 @@ pkgusers="minetest"
pkggroups="minetest"
makedepends="sqlite-dev bzip2-dev openssl-dev irrlicht-dev cmake libvorbis-dev
libjpeg-turbo-dev libpng-dev openal-soft-dev libogg-dev mesa-dev
sqlite-dev lua5.1-dev hiredis-dev curl-dev"
sqlite-dev luajit-dev hiredis-dev curl-dev"
source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/minetest/${pkgname}/tar.gz/${pkgver}
minetest-server.confd
minetest-server.initd
shared-lua.patch
shared-irrlicht.patch
fix-header-include-namespace.patch
"
subpackages="$pkgname-doc $pkgname-common $pkgname-server"
......@@ -37,15 +35,13 @@ prepare() {
}
build() {
CFLAGS="${CFLAGS} -std=c99"
CXXFLAGS="${CXXFLAGS} -std=c++11"
mkdir "${_builddir}"/.build_client
cd "${_builddir}"/.build_client
cmake -DCUSTOM_BINDIR=/usr/bin \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCUSTOM_DOCDIR="/usr/share/doc/${pkgname}" \
-DCUSTOM_SHAREDIR="/usr/share/${pkgname}" \
-DDISABLE_LUAJIT=1 \
-DDISABLE_LUAJIT=0 \
-DBUILD_CLIENT=1 \
-DBUILD_SERVER=0 \
-DENABLE_REDIS=0 \
......@@ -97,21 +93,15 @@ server(){
cp bin/minetestserver ${subpkgdir}/usr/bin
}
md5sums="67d383346ffa08819d062a65614291d6 minetest-0.4.12.tar.gz
md5sums="e3385b55faeb1164ac5349dd9b21b461 minetest-0.4.13.tar.gz
505dcc499ba84632cc3a5db97e9d56b5 minetest-server.confd
3a83f73d259cd3db8ab7f8fb2c8e2ac4 minetest-server.initd
9abfd27a3f46b4b004ed9418eef8820a shared-lua.patch
83ef89fa320627dffa464f113c3169e6 shared-irrlicht.patch
c6b548384cbc5ee1bf38e59c91cc0dfc fix-header-include-namespace.patch"
sha256sums="b37d663785a1ef9e75ec8513913bbd4fcaf761ccb248f4628d9397c71d4417df minetest-0.4.12.tar.gz
sha256sums="d77ee70c00a923c3ed2355536997f064a95143d0949a7fc92d725d079edef9f7 minetest-0.4.13.tar.gz
b8b02cdb070037fe4a0d01279edb9598ecfaa8bedf66ed991c6a00f2edbc5d7b minetest-server.confd
91caea447ec06656b3620d8f7b7ba3cd4134adad949c21993e4de3b5fa58be6e minetest-server.initd
444d406183c3e5c6139386bfc870faef7062067a2a1cb3250c3ef41f02ff9b94 shared-lua.patch
12d03fb8f9523028dacd5fd45d74dfe901b6d659698cf90aafa8f164018f28cc shared-irrlicht.patch
7032d4de4a9562c5f2929aecacdfcdb54d0cb121c42b852cb682bc072386461c fix-header-include-namespace.patch"
sha512sums="f626debaa2c63a80ce3e1ac7e779db3210f69e683363a3c936d5dc15f0d4766a2986e85ab6148d922ac7d0db0bad3fbc6784319ea25371bf835c553970dcd271 minetest-0.4.12.tar.gz
sha512sums="1947d6ec755259c733fedd9d5dbc48904b380dc6e4d0eb665ed4f5522b2db5b8dd963b41bbf73d5dca80a88350fec849dc9f57833d63456a265b22ea54a31ede minetest-0.4.13.tar.gz
7bca17dc0bd59db9c07c160677498aa09297026104e922bf93b7629c274d0aebd226af60c5e82f49ffe3cc5c1e4448e3798b6c2a44144fc6eca4d3aaed3384bb minetest-server.confd
c27aea87468538b48b5e0a66fa5cdde4fc67f3c00a0e57f359a2f044a31c5617d1b5f3dec72e015537ee3bf126bd1073878c0f4447de67db9be2c4cf21416dd7 minetest-server.initd
0716ea12458533b5687d84ac6b3047d8b257b9c1ccef807586dee7ef392ffbd19157e04a63c67ce3d3f221111c5ff12c02e8f9b224a31a7653ebd3f073487e79 shared-lua.patch
d737d076db32bf62df73f6568f7423511ee27573c08fb975c8d876f7cd56a8f942804ed667b9988f3048cb1efdb52fca0ae9a4f1ff1e912607c7d3765b6149e7 shared-irrlicht.patch
d64cf27fd7a8d4c8e5c0a571cc72716543f45b81dc2f02ac150369de9ac1a2edb01c6496292022f24b660333033a7b1f80bef56d1bcb0ff97e16a9a8a691d235 fix-header-include-namespace.patch"
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()
--- 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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment