diff options
author | xming <xmingske@gmail.com> | 2015-11-09 14:24:53 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-10 15:44:32 +0000 |
commit | 94dca81462f5ac129800bfe688ac4a76b0e89a5b (patch) | |
tree | fce2e48e7979c1433712ae77bfae69277d5ee71f /community/minetest | |
parent | 7a6e9c8c2a7546836e8e058edb72429bf55a8712 (diff) | |
download | alpine_aports-94dca81462f5ac129800bfe688ac4a76b0e89a5b.tar.bz2 alpine_aports-94dca81462f5ac129800bfe688ac4a76b0e89a5b.tar.xz alpine_aports-94dca81462f5ac129800bfe688ac4a76b0e89a5b.zip |
community/minetest
upgraded to 0.4.13
Diffstat (limited to 'community/minetest')
-rw-r--r-- | community/minetest/APKBUILD | 26 | ||||
-rw-r--r-- | community/minetest/shared-irrlicht.patch | 23 | ||||
-rw-r--r-- | community/minetest/shared-lua.patch | 37 |
3 files changed, 8 insertions, 78 deletions
diff --git a/community/minetest/APKBUILD b/community/minetest/APKBUILD index 746f5e37c2..603df387b6 100644 --- a/community/minetest/APKBUILD +++ b/community/minetest/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: <xmingske@gmail.com> | 1 | # Contributor: <xmingske@gmail.com> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: |
3 | pkgname=minetest | 3 | pkgname=minetest |
4 | pkgver=0.4.12 | 4 | pkgver=0.4.13 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="An infinite-world block sandbox game and a game engine" | 6 | pkgdesc="An infinite-world block sandbox game and a game engine" |
7 | url="http://minetest.net/" | 7 | url="http://minetest.net/" |
8 | arch="all" | 8 | arch="all" |
@@ -13,13 +13,11 @@ pkgusers="minetest" | |||
13 | pkggroups="minetest" | 13 | pkggroups="minetest" |
14 | makedepends="sqlite-dev bzip2-dev openssl-dev irrlicht-dev cmake libvorbis-dev | 14 | makedepends="sqlite-dev bzip2-dev openssl-dev irrlicht-dev cmake libvorbis-dev |
15 | libjpeg-turbo-dev libpng-dev openal-soft-dev libogg-dev mesa-dev | 15 | libjpeg-turbo-dev libpng-dev openal-soft-dev libogg-dev mesa-dev |
16 | sqlite-dev lua5.1-dev hiredis-dev curl-dev" | 16 | sqlite-dev luajit-dev hiredis-dev curl-dev" |
17 | source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/minetest/${pkgname}/tar.gz/${pkgver} | 17 | source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/minetest/${pkgname}/tar.gz/${pkgver} |
18 | minetest-server.confd | 18 | minetest-server.confd |
19 | minetest-server.initd | 19 | minetest-server.initd |
20 | 20 | ||
21 | shared-lua.patch | ||
22 | shared-irrlicht.patch | ||
23 | fix-header-include-namespace.patch | 21 | fix-header-include-namespace.patch |
24 | " | 22 | " |
25 | subpackages="$pkgname-doc $pkgname-common $pkgname-server" | 23 | subpackages="$pkgname-doc $pkgname-common $pkgname-server" |
@@ -37,15 +35,13 @@ prepare() { | |||
37 | } | 35 | } |
38 | 36 | ||
39 | build() { | 37 | build() { |
40 | CFLAGS="${CFLAGS} -std=c99" | ||
41 | CXXFLAGS="${CXXFLAGS} -std=c++11" | ||
42 | mkdir "${_builddir}"/.build_client | 38 | mkdir "${_builddir}"/.build_client |
43 | cd "${_builddir}"/.build_client | 39 | cd "${_builddir}"/.build_client |
44 | cmake -DCUSTOM_BINDIR=/usr/bin \ | 40 | cmake -DCUSTOM_BINDIR=/usr/bin \ |
45 | -DCMAKE_INSTALL_PREFIX=/usr \ | 41 | -DCMAKE_INSTALL_PREFIX=/usr \ |
46 | -DCUSTOM_DOCDIR="/usr/share/doc/${pkgname}" \ | 42 | -DCUSTOM_DOCDIR="/usr/share/doc/${pkgname}" \ |
47 | -DCUSTOM_SHAREDIR="/usr/share/${pkgname}" \ | 43 | -DCUSTOM_SHAREDIR="/usr/share/${pkgname}" \ |
48 | -DDISABLE_LUAJIT=1 \ | 44 | -DDISABLE_LUAJIT=0 \ |
49 | -DBUILD_CLIENT=1 \ | 45 | -DBUILD_CLIENT=1 \ |
50 | -DBUILD_SERVER=0 \ | 46 | -DBUILD_SERVER=0 \ |
51 | -DENABLE_REDIS=0 \ | 47 | -DENABLE_REDIS=0 \ |
@@ -97,21 +93,15 @@ server(){ | |||
97 | cp bin/minetestserver ${subpkgdir}/usr/bin | 93 | cp bin/minetestserver ${subpkgdir}/usr/bin |
98 | } | 94 | } |
99 | 95 | ||
100 | md5sums="67d383346ffa08819d062a65614291d6 minetest-0.4.12.tar.gz | 96 | md5sums="e3385b55faeb1164ac5349dd9b21b461 minetest-0.4.13.tar.gz |
101 | 505dcc499ba84632cc3a5db97e9d56b5 minetest-server.confd | 97 | 505dcc499ba84632cc3a5db97e9d56b5 minetest-server.confd |
102 | 3a83f73d259cd3db8ab7f8fb2c8e2ac4 minetest-server.initd | 98 | 3a83f73d259cd3db8ab7f8fb2c8e2ac4 minetest-server.initd |
103 | 9abfd27a3f46b4b004ed9418eef8820a shared-lua.patch | ||
104 | 83ef89fa320627dffa464f113c3169e6 shared-irrlicht.patch | ||
105 | c6b548384cbc5ee1bf38e59c91cc0dfc fix-header-include-namespace.patch" | 99 | c6b548384cbc5ee1bf38e59c91cc0dfc fix-header-include-namespace.patch" |
106 | sha256sums="b37d663785a1ef9e75ec8513913bbd4fcaf761ccb248f4628d9397c71d4417df minetest-0.4.12.tar.gz | 100 | sha256sums="d77ee70c00a923c3ed2355536997f064a95143d0949a7fc92d725d079edef9f7 minetest-0.4.13.tar.gz |
107 | b8b02cdb070037fe4a0d01279edb9598ecfaa8bedf66ed991c6a00f2edbc5d7b minetest-server.confd | 101 | b8b02cdb070037fe4a0d01279edb9598ecfaa8bedf66ed991c6a00f2edbc5d7b minetest-server.confd |
108 | 91caea447ec06656b3620d8f7b7ba3cd4134adad949c21993e4de3b5fa58be6e minetest-server.initd | 102 | 91caea447ec06656b3620d8f7b7ba3cd4134adad949c21993e4de3b5fa58be6e minetest-server.initd |
109 | 444d406183c3e5c6139386bfc870faef7062067a2a1cb3250c3ef41f02ff9b94 shared-lua.patch | ||
110 | 12d03fb8f9523028dacd5fd45d74dfe901b6d659698cf90aafa8f164018f28cc shared-irrlicht.patch | ||
111 | 7032d4de4a9562c5f2929aecacdfcdb54d0cb121c42b852cb682bc072386461c fix-header-include-namespace.patch" | 103 | 7032d4de4a9562c5f2929aecacdfcdb54d0cb121c42b852cb682bc072386461c fix-header-include-namespace.patch" |
112 | sha512sums="f626debaa2c63a80ce3e1ac7e779db3210f69e683363a3c936d5dc15f0d4766a2986e85ab6148d922ac7d0db0bad3fbc6784319ea25371bf835c553970dcd271 minetest-0.4.12.tar.gz | 104 | sha512sums="1947d6ec755259c733fedd9d5dbc48904b380dc6e4d0eb665ed4f5522b2db5b8dd963b41bbf73d5dca80a88350fec849dc9f57833d63456a265b22ea54a31ede minetest-0.4.13.tar.gz |
113 | 7bca17dc0bd59db9c07c160677498aa09297026104e922bf93b7629c274d0aebd226af60c5e82f49ffe3cc5c1e4448e3798b6c2a44144fc6eca4d3aaed3384bb minetest-server.confd | 105 | 7bca17dc0bd59db9c07c160677498aa09297026104e922bf93b7629c274d0aebd226af60c5e82f49ffe3cc5c1e4448e3798b6c2a44144fc6eca4d3aaed3384bb minetest-server.confd |
114 | c27aea87468538b48b5e0a66fa5cdde4fc67f3c00a0e57f359a2f044a31c5617d1b5f3dec72e015537ee3bf126bd1073878c0f4447de67db9be2c4cf21416dd7 minetest-server.initd | 106 | c27aea87468538b48b5e0a66fa5cdde4fc67f3c00a0e57f359a2f044a31c5617d1b5f3dec72e015537ee3bf126bd1073878c0f4447de67db9be2c4cf21416dd7 minetest-server.initd |
115 | 0716ea12458533b5687d84ac6b3047d8b257b9c1ccef807586dee7ef392ffbd19157e04a63c67ce3d3f221111c5ff12c02e8f9b224a31a7653ebd3f073487e79 shared-lua.patch | ||
116 | d737d076db32bf62df73f6568f7423511ee27573c08fb975c8d876f7cd56a8f942804ed667b9988f3048cb1efdb52fca0ae9a4f1ff1e912607c7d3765b6149e7 shared-irrlicht.patch | ||
117 | d64cf27fd7a8d4c8e5c0a571cc72716543f45b81dc2f02ac150369de9ac1a2edb01c6496292022f24b660333033a7b1f80bef56d1bcb0ff97e16a9a8a691d235 fix-header-include-namespace.patch" | 107 | d64cf27fd7a8d4c8e5c0a571cc72716543f45b81dc2f02ac150369de9ac1a2edb01c6496292022f24b660333033a7b1f80bef56d1bcb0ff97e16a9a8a691d235 fix-header-include-namespace.patch" |
diff --git a/community/minetest/shared-irrlicht.patch b/community/minetest/shared-irrlicht.patch deleted file mode 100644 index b552c09370..0000000000 --- a/community/minetest/shared-irrlicht.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84 | ||
2 | Author: hasufell <julian.ospald@googlemail.com> | ||
3 | Date: Sat Jun 8 13:40:30 2013 +0200 | ||
4 | |||
5 | CMAKE: use shared lib from Irrlicht | ||
6 | |||
7 | diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake | ||
8 | index bd00422..4632993 100644 | ||
9 | --- a/cmake/Modules/FindIrrlicht.cmake | ||
10 | +++ b/cmake/Modules/FindIrrlicht.cmake | ||
11 | @@ -50,10 +50,11 @@ else() | ||
12 | /usr/include/irrlicht | ||
13 | ) | ||
14 | |||
15 | - FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht | ||
16 | + FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht | ||
17 | PATHS | ||
18 | /usr/local/lib | ||
19 | /usr/lib | ||
20 | + /usr/lib64 | ||
21 | ) | ||
22 | endif() | ||
23 | |||
diff --git a/community/minetest/shared-lua.patch b/community/minetest/shared-lua.patch deleted file mode 100644 index c31c8514ea..0000000000 --- a/community/minetest/shared-lua.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | --- a/src/CMakeLists.txt | ||
2 | +++ b/src/CMakeLists.txt | ||
3 | @@ -215,8 +215,6 @@ | ||
4 | message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}") | ||
5 | else (NOT ${DISABLE_LUAJIT} MATCHES "1") | ||
6 | message (STATUS "LuaJIT detection disabled! (DISABLE_LUAJIT=1)") | ||
7 | - set(LUA_LIBRARY "") | ||
8 | - set(LUA_INCLUDE_DIR "") | ||
9 | endif (NOT DISABLE_LUAJIT) | ||
10 | |||
11 | set(USE_LUAJIT 0) | ||
12 | @@ -267,11 +265,22 @@ | ||
13 | endif (VALID_LUAJIT_VERSION) | ||
14 | endif (LUA_LIBRARY AND LUA_INCLUDE_DIR) | ||
15 | |||
16 | +OPTION(WITH_BUNDLED_LUA "Use bundled lua") | ||
17 | + | ||
18 | if(NOT USE_LUAJIT) | ||
19 | message (STATUS "LuaJIT not found, using bundled Lua.") | ||
20 | - set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") | ||
21 | - set(LUA_LIBRARY "lua") | ||
22 | - add_subdirectory(lua) | ||
23 | + if (WITH_BUNDLED_LUA) | ||
24 | + set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") | ||
25 | + set(LUA_LIBRARY "lua") | ||
26 | + add_subdirectory(lua) | ||
27 | + else (WITH_BUNDLED_LUA) | ||
28 | + find_package(Lua51) | ||
29 | + if(LUA51_FOUND) | ||
30 | + message (STATUS "Lua51 found") | ||
31 | + else(LUA51_FOUND) | ||
32 | + message (FATAL_ERROR "Lua51 not found!") | ||
33 | + endif(LUA51_FOUND) | ||
34 | + endif(WITH_BUNDLED_LUA) | ||
35 | endif(NOT USE_LUAJIT) | ||
36 | |||
37 | mark_as_advanced(LUA_LIBRARY) | ||