dfhack-0.43.03-1

6 files changed, 133 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 420cf0b26adf..9e7edc24a89b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,32 @@
 # Generated by mksrcinfo v8
-# Mon Apr 25 11:09:51 UTC 2016
+# Sat Jul  2 11:04:11 UTC 2016
 pkgbase = dfhack
-	pkgdesc = A Dwarf Fortress memory access library and a set of basic tools that use it.
-	pkgver = 0.42.06_r1
+	pkgdesc = memory hacking library for Dwarf Fortress and a set of tools that use it
+	pkgver = 0.43.03
 	pkgrel = 1
-	url = https://github.com/DFHack/dfhack
-	arch = i686
+	url = http://dfhack.readthedocs.io/en/v0.43.03/
 	arch = x86_64
+	arch = i686
 	license = custom
-	depends = dwarffortress=0.42.06
+	makedepends = cmake
+	makedepends = git
+	makedepends = python-sphinx
+	depends = dwarffortress=0.43.03
+	depends = perl-xml-libxslt
+	conflicts = dfhack-bin
 	conflicts = dfhack-git
-	source = dfhack-0.42.06_r1.tar.bz2::https://github.com/DFHack/dfhack/releases/download/0.42.06-r1/dfhack-0.42.06-r1-Linux-gcc-4.5.3.tar.bz2
-	source = dwarffortress-hacked
-	source = dfhack-run
-	sha256sums = 16d320a6ea379270a203745953ea0303be307c748c6436df810e0f3a5d6f093f
-	sha256sums = 8d68139fb2cbb49a25999462974bff5c40ba23028c823fb666507fbc151ac52d
-	sha256sums = f11870300ccd8908733c8869f93ae48b22130ee338412ffcae6f8228875db747
+	source = dfhack::git+https://github.com/DFHack/dfhack#tag=0.43.03-alpha1
+	source = dfhack.sh
+	source = dfhack-run.sh
+	md5sums = SKIP
+	md5sums = 81f5909c1a32391679f968e40f24d5ca
+	md5sums = 3853c6f890d3541f710f2c4833a9e696
+	depends_x86_64 = lib32-glu
+	depends_x86_64 = lib32-gtk2
+	depends_x86_64 = lib32-libjpeg6-turbo
+	depends_x86_64 = lib32-libpng12
+	depends_x86_64 = lib32-libsm
+	makedepends_x86_64 = gcc-multilib
 
 pkgname = dfhack
 
diff --git a/PKGBUILD b/PKGBUILD
index d13ea4dd64a6..fc06a0d04a5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,51 @@
-# Maintainer:  Seylerius <seylerius@seriouslyseylerius.com>
-# Maintainer: Chris Höppner <me@mkaito.com>
+# Maintainer: Christian Krause ("wookietreiber") <kizkizzbangbang@googlemail.com>
+
 pkgname=dfhack
-_pkgver=0.42.06-r1
-pkgver=0.42.06_r1
+pkgver=0.43.03
+_pkgver=$pkgver-alpha1
 pkgrel=1
-pkgdesc="A Dwarf Fortress memory access library and a set of basic tools that use it."
-url="https://github.com/DFHack/dfhack"
-arch=('i686' 'x86_64')
+pkgdesc="memory hacking library for Dwarf Fortress and a set of tools that use it"
+arch=('x86_64' 'i686')
+url="http://dfhack.readthedocs.io/en/v$pkgver/"
 license=('custom')
