xash3d-git: updated

5 files changed, 77 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ee438e449f1..4a1d04832bd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = xash3d-git
 	pkgdesc = A custom Gold Source engine rewritten from scratch
-	pkgver = r717.7be094b
+	pkgver = r976.09203dc
 	pkgrel = 1
 	url = http://xash.su/
 	arch = x86_64
 	license = GPL3
-	makedepends = gcc-multilib
-	makedepends = lib32-gcc-libs
-	depends = lib32-freetype2
-	depends = lib32-fontconfig
-	depends = lib32-sdl2
+	makedepends = gcc
+	makedepends = gcc-libs
+	depends = freetype2
+	depends = fontconfig
+	depends = sdl2
 	depends = xash3d-hlsdk
 	backup = etc/conf.d/xash3d
 	source = xash3d-git::git+https://github.com/FWGS/xash3d-fwgs
@@ -19,9 +19,9 @@ pkgbase = xash3d-git
 	source = xash3d.desktop
 	source = https://github.com/FWGS/xash-extras/releases/download/v0.19.2/extras.pak
 	md5sums = SKIP
-	md5sums = 6993fbd2059d81c5a23bf1a3ff6b24b1
-	md5sums = 7a92aaf374c141f8cc947fbd3fb0d5ca
-	md5sums = b1da0a6ee8887a6aa5298f4df86e9916
+	md5sums = 5455a774fc831160e6071df62413f0cc
+	md5sums = 2f9f7b77e05177961fdcecc4660a2010
+	md5sums = aa2aac6a4cd9fc0a3b1d2b0d2acdd5c3
 	md5sums = 60d714544048b0383a7e79cfaed96d78
 	md5sums = 409462da6be03f004e84452cfcb93d6b
 
diff --git a/PKGBUILD b/PKGBUILD
index cbdc576ebdfb..c3b0c2c1baea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,87 +1,86 @@
 # Maintainer: robertfoster
 
 pkgname=xash3d-git
-pkgver=r717.7be094b
+pkgver=r976.09203dc
 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' 'xash3d-hlsdk')
+depends=('freetype2' 'fontconfig' 'sdl2' 'xash3d-hlsdk')
 makedepends=('make' 'binutils' 'cmake')
-makedepends=('gcc-multilib' 'lib32-gcc-libs')
+makedepends=('gcc' 'gcc-libs')
 backup=('etc/conf.d/xash3d')
 source=("$pkgname::git+https://github.com/FWGS/xash3d-fwgs"
-	${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
 )
+_args="--prefix=/usr \
+--libdir=/usr/lib \
+--build-type=release \
+--disable-vgui \
+--enable-stbtt"
+
+if [ $CARCH == "x86_64" ]; then
+    _args+=" -8"
+fi
 
 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 update --init --recursive
+    cd $srcdir/$pkgname
+    git submodule update --init --recursive
 }
 
 prepare_xash3d() {
-	cd $srcdir/$pkgname
-	./waf configure --prefix=/usr \
-		--libdir=/usr/lib32 \
-		--build-type=release \
-		--disable-vgui \
-		--enable-stbtt
+    cd $srcdir/$pkgname
+    ./waf configure ${_args}
 }
 
 prepare_xash3ds() {
-	cd $srcdir/$pkgname
-	./waf clean
-	./waf configure --prefix=/usr \
-		--libdir=/usr/lib32 \
-		--build-type=release \
-		--disable-vgui \
-		--enable-stbtt \
-		--dedicated
+    cd $srcdir/$pkgname
+    ./waf clean
+    ./waf configure ${_args} --dedicated
 }
 
 build_both() {
-	cd $srcdir/$pkgname
-	./waf build
+    cd $srcdir/$pkgname
+    ./waf build
 }
 
 install_both() {
-	cd $srcdir/$pkgname
-	./waf install --destdir="$pkgdir"
+    cd $srcdir/$pkgname
+    ./waf install --destdir="$pkgdir"
 }
 
 package() {
-	msg2 "Preparing xash3d compilation..."
-	prepare_xash3d
-	build_both
-	install_both
-	msg2 "Preparing xash3d dedicated compilation..."
-	prepare_xash3ds
-	build_both
-	install_both
-
-	mv $pkgdir/usr/lib $pkgdir/usr/lib32
-	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
+    msg2 "Preparing xash3d compilation..."
+    prepare_xash3d
+    build_both
+    install_both
+    msg2 "Preparing xash3d dedicated compilation..."
+    prepare_xash3ds
+    build_both
+    install_both
+    
+    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'
-	'6993fbd2059d81c5a23bf1a3ff6b24b1'
-	'7a92aaf374c141f8cc947fbd3fb0d5ca'
-	'b1da0a6ee8887a6aa5298f4df86e9916'
-	'60d714544048b0383a7e79cfaed96d78'
-'409462da6be03f004e84452cfcb93d6b')
+         '5455a774fc831160e6071df62413f0cc'
+         '2f9f7b77e05177961fdcecc4660a2010'
+         'aa2aac6a4cd9fc0a3b1d2b0d2acdd5c3'
+         '60d714544048b0383a7e79cfaed96d78'
+         '409462da6be03f004e84452cfcb93d6b')
diff --git a/xash3d b/xash3d
index c6d0a01a79c2..88693bf662bc 100644
--- a/xash3d
+++ b/xash3d
@@ -1,19 +1,19 @@
 #!/bin/sh
 . /etc/conf.d/xash3d
 
