xash3d-git: remove i686 support, remove dedicated build

6 files changed, 57 insertions, 132 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1144b0d8b954..a8bc4ba46d4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,26 @@
 pkgbase = xash3d-git
 	pkgdesc = A custom Gold Source engine rewritten from scratch
-	pkgver = r1508.2939ab8
+	pkgver = r1979.9f914182
 	pkgrel = 1
 	url = http://xash.su/
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = make
-	makedepends = binutils
-	makedepends = cmake
-	depends = xash3d-hlsdk
+	makedepends = git
+	depends = freetype2
+	depends = fontconfig
+	depends = libpulse
+	depends = sdl2
 	backup = etc/conf.d/xash3d
-	source = xash3d-git::git+https://github.com/FWGS/xash3d-fwgs
-	source = xash3d
-	source = xash3d.conf.d
-	source = xash3d.dedicated
+	source = xash3d::git+https://github.com/FWGS/xash3d-fwgs
+	source = xash3d.sh
+	source = xash3d.conf
 	source = xash3d.desktop
 	source = https://github.com/FWGS/xash-extras/releases/download/v0.19.2/extras.pak
-	md5sums = SKIP
-	md5sums = 71f6125d9270685a05067e597e527747
-	md5sums = 2f9f7b77e05177961fdcecc4660a2010
-	md5sums = c1f2f0000496b1a6e6763ac8fb25fed9
-	md5sums = 60d714544048b0383a7e79cfaed96d78
-	md5sums = 409462da6be03f004e84452cfcb93d6b
-	depends_i686 = freetype2
-	depends_i686 = fontconfig
-	depends_i686 = libpulse
-	depends_i686 = sdl2
-	makedepends_i686 = gcc
-	makedepends_i686 = gcc-libs
-	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
+	sha256sums = SKIP
+	sha256sums = 502b3d0b0bf7eec2d6910a71cfca4a1d43860de87d3824f5c5f1e8ee794e9ba5
+	sha256sums = 2e0aafe79dafa39c5341748e17b2a733bd7465b928cbf77797ad182a3004c242
+	sha256sums = 62298a5710fe8f9d33a4b4a43df14ffe973942682c99fbcab852155ae24fbccf
+	sha256sums = b3783f366f785fb1ac9bdacc6c677324b0507a4d98358a3ec94af3a088e363ce
 
 pkgname = xash3d-git
diff --git a/PKGBUILD b/PKGBUILD
index 33ae63edbb43..369abe00f11d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,96 +1,64 @@
 # Maintainer: robertfoster
 
 pkgname=xash3d-git
-pkgver=r1508.2939ab8
+pkgver=r1979.9f914182
 pkgrel=1
 pkgdesc="A custom Gold Source engine rewritten from scratch"
 arch=('i686' 'x86_64')
 url="http://xash.su/"
 license=('GPL3')
 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_i686=('gcc' 'gcc-libs')
-makedepends_x86_64=('gcc-multilib' 'lib32-gcc-libs')
+depends=('freetype2' 'fontconfig' 'libpulse' 'sdl2')
+makedepends=('git')
 backup=('etc/conf.d/xash3d')
-source=("${pkgname}::git+https://github.com/FWGS/xash3d-fwgs"
-  ${pkgname%%-git}
-  ${pkgname%%-git}.conf.d
-  ${pkgname%%-git}.dedicated
+source=("${pkgname%%-git}::git+https://github.com/FWGS/xash3d-fwgs"
+  ${pkgname%%-git}.sh
+  ${pkgname%%-git}.conf
   ${pkgname%%-git}.desktop
   https://github.com/FWGS/xash-extras/releases/download/v0.19.2/extras.pak
 )
-_args="--prefix=/usr \
---build-type=release \
---disable-vgui \
---enable-stbtt"
-
-if [ $CARCH == "x86_64" ]; then
-  _args+=" --libdir=/usr/lib32"
-else
-  _args+=" --libdir=/usr/lib"
-fi
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname%%-git}"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname%%-git}"
+
   git submodule update --init --recursive
 }
 