-depends=('dwarffortress=0.42.06')
-if test "$CARCH" == "x86_64"; then
-  depends+=(lib32-libpng12 lib32-libjpeg6)
-fi
-conflicts=(dfhack-git)
-source=("$pkgname-$pkgver.tar.bz2::https://github.com/DFHack/dfhack/releases/download/0.42.06-r1/dfhack-0.42.06-r1-Linux-gcc-4.5.3.tar.bz2" "dwarffortress-hacked" "dfhack-run")
-sha256sums=('16d320a6ea379270a203745953ea0303be307c748c6436df810e0f3a5d6f093f'
-            '8d68139fb2cbb49a25999462974bff5c40ba23028c823fb666507fbc151ac52d'
-            'f11870300ccd8908733c8869f93ae48b22130ee338412ffcae6f8228875db747')
+depends=("dwarffortress=$pkgver" 'perl-xml-libxslt')
+depends_x86_64=('lib32-glu' 'lib32-gtk2' 'lib32-libjpeg6-turbo' 'lib32-libpng12' 'lib32-libsm')
+makedepends=('cmake' 'git' 'python-sphinx')
+makedepends_x86_64=('gcc-multilib')
+conflicts=('dfhack-bin' 'dfhack-git')
+source=($pkgname::git+https://github.com/DFHack/dfhack#tag=$_pkgver
+        dfhack.sh
+        dfhack-run.sh)
+md5sums=('SKIP'
+         '81f5909c1a32391679f968e40f24d5ca'
+         '3853c6f890d3541f710f2c4833a9e696')
+
+prepare() {
+  cd $srcdir/$pkgname
+
+  git submodule update --init
+}
+
+build() {
+  cd $srcdir/$pkgname/build
+
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/opt/dwarffortress \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_DOCS=ON \
+    -DBUILD_STONESENSE=ON \
+    ..
+
+  make
+}
+
 package() {
-  cd $srcdir
-  mkdir -p $pkgdir/opt/dwarffortress
-  cp -r hack stonesense dfhack dfhack-run dfhack.init-example $pkgdir/opt/dwarffortress
-  cd ..
-  install -Dm755 dwarffortress-hacked $pkgdir/usr/bin/dfhack
-  install -Dm755 dfhack-run $pkgdir/usr/bin/dfhack-run
+  cd $srcdir/$pkgname/build
+
+  make DESTDIR=$pkgdir install
+
+  install -Dm755 $srcdir/dfhack.sh     $pkgdir/usr/bin/dfhack
+  install -Dm755 $srcdir/dfhack-run.sh $pkgdir/usr/bin/dfhack-run
+
+  install -Dm644 ../LICENSE.rst $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/dfhack-run b/dfhack-run
deleted file mode 100755
index c811076acff8..000000000000
--- a/dfhack-run
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-pkgname=dwarffortress
-
-# Check for user DF directory
-
-if [[ ! -d "$HOME/.$pkgname" ]]; then
-    mkdir -p "$HOME/.$pkgname/data"
-    ln -s /opt/"$pkgname"/raw "$HOME/.$pkgname/raw"
-    ln -s /opt/"$pkgname"/libs "$HOME/.$pkgname/libs"
-    cp -rn /opt/"$pkgname"/data/init "$HOME/.$pkgname/data/init"
-fi
-
-# Check for user DFHack installation
-
-if [[ ! -d "$HOME/.$pkgname/hack" ]]; then
-    ln -s /opt/"$pkgname"/hack "$HOME/.$pkgname/hack"
-    ln -s /opt/"$pkgname"/stonesense "$HOME/.$pkgname/stonesense"
-    ln -s /opt/"$pkgname"/dfhack "$HOME/.$pkgname/dfhack"
-    ln -s /opt/"$pkgname"/dfhack.init-example "$HOME/.$pkgname/dfhack.init-example"
-    ln -s /opt/"$pkgname"/dfhack-run "$HOME/.$pkgname/dfhack-run"
-fi
-
-cd "$HOME/.$pkgname"
-exec ./dfhack-run "$@"
\ No newline at end of file
diff --git a/dfhack-run.sh b/dfhack-run.sh
new file mode 100644
index 000000000000..7355a7d58f42
--- /dev/null
+++ b/dfhack-run.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# check for dwarffortress user directory
+if [[ ! -d ~/.dwarffortress ]] ; then
+  mkdir -p ~/.dwarffortress/data
+
+  ln -s  /opt/dwarffortress/raw       ~/.dwarffortress/raw
+  ln -s  /opt/dwarffortress/libs      ~/.dwarffortress/libs
+  cp -rn /opt/dwarffortress/data/init ~/.dwarffortress/data/init
+
+  for link in announcement art dipscript help index initial_movies movies shader.fs shader.vs sound speech ; do
+    cp -r /opt/dwarffortress/data/$link ~/.dwarffortress/data/$link
+  done
+fi
+
+# check for dfhack user directory
+if [[ ! -d ~/.dwarffortress/hack ]] ; then
+  ln -s /opt/dwarffortress/hack                ~/.dwarffortress/hack
+  ln -s /opt/dwarffortress/stonesense          ~/.dwarffortress/stonesense
+  ln -s /opt/dwarffortress/dfhack              ~/.dwarffortress/dfhack
+  ln -s /opt/dwarffortress/dfhack-run          ~/.dwarffortress/dfhack-run
+  ln -s /opt/dwarffortress/dfhack.init-example ~/.dwarffortress/dfhack.init-example
+  cp -r /opt/dwarffortress/dfhack-config       ~/.dwarffortress/dfhack-config
+
+  cp ~/.dwarffortress/dfhack.init{-example,}
+fi
+
+# workaround for bug in Debian/Ubuntu SDL patch
+export SDL_DISABLE_LOCK_KEYS=1
+
+cd ~/.dwarffortress
+exec ./dfhack-run "$@"
diff --git a/dfhack.sh b/dfhack.sh
new file mode 100644
index 000000000000..0acc659db555
--- /dev/null
+++ b/dfhack.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# check for dwarffortress user directory
+if [[ ! -d ~/.dwarffortress ]] ; then
+  mkdir -p ~/.dwarffortress/data
+
+  ln -s  /opt/dwarffortress/raw       ~/.dwarffortress/raw
+  ln -s  /opt/dwarffortress/libs      ~/.dwarffortress/libs
+  cp -rn /opt/dwarffortress/data/init ~/.dwarffortress/data/init
+
+  for link in announcement art dipscript help index initial_movies movies shader.fs shader.vs sound speech ; do
+    cp -r /opt/dwarffortress/data/$link ~/.dwarffortress/data/$link
+  done
+fi
+
+# check for dfhack user directory
+if [[ ! -d ~/.dwarffortress/hack ]] ; then
+  ln -s /opt/dwarffortress/hack                ~/.dwarffortress/hack
+  ln -s /opt/dwarffortress/stonesense          ~/.dwarffortress/stonesense
+  ln -s /opt/dwarffortress/dfhack              ~/.dwarffortress/dfhack
+  ln -s /opt/dwarffortress/dfhack-run          ~/.dwarffortress/dfhack-run
+  ln -s /opt/dwarffortress/dfhack.init-example ~/.dwarffortress/dfhack.init-example
+  cp -r /opt/dwarffortress/dfhack-config       ~/.dwarffortress/dfhack-config
+
+  cp ~/.dwarffortress/dfhack.init{-example,}
+fi
+
+# workaround for bug in Debian/Ubuntu SDL patch
+export SDL_DISABLE_LOCK_KEYS=1
+
+cd ~/.dwarffortress
+exec ./dfhack "$@"
diff --git a/dwarffortress-hacked b/dwarffortress-hacked
deleted file mode 100755
index 98bdab8fe48a..000000000000
--- a/dwarffortress-hacked
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
-#export SDL_VIDEO_CENTERED=1    # Centre the screen.  Messes up resizing.
-
-pkgname=dwarffortress
-
-# Check for user DF directory
-
-if [[ ! -d "$HOME/.$pkgname" ]]; then
-    mkdir -p "$HOME/.$pkgname/data"
-    ln -s /opt/"$pkgname"/raw "$HOME/.$pkgname/raw"
-    ln -s /opt/"$pkgname"/libs "$HOME/.$pkgname/libs"
-    cp -rn /opt/"$pkgname"/data/init "$HOME/.$pkgname/data/init"
-fi
-
-# Check for user DFHack installation
-
-if [[ ! -d "$HOME/.$pkgname/hack" ]]; then
-    ln -s /opt/"$pkgname"/hack "$HOME/.$pkgname/hack"
-    ln -s /opt/"$pkgname"/stonesense "$HOME/.$pkgname/stonesense"
-    ln -s /opt/"$pkgname"/dfhack "$HOME/.$pkgname/dfhack"
-    ln -s /opt/"$pkgname"/dfhack.init-example "$HOME/.$pkgname/dfhack.init-example"
-    ln -s /opt/"$pkgname"/dfhack-run "$HOME/.$pkgname/dfhack-run"
-fi
-
-for link in announcement art dipscript help index initial_movies movies shader.fs shader.vs sound speech; do
-    cp -r /opt/"$pkgname"/data/$link "$HOME/.$pkgname/data/$link"
-done
-
-cd "$HOME/.$pkgname"
-exec ./dfhack "$@"
\ No newline at end of file