xash3d-git: update

2 files changed, 40 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 63b3dc86361f..6b1523d31ddf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xash3d-git
 	pkgdesc = A custom Gold Source engine rewritten from scratch
-	pkgver = r193.7c772d6
+	pkgver = r214.776d1cb
 	pkgrel = 1
 	url = http://xash.su/
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 122ebe223453..f416bd1c21f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: robertfoster
 
 pkgname=xash3d-git
-pkgver=r193.7c772d6
+pkgver=r214.776d1cb
 pkgrel=1
 pkgdesc="A custom Gold Source engine rewritten from scratch"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
@@ -14,44 +14,53 @@ makedepends_i686=('gcc')
 makedepends_x86_64=('gcc-multilib' 'lib32-gcc-libs')
 backup=('etc/conf.d/xash3d')
 source=("$pkgname::git+https://github.com/FWGS/xash3d-fwgs.git"
-	${pkgname%%-git}
-	${pkgname%%-git}.conf.d
-	${pkgname%%-git}.dedicated
-	${pkgname%%-git}.desktop
-	https://github.com/FWGS/xash-extras/releases/download/v0.19.2/extras.pak
+    ${pkgname%%-git}
+    ${pkgname%%-git}.conf.d
+    ${pkgname%%-git}.dedicated
+    ${pkgname%%-git}.desktop
+    https://github.com/FWGS/xash-extras/releases/download/v0.19.2/extras.pak
 )
 
 pkgver() {
-	cd $srcdir/$pkgname
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd $srcdir/$pkgname
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-	cd $srcdir/$pkgname
-	git submodule init && git submodule update
+    cd $srcdir/$pkgname
+    git submodule init && git submodule update
 }
 
 package() {
-	cd $srcdir/$pkgname/
-	./waf configure --prefix=/usr --dedicated --vgui https://github.com/FWGS/vgui-dev --release
-	./waf --dedicated --release build
-	./waf --destdir="$pkgdir" --dedicated --release install
-	./waf clean
-	./waf configure --prefix=/usr --vgui https://github.com/FWGS/vgui-dev --release
-	./waf --release build
-	./waf --destdir="$pkgdir" --release install
-	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}
-	install -Dm755 ../${pkgname%%-git}.dedicated $pkgdir/usr/bin/${pkgname%%-git}-dedicated
-	install -Dm644 ../${pkgname%%-git}.desktop $pkgdir/usr/share/applications/${pkgname%%-git}.desktop
-	install -Dm644 game_launch/icon-xash-material.png $pkgdir/usr/share/pixmaps/${pkgname%%-git}.png
-	install -Dm644 ../extras.pak "$pkgdir"/usr/share/xash3d/extras.pak
+    cd $srcdir/$pkgname/
+    ./waf configure --prefix=/usr \
+        --dedicated \
+        --build-type=release \
+        --vgui https://github.com/FWGS/vgui-dev \
+        --use-stb
+    ./waf --dedicated build
+    ./waf --destdir="$pkgdir" --dedicated install
+
+    ./waf clean
+
+    ./waf configure --prefix=/usr \
+        --build-type=release \
+        --vgui https://github.com/FWGS/vgui-dev \
+        --use-stb
+    ./waf build
+    ./waf --destdir="$pkgdir" install
+    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}
+    install -Dm755 ../${pkgname%%-git}.dedicated $pkgdir/usr/bin/${pkgname%%-git}-dedicated
+    install -Dm644 ../${pkgname%%-git}.desktop $pkgdir/usr/share/applications/${pkgname%%-git}.desktop
+    install -Dm644 game_launch/icon-xash-material.png $pkgdir/usr/share/pixmaps/${pkgname%%-git}.png
+    install -Dm644 ../extras.pak "$pkgdir"/usr/share/xash3d/extras.pak
 }
 
 md5sums=('SKIP'
-         'e2507dc0ca2fcd5de9c8d485fa0382ae'
-         'd82f1f869074b46ee8c5ac8053dcb275'
-         'c44e1cb53d58f7691cec9a82a8e29289'
-         '60d714544048b0383a7e79cfaed96d78'
-         '409462da6be03f004e84452cfcb93d6b')
+    'e2507dc0ca2fcd5de9c8d485fa0382ae'
+    'd82f1f869074b46ee8c5ac8053dcb275'
+    'c44e1cb53d58f7691cec9a82a8e29289'
+    '60d714544048b0383a7e79cfaed96d78'
+'409462da6be03f004e84452cfcb93d6b')