[arch-commits] Commit in minetest/trunk (PKGBUILD minetest.install)

[Bartłomiej Piotrowski]

    Date: Friday, August 22, 2014 @ 10:44:21
  Author: bpiotrowski
Revision: 117747

upgpkg: minetest 0.4.10-3

split the package into client, server and data common packages

Modified:
  minetest/trunk/PKGBUILD
  minetest/trunk/minetest.install

------------------+
 PKGBUILD         |   79 +++++++++++++++++++++++++++++++++++++++--------------
 minetest.install |   13 ++------
 2 files changed, 63 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-22 07:46:47 UTC (rev 117746)
+++ PKGBUILD	2014-08-22 08:44:21 UTC (rev 117747)
@@ -2,41 +2,80 @@
 # Maintainer: Laurent Carlier <lordheavym at gmail.com>
 # Contributor: Konsta Kokkinen <kray at tsundere.fi>
 
-pkgname=minetest
+pkgname=('minetest' 'minetest-server' 'minetest-common')
 pkgver=0.4.10
-pkgrel=2
+pkgrel=3
 pkgdesc='An Infiniminer/Minecraft inspired game'
 arch=('i686' 'x86_64')
 url='http://minetest.net/'
 license=('GPL')
-depends=('sqlite' 'freetype2' 'leveldb' 'openal' 'libvorbis' 'curl' 'irrlicht'
-         'hicolor-icon-theme' 'luajit')
-makedepends=('cmake')
-install=minetest.install
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}
-	${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver})
-sha256sums=('05d15c8e2c8e53ee9d3006e79c2b59200311a7b879220d8b6f6a6fd2acf806b6'
-            '7624a1e64124c4438256719ccecfc44fe5139733a076394aedad1f785e50019f')
+makedepends=('sqlite' 'freetype2' 'leveldb' 'openal' 'libvorbis' 'curl' 'irrlicht'
+         '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)
+md5sums=('61bb35c9d5521f1b072bc3c3e634c863'
+         '398d83431c44fb85f02bd902b016338c')
 
+prepare() {
+  install -d build-{client,server}
+}
+
 build() {
-  cd "$srcdir"/minetest-minetest-*
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_GETTEXT=on \
+  cd "$srcdir"/build-client
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SERVER=0 \
+    -DENABLE_GETTEXT=1 \
     -DENABLE_FREETYPE=1 \
-    -DENABLE_LEVELDB=on \
+    -DENABLE_LEVELDB=0 \
+    -DENABLE_REDIS=0 \
     -DLUA_INCLUDE_DIR=/usr/include/luajit-2.0 \
     -DLUA_LIBRARY=//usr/lib/libluajit-5.1.so.2
   make
+
+  cd "$srcdir"/build-server
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_CLIENT=0 \
+    -DENABLE_LEVELDB=1 \
+    -DENABLE_REDIS=1 \
+    -DLUA_INCLUDE_DIR=/usr/include/luajit-2.0 \
+    -DLUA_LIBRARY=//usr/lib/libluajit-5.1.so.2
+  make
 }
 
-package() {
-  cd "$srcdir"/minetest-minetest-*
+package_minetest() {
+  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
 
+  cd build-client
   make DESTDIR="$pkgdir" install
+  cp -r locale "$pkgdir"/usr/share/
 
-  mv -v "$srcdir"/minetest-minetest_game-* "$pkgdir"/usr/share/minetest/games/minetest
-  
-  # small cleanup
+  rm -rf "$pkgdir"/usr/share/minetest
+  rm "$pkgdir"/usr/share/man/man6/minetestserver.6
+}
+
+package_minetest-server() {
+  pkgdesc='Server of infinite-world block sandbox game'
+  depends=('minetest-common' 'leveldb' 'luajit' 'curl' 'sqlite')
+
+  cd build-server
+  make DESTDIR="$pkgdir" install
+
+  rm -rf "$pkgdir"/usr/share/{minetest,appdata,applications,icons,doc}
+  rm "$pkgdir"/usr/share/man/man6/minetest.6
+}
+
+package_minetest-common() {
+  pkgdesc='Common data files for minetest and minetest-server'
+
+  cd $pkgbase-$pkgver
+  install -d "$pkgdir"/usr/share/minetest
+
+  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
 }

Modified: minetest.install
===================================================================
--- minetest.install	2014-08-22 07:46:47 UTC (rev 117746)
+++ minetest.install	2014-08-22 08:44:21 UTC (rev 117747)
@@ -1,17 +1,12 @@
 post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
-  update-desktop-database > /dev/null 2>&1
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database &>/dev/null
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  update-desktop-database > /dev/null 2>&1
-}
-
 post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1     
-  update-desktop-database > /dev/null 2>&1
+  post_install
 }