xash3d-git: remove vgui support

2 files changed, 43 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3705e3878cc..c254017f7a31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xash3d-git
 	pkgdesc = A custom Gold Source engine rewritten from scratch
-	pkgver = r354.faee030
+	pkgver = r358.94cbb4e
 	pkgrel = 1
 	url = http://xash.su/
 	arch = x86_64
@@ -10,7 +10,6 @@ pkgbase = xash3d-git
 	depends = lib32-freetype2
 	depends = lib32-fontconfig
 	depends = lib32-sdl2
-	depends = lib32-vgui
 	depends = xash3d-hlsdk
 	backup = etc/conf.d/xash3d
 	source = xash3d-git::git+https://github.com/FWGS/xash3d-fwgs
diff --git a/PKGBUILD b/PKGBUILD
index c357956280b1..9ec5d398a4d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: robertfoster
 
 pkgname=xash3d-git
-pkgver=r354.faee030
+pkgver=r358.94cbb4e
 pkgrel=1
 pkgdesc="A custom Gold Source engine rewritten from scratch"
 arch=('x86_64')
 url="http://xash.su/"
 license=('GPL3')
-depends=('lib32-freetype2' 'lib32-fontconfig' 'lib32-sdl2' 'lib32-vgui' 'xash3d-hlsdk')
+depends=('lib32-freetype2' 'lib32-fontconfig' 'lib32-sdl2' 'xash3d-hlsdk')
 makedepends=('make' 'binutils' 'cmake')
 makedepends=('gcc-multilib' 'lib32-gcc-libs')
 backup=('etc/conf.d/xash3d')
@@ -27,28 +27,56 @@ pkgver() {
 prepare() {
 	cd $srcdir/$pkgname
 	git submodule update --init --recursive
+}
+
+prepare_xash3d() {
+	cd $srcdir/$pkgname
 	./waf configure --prefix=/usr \
-                --build-type=release \
-                --vgui vgui-dev \
+	--libdir=/usr/lib32 \
+    --build-type=release \
+    --disable-vgui \
 	--enable-stbtt
 }
 
-build() {
-	cd $srcdir/$pkgname/
+prepare_xash3ds() {
+	cd $srcdir/$pkgname
+	./waf clean
+	./waf configure --prefix=/usr \
+	--libdir=/usr/lib32 \
+    --build-type=release \
+    --disable-vgui \
+	--enable-stbtt \
+	--dedicated
+}
+
+build_both() {
+	cd $srcdir/$pkgname
 	./waf build
 }
 
+install_both() {
+	cd $srcdir/$pkgname
+	./waf install --destdir="$pkgdir"
+}
+
 package() {
-	cd $srcdir/$pkgname/
+	msg2 "Preparing xash3d compilation..."
+	prepare_xash3d
+	build_both
+	install_both
+	msg2 "Preparing xash3d dedicated compilation..."
+	prepare_xash3ds
+	build_both
+	install_both
 
-	./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}
-	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
+	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 $pkgname/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'