xash3d-git: x86_64 is not ready: revert to multilib config

4 files changed, 35 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b1bff54b187..b6547ffb0814 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,11 +5,9 @@ pkgbase = xash3d-git
 	url = http://xash.su/
 	arch = x86_64
 	license = GPL3
-	makedepends = gcc
-	makedepends = gcc-libs
-	depends = freetype2
-	depends = fontconfig
-	depends = sdl2
+	makedepends = make
+	makedepends = binutils
+	makedepends = cmake
 	depends = xash3d-hlsdk
 	backup = etc/conf.d/xash3d
 	source = xash3d-git::git+https://github.com/FWGS/xash3d-fwgs
@@ -19,11 +17,17 @@ pkgbase = xash3d-git
 	source = xash3d.desktop
 	source = https://github.com/FWGS/xash-extras/releases/download/v0.19.2/extras.pak
 	md5sums = SKIP
-	md5sums = ca89e0d9d9b28f2a0657dd96d1ddae66
+	md5sums = 71f6125d9270685a05067e597e527747
 	md5sums = 2f9f7b77e05177961fdcecc4660a2010
-	md5sums = 45bdee1a2166ac9caeb9a5030cf65b29
+	md5sums = c1f2f0000496b1a6e6763ac8fb25fed9
 	md5sums = 60d714544048b0383a7e79cfaed96d78
 	md5sums = 409462da6be03f004e84452cfcb93d6b
+	depends_x86_64 = lib32-freetype2
+	depends_x86_64 = lib32-fontconfig
+	depends_x86_64 = lib32-libpulse
+	depends_x86_64 = lib32-sdl2
+	makedepends_x86_64 = gcc-multilib
+	makedepends_x86_64 = lib32-gcc-libs
 
 pkgname = xash3d-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6adb957702fc..053b4932fab9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,12 @@ pkgdesc="A custom Gold Source engine rewritten from scratch"
 arch=('x86_64')
 url="http://xash.su/"
 license=('GPL3')
-depends=('freetype2' 'fontconfig' 'sdl2' 'xash3d-hlsdk')
+depends=('xash3d-hlsdk')
+depends_i686=('freetype2' 'fontconfig' 'libpulse' 'sdl2')
+depends_x86_64=('lib32-freetype2' 'lib32-fontconfig' 'lib32-libpulse' 'lib32-sdl2')
 makedepends=('make' 'binutils' 'cmake')
-makedepends=('gcc' 'gcc-libs')
+makedepends_i686=('gcc' 'gcc-libs')
+makedepends_x86_64=('gcc-multilib' 'lib32-gcc-libs')
 backup=('etc/conf.d/xash3d')
 source=("$pkgname::git+https://github.com/FWGS/xash3d-fwgs"
     ${pkgname%%-git}
@@ -19,13 +22,14 @@ source=("$pkgname::git+https://github.com/FWGS/xash3d-fwgs"
     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"
+    _args+=" --libdir=/usr/lib32"
+else
+    _args+=" --libdir=/usr/lib"
 fi
 
 pkgver() {
@@ -79,8 +83,8 @@ package() {
 }
 
 md5sums=('SKIP'
-         'ca89e0d9d9b28f2a0657dd96d1ddae66'
+         '71f6125d9270685a05067e597e527747'
          '2f9f7b77e05177961fdcecc4660a2010'
-         '45bdee1a2166ac9caeb9a5030cf65b29'
+         'c1f2f0000496b1a6e6763ac8fb25fed9'
          '60d714544048b0383a7e79cfaed96d78'
          '409462da6be03f004e84452cfcb93d6b')
diff --git a/xash3d b/xash3d
index c7dee3c3daf1..441b3a7e6bc6 100644
--- a/xash3d
+++ b/xash3d
@@ -8,16 +8,16 @@ if [ ! -d "$XASH3D_BASEDIR" ]; then
     exit 1
 fi
 
-if [ $(uname -m) == "x86_64" ]; then 
-	if [ ! -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
-	fi
-else 
+#if [ $(uname -m) == "x86_64" ]; then 
+#	if [ ! -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
+#	fi
+#else 
 	if [ ! -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
-fi
+#fi
 
 $DEFAULT_LIBPATH/xash3d/xash3d "$@"
diff --git a/xash3d.dedicated b/xash3d.dedicated
index 48f3a68802cc..b5d4dd4d5443 100644
--- a/xash3d.dedicated
+++ b/xash3d.dedicated
@@ -8,16 +8,16 @@ if [ ! -d "$XASH3D_BASEDIR" ]; then
 	exit 1
 fi
 
-if [ $(uname -m) == "x86_64" ]; then 
-	if [ ! -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
-	fi
-else 
+#if [ $(uname -m) == "x86_64" ]; then 
+#	if [ ! -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
+#	fi
+#else 
 	if [ ! -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
-fi
+#fi
 
 $DEFAULT_LIBPATH/xash3d/xash3d -dedicated "$@"