xash3d-git: general cleanup and dedicated server included

3 files changed, 31 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a445b09468ae..3af7412c4643 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xash3d-git
 	pkgdesc = A custom Gold Source engine rewritten from scratch
-	pkgver = r188.b1db062
+	pkgver = r193.7c772d6
 	pkgrel = 1
 	url = http://xash.su/
 	arch = i686
@@ -9,21 +9,25 @@ pkgbase = xash3d-git
 	arch = armv6h
 	arch = armv7h
 	license = GPL3
-	makedepends = gcc
-	depends = freetype2
-	depends = fontconfig
-	depends = sdl2
-	depends = vgui
+	makedepends = make
+	makedepends = binutils
+	makedepends = cmake
+	backup = etc/conf.d/xash3d
 	source = xash3d-git::git+https://github.com/FWGS/xash3d-fwgs.git
 	source = xash3d
-	source = https://raw.githubusercontent.com/FWGS/xash3d/master/game_launch/icon-xash-material.png
 	source = xash3d.conf.d
+	source = xash3d.dedicated
 	source = xash3d.desktop
 	md5sums = SKIP
 	md5sums = e2507dc0ca2fcd5de9c8d485fa0382ae
-	md5sums = edb56dbd55309beef7d8e82298d48f4d
 	md5sums = f4475bb569ad292f6a3711b74ced7bab
+	md5sums = c44e1cb53d58f7691cec9a82a8e29289
 	md5sums = 60d714544048b0383a7e79cfaed96d78
+	depends_i686 = freetype2
+	depends_i686 = fontconfig
+	depends_i686 = sdl2
+	depends_i686 = vgui
+	makedepends_i686 = gcc
 	depends_x86_64 = lib32-freetype2
 	depends_x86_64 = lib32-fontconfig
 	depends_x86_64 = lib32-sdl2
diff --git a/PKGBUILD b/PKGBUILD
index f3765ce7e657..0383320bb8f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,22 @@
 # Maintainer: robertfoster
 
 pkgname=xash3d-git
-pkgver=r188.b1db062
+pkgver=r193.7c772d6
 pkgrel=1
 pkgdesc="A custom Gold Source engine rewritten from scratch"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
 url="http://xash.su/"
 license=('GPL3')
-depends=('freetype2' 'fontconfig' 'sdl2' 'vgui')
+depends_i686=('freetype2' 'fontconfig' 'sdl2' 'vgui')
 depends_x86_64=('lib32-freetype2' 'lib32-fontconfig' 'lib32-sdl2' 'lib32-vgui')
 makedepends=('make' 'binutils' 'cmake')
-makedepends=('gcc')
+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}
-        "https://raw.githubusercontent.com/FWGS/xash3d/master/game_launch/icon-xash-material.png"
 	${pkgname%%-git}.conf.d
+        ${pkgname%%-git}.dedicated
         ${pkgname%%-git}.desktop
 )
 
@@ -27,26 +28,27 @@ pkgver() {
 prepare() {
 	cd $srcdir/$pkgname
 	git submodule init && git submodule update
-	./waf configure --prefix=/usr --vgui https://github.com/FWGS/vgui-dev
-}
-
-build() {
-	cd $srcdir/$pkgname
-	./waf build
 }
 
 package() {
 	cd $srcdir/$pkgname/
-	./waf --destdir="$pkgdir" install
+        ./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 ../icon-xash-material.png $pkgdir/usr/share/pixmaps/${pkgname%%-git}.png
+        install -Dm644 game_launch/icon-xash-material.png $pkgdir/usr/share/pixmaps/${pkgname%%-git}.png
 }
 
 md5sums=('SKIP'
          'e2507dc0ca2fcd5de9c8d485fa0382ae'
-         'edb56dbd55309beef7d8e82298d48f4d'
          'f4475bb569ad292f6a3711b74ced7bab'
+         'c44e1cb53d58f7691cec9a82a8e29289'
          '60d714544048b0383a7e79cfaed96d78')
diff --git a/xash3d.dedicated b/xash3d.dedicated
new file mode 100644
index 000000000000..5a8233954b42
--- /dev/null
+++ b/xash3d.dedicated
@@ -0,0 +1,4 @@
+#!/bin/sh
+. /etc/conf.d/xash3d
+/usr/lib32/xash3d/xash
+