summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGianluca Boiano2019-02-23 22:44:03 +0100
committerGianluca Boiano2019-02-23 22:44:03 +0100
commit1a822d78444a78809ab7d1646870b1462401229f (patch)
tree959bd11d953d1439f1ceda7d2e628cb2ac2b6e40
parent0d0fcedf78e4f8240bae9a6580556bae0f4952cf (diff)
downloadaur-1a822d78444a78809ab7d1646870b1462401229f.tar.gz
xash3d-git: updated
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD29
-rw-r--r--xash3d.dedicated10
3 files changed, 23 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 27346e1d1479..d3705e3878cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xash3d-git
pkgdesc = A custom Gold Source engine rewritten from scratch
- pkgver = r351.142a38f
+ pkgver = r354.faee030
pkgrel = 1
url = http://xash.su/
arch = x86_64
@@ -22,7 +22,7 @@ pkgbase = xash3d-git
md5sums = SKIP
md5sums = 6993fbd2059d81c5a23bf1a3ff6b24b1
md5sums = 7a92aaf374c141f8cc947fbd3fb0d5ca
- md5sums = 427087f57aab9c8944bc604849e3900e
+ md5sums = b1da0a6ee8887a6aa5298f4df86e9916
md5sums = 60d714544048b0383a7e79cfaed96d78
md5sums = 409462da6be03f004e84452cfcb93d6b
diff --git a/PKGBUILD b/PKGBUILD
index 3dbc23320c19..c357956280b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: robertfoster
pkgname=xash3d-git
-pkgver=r351.142a38f
+pkgver=r354.faee030
pkgrel=1
pkgdesc="A custom Gold Source engine rewritten from scratch"
arch=('x86_64')
@@ -27,26 +27,21 @@ pkgver() {
prepare() {
cd $srcdir/$pkgname
git submodule update --init --recursive
+ ./waf configure --prefix=/usr \
+ --build-type=release \
+ --vgui vgui-dev \
+ --enable-stbtt
}
-package() {
+build() {
cd $srcdir/$pkgname/
- ./waf configure --prefix=/usr \
- --dedicated \
- --build-type=release \
- --vgui https://github.com/FWGS/vgui-dev \
- --enable-stbtt
- ./waf --dedicated build
- ./waf --destdir="$pkgdir" --dedicated install
+ ./waf build
+}
- ./waf clean
+package() {
+ cd $srcdir/$pkgname/
- ./waf configure --prefix=/usr \
- --build-type=release \
- --vgui https://github.com/FWGS/vgui-dev \
- --enable-stbtt
- ./waf build
- ./waf --destdir="$pkgdir" install
+ ./waf install --destdir="$pkgdir"
mv $pkgdir/usr/lib $pkgdir/usr/lib32
install -Dm644 ../${pkgname%%-git}.conf.d $pkgdir/etc/conf.d/${pkgname%%-git}
install -Dm755 ../${pkgname%%-git} $pkgdir/usr/bin/${pkgname%%-git}
@@ -59,6 +54,6 @@ package() {
md5sums=('SKIP'
'6993fbd2059d81c5a23bf1a3ff6b24b1'
'7a92aaf374c141f8cc947fbd3fb0d5ca'
- '427087f57aab9c8944bc604849e3900e'
+ 'b1da0a6ee8887a6aa5298f4df86e9916'
'60d714544048b0383a7e79cfaed96d78'
'409462da6be03f004e84452cfcb93d6b')
diff --git a/xash3d.dedicated b/xash3d.dedicated
index 9825d9c12e1c..a6a15257e858 100644
--- a/xash3d.dedicated
+++ b/xash3d.dedicated
@@ -8,4 +8,12 @@ if [ ! -d "$XASH3D_BASEDIR" ]; then
exit 1
fi
-$DEFAULT_LIBPATH/xash3d/xash "$@"
+if [ ! -f "$XASH3D_BASEDIR/valve/dlls/hl.so" ]; then
+ if [ $(uname -m) != "x86_64" ]; then
+ DEFAULT_LIBPATH=/usr/lib
+ fi
+ ln -sr $DEFAULT_LIBPATH/valve/dlls/hl.so "$XASH3D_BASEDIR"/valve/dlls/hl.so
+ ln -sr $DEFAULT_LIBPATH/valve/cl_dlls/client.so "$XASH3D_BASEDIR"/valve/cl_dlls/client.so
+fi
+
+$DEFAULT_LIBPATH/xash3d/xash3d -dedicated "$@"