-prepare_xash3d() {
-  cd "${srcdir}/${pkgname}"
-  ./waf configure ${_args}
-}
+build() {
+  cd "${srcdir}/${pkgname%%-git}"
 
-prepare_xash3ds() {
-  cd "${srcdir}/${pkgname}"
-  ./waf clean
-  ./waf configure ${_args} --dedicated
-}
+  ./waf configure \
+    --prefix=/usr \
+    -8 \
+    -T release
 
-build_both() {
-  cd "${srcdir}/${pkgname}"
   ./waf build
 }
 
-install_both() {
-  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
+  cd "${srcdir}/${pkgname%%-git}"
+  ./waf install --destdir="${pkgdir}/usr/lib/xash3d"
 
-  cd ${srcdir}
-  install -Dm644 "${pkgname%%-git}.conf.d" \
+  install -Dm644 ../"${pkgname%%-git}.conf" \
     "${pkgdir}/etc/conf.d/${pkgname%%-git}"
-  install -Dm755 "${pkgname%%-git}" \
+  install -Dm755 ../"${pkgname%%-git}.sh" \
     "${pkgdir}/usr/bin/${pkgname%%-git}"
-  install -Dm755 "${pkgname%%-git}.dedicated" \
-    "${pkgdir}/usr/bin/${pkgname%%-git}-dedicated"
-  install -Dm644 "${pkgname%%-git}.desktop" \
+
+  install -Dm644 ../"${pkgname%%-git}.desktop" \
     "${pkgdir}/usr/share/applications/${pkgname%%-git}.desktop"
-  install -Dm644 "${pkgname}/game_launch/icon-xash-material.png" \
+  install -Dm644 ../"${pkgname%%-git}/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'
-  '71f6125d9270685a05067e597e527747'
-  '2f9f7b77e05177961fdcecc4660a2010'
-  'c1f2f0000496b1a6e6763ac8fb25fed9'
-  '60d714544048b0383a7e79cfaed96d78'
-  '409462da6be03f004e84452cfcb93d6b')
+sha256sums=('SKIP'
+            '502b3d0b0bf7eec2d6910a71cfca4a1d43860de87d3824f5c5f1e8ee794e9ba5'
+            '2e0aafe79dafa39c5341748e17b2a733bd7465b928cbf77797ad182a3004c242'
+            '62298a5710fe8f9d33a4b4a43df14ffe973942682c99fbcab852155ae24fbccf'
+            'b3783f366f785fb1ac9bdacc6c677324b0507a4d98358a3ec94af3a088e363ce')
diff --git a/xash3d b/xash3d
deleted file mode 100644
index 441b3a7e6bc6..000000000000
--- a/xash3d
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-. /etc/conf.d/xash3d
-
-DEFAULT_LIBPATH=/usr/lib
-
-if [ ! -d "$XASH3D_BASEDIR" ]; then
-    echo "$XASH3D_BASEDIR not found"
-    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 [ ! -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
-
-$DEFAULT_LIBPATH/xash3d/xash3d "$@"
diff --git a/xash3d.conf.d b/xash3d.conf
index 730d6777ac6a..730d6777ac6a 100755..100644
--- a/xash3d.conf.d
+++ b/xash3d.conf
diff --git a/xash3d.dedicated b/xash3d.dedicated
deleted file mode 100644
index b5d4dd4d5443..000000000000
--- a/xash3d.dedicated
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-. /etc/conf.d/xash3d
-
-DEFAULT_LIBPATH=/usr/lib
-
-if [ ! -d "$XASH3D_BASEDIR" ]; then
-	echo "$XASH3D_BASEDIR not found"
-	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 [ ! -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
-
-$DEFAULT_LIBPATH/xash3d/xash3d -dedicated "$@"
diff --git a/xash3d.sh b/xash3d.sh
new file mode 100644
index 000000000000..6683710fe571
--- /dev/null
+++ b/xash3d.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+. /etc/conf.d/xash3d
+
+DEFAULT_LIBPATH=/usr/lib
+
+if [ ! -d "$XASH3D_BASEDIR" ]; then
+  echo "$XASH3D_BASEDIR not found"
+  exit 1
+fi
+
+if [ ! -f "$XASH3D_BASEDIR/valve/dlls/hl_amd64.so" ]; then
+  ln -sr $DEFAULT_LIBPATH/valve/dlls/hl.so "$XASH3D_BASEDIR"/valve/dlls/hl_amd64.so
+  ln -sr $DEFAULT_LIBPATH/valve/cl_dlls/client.so "$XASH3D_BASEDIR"/valve/cl_dlls/client_amd64.so
+fi
+
+$DEFAULT_LIBPATH/xash3d/xash3d "$@"·