-DEFAULT_LIBPATH=/usr/lib32
+DEFAULT_LIBPATH=/usr/lib
 
 if [ ! -d "$XASH3D_BASEDIR" ]; then
-	echo "$XASH3D_BASEDIR not found"
-	exit 1
+    echo "$XASH3D_BASEDIR not found"
+    exit 1
 fi
 
-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
+if [ $(uname -m) == "x86_64" ] && [ ! -f "$XASH3D_BASEDIR/valve/dlls/hl_amd64.so" ]; then
+    ln -sr $DEFAULT_LIBPATH/valve/dlls/hl_amd64.so "$XASH3D_BASEDIR"/valve/dlls/hl_amd64.so
+    ln -sr $DEFAULT_LIBPATH/valve/cl_dlls/client_amd64.so "$XASH3D_BASEDIR"/valve/cl_dlls/client_amd64.so
+elif [ ! -f "$XASH3D_BASEDIR/valve/dlls/hl.so" ]; then
+    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 "$@"
diff --git a/xash3d.conf.d b/xash3d.conf.d
index ded8142128bb..730d6777ac6a 100755
--- a/xash3d.conf.d
+++ b/xash3d.conf.d
@@ -2,7 +2,7 @@
 export XASH3D_BASEDIR="path where is placed valve folder (check /etc/conf.d/xash3d)"
 
 # Don't move it if you don't know what does it mean
-export LD_LIBRARY_PATH+="/usr/lib/xash3d:/usr/lib32/xash3d"
+export LD_LIBRARY_PATH+="/usr/lib/xash3d"
 
 # Path for extras.pak
 export XASH3D_EXTRAS_PAK1="/usr/share/xash3d/extras.pak"
diff --git a/xash3d.dedicated b/xash3d.dedicated
index a6a15257e858..a7ed8b1d3cf1 100644
--- a/xash3d.dedicated
+++ b/xash3d.dedicated
@@ -1,19 +1,19 @@
 #!/bin/sh
 . /etc/conf.d/xash3d
 
-DEFAULT_LIBPATH=/usr/lib32
+DEFAULT_LIBPATH=/usr/lib
 
 if [ ! -d "$XASH3D_BASEDIR" ]; then
 	echo "$XASH3D_BASEDIR not found"
 	exit 1
 fi
 
-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
+if [ $(uname -m) == "x86_64" ] && [ ! -f "$XASH3D_BASEDIR/valve/dlls/hl_amd64.so" ]; then
+    ln -sr $DEFAULT_LIBPATH/valve/dlls/hl_amd64.so "$XASH3D_BASEDIR"/valve/dlls/hl_amd64.so
+    ln -sr $DEFAULT_LIBPATH/valve/cl_dlls/client_amd64.so "$XASH3D_BASEDIR"/valve/cl_dlls/client_amd64.so
+elif [ ! -f "$XASH3D_BASEDIR/valve/dlls/hl.so" ]; then
+    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 "$@"