Date: Saturday, August 23, 2014 @ 16:57:32
Author: bpiotrowski
Revision: 117811
upgpkg: minetest 0.4.10-4
- add minetest@.service to minetest-server and create coresponding user via
install files
- move /usr/share/minetest/doc to minetest-common
- drop useless patch
Modified:
minetest/trunk/PKGBUILD
Deleted:
minetest/trunk/optional-opengles.patch
-+
PKGBUILD| 23 ---
optional-opengles.patch | 30 --
2 files changed, 16 insertions(+), 37 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-08-23 13:15:33 UTC (rev 117810)
+++ PKGBUILD2014-08-23 14:57:32 UTC (rev 117811)
@@ -4,17 +4,18 @@
pkgname=('minetest' 'minetest-server' 'minetest-common')
pkgver=0.4.10
-pkgrel=3
-pkgdesc='An Infiniminer/Minecraft inspired game'
+pkgrel=4
arch=('i686' 'x86_64')
url='http://minetest.net/'
license=('GPL')
makedepends=('sqlite' 'freetype2' 'leveldb' 'openal' 'libvorbis' 'curl'
'irrlicht'
- 'hicolor-icon-theme' 'luajit' 'cmake')
+ 'hicolor-icon-theme' 'luajit' 'cmake')
source=(https://github.com/minetest/minetest/archive/$pkgver.tar.gz
-
data-$pkgver.tar.gz::https://github.com/minetest/minetest_game/archive/$pkgver.tar.gz)
+
data-$pkgver.tar.gz::https://github.com/minetest/minetest_game/archive/$pkgver.tar.gz
+minetest@.service)
md5sums=('61bb35c9d5521f1b072bc3c3e634c863'
- '398d83431c44fb85f02bd902b016338c')
+ '398d83431c44fb85f02bd902b016338c'
+ 'ec193b09eb85f2518aaa17506ad06c57')
prepare() {
install -d build-{client,server}
@@ -48,13 +49,13 @@
pkgdesc='Multiplayer infinite-world block sandbox game'
depends=('minetest-common' 'irrlicht' 'curl' 'luajit' 'libvorbis' 'sqlite'
'openal' 'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils')
- install=minetest.install
+ install=$pkgname.install
cd build-client
make DESTDIR=$pkgdir install
cp -r locale $pkgdir/usr/share/
- rm -rf $pkgdir/usr/share/minetest
+ rm -rf $pkgdir/usr/share/{minetest,doc}
rm $pkgdir/usr/share/man/man6/minetestserver.6
}
@@ -61,9 +62,13 @@
package_minetest-server() {
pkgdesc='Server of infinite-world block sandbox game'
depends=('minetest-common' 'leveldb' 'luajit' 'curl' 'sqlite')
+ install=$pkgname.install
cd build-server
make DESTDIR=$pkgdir install
+ install -d $pkgdir/etc/minetest
+ install -Dm644 ../minetest@.service \
+$pkgdir/usr/lib/systemd/system/minetest@.service
rm -rf $pkgdir/usr/share/{minetest,appdata,applications,icons,doc}
rm $pkgdir/usr/share/man/man6/minetest.6
@@ -78,4 +83,8 @@
cp -r games builtin client fonts textures $pkgdir/usr/share/minetest/
cp -r $srcdir/minetest_game-$pkgver
$pkgdir/usr/share/minetest/games/minetest
rm $pkgdir/usr/share/minetest/games/minetest/.gitignore
+
+ for file in doc/{lua_api,mapformat,menu_lua_api}.txt minetest.conf.example;
do
+install -Dm644 $file $pkgdir/usr/share/minetest/doc/$(basename $file)
+ done
}
Deleted: optional-opengles.patch
===
--- optional-opengles.patch 2014-08-23 13:15:33 UTC (rev 117810)
+++ optional-opengles.patch 2014-08-23 14:57:32 UTC (rev 117811)
@@ -1,30 +0,0 @@
-From 160e2b7b7d1edc7630db0eb0ebbd796a66aab89a Mon Sep 17 00:00:00 2001
-From: Sfan5 sf...@live.de
-Date: Fri, 3 Jan 2014 10:17:01 +0100
-Subject: [PATCH] Add option to link to OpenGL ES, fixes #1051
-
- src/CMakeLists.txt | 7 ++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 90f5867..6418b3b 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -170,7 +170,12 @@ endif()
-
- find_package(Sqlite3 REQUIRED)
- find_package(Json REQUIRED)
--find_package(OpenGLES2)
-+
-+option(ENABLE_GLES Enable OpenGL ES support 0)
-+mark_as_advanced(ENABLE_GLES)
-+if(ENABLE_GLES)
-+ find_package(OpenGLES2)
-+endif(ENABLE_GLES)
-
- if(USE_FREETYPE)
- find_package(Freetype REQUIRED)
---
-1.8.5.1
-
