devilutionx: use src dist recommended archive

2 files changed, 12 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 651941ecda5d..12e07a1c4490 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = devilutionx
 	pkgdesc = Diablo devolved for linux
 	pkgver = 1.5.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/diasurgical/devilutionX
 	arch = armv6h
 	arch = armv7h
@@ -27,11 +27,11 @@ pkgbase = devilutionx
 	depends = simpleini
 	depends = zlib
 	options = strip
-	source = https://github.com/diasurgical/devilutionX/archive/1.5.0.tar.gz
+	source = https://github.com/diasurgical/devilutionX/releases/download/1.5.0/devilutionx-src.tar.xz
 	source = https://github.com/diasurgical/devilutionX-assets/releases/download/v3/fonts.mpq
 	source = https://github.com/diasurgical/devilutionX-assets/releases/download/v3/pl.mpq
 	source = https://github.com/diasurgical/devilutionX-assets/releases/download/v3/ru.mpq
-	sha256sums = 94bd11e05ba53edddfd9df677d30c9f9fdca90f963a3466bf0fb133bd4f8d668
+	sha256sums = 425e63891792c4ab213865f8e1b4401317439bf47450f18064ee72ebf9a2abf8
 	sha256sums = 6b62e03c42ae4427055e0f292a1beafb5e840c397adaf1f641b909be37b8653e
 	sha256sums = b78c058a51733d9a0513c3cc535312b00a2bdff8ad0efac75971104c9ae11f41
 	sha256sums = 01749f4c4009b93bb1bb40e2ee09dba409fa37501da32bdb0b468146e56c9689
diff --git a/PKGBUILD b/PKGBUILD
index 3c6727fe26b6..8a60b1a466c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,8 @@
 
 pkgbase=devilutionx
 pkgname=("${pkgbase}" "${pkgbase}-fonts" "${pkgbase}-voices")
-_pkgname=devilutionX
 pkgver=1.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Diablo devolved for linux"
 arch=('armv6h' 'armv7h' 'arm' 'aarch64' 'i686' 'x86_64')
 url="https://github.com/diasurgical/devilutionX"
@@ -14,26 +13,21 @@ license=('custom:unlicense')
 depends=('bzip2' 'fmt' 'libpng' 'libsodium' 'sdl2' 'sdl2_image' 'simpleini' 'zlib')
 makedepends=('cmake' 'devilutionx-graphics-tools-git' 'flac' 'gettext' 'git' 'lame' 'ninja' 'smpq')
 options=('strip')
-source=("${url}/archive/${pkgver}.tar.gz"
+source=("${url}/releases/download/${pkgver}/devilutionx-src.tar.xz"
   "${url}-assets/releases/download/v3/fonts.mpq"
   "${url}-assets/releases/download/v3/pl.mpq"
   "${url}-assets/releases/download/v3/ru.mpq"
 )
 
-prepare() {
-  if [ ! -d build ]; then
-    mkdir build
-  fi
-}
-
 build() {
-  cd build
-  cmake ../"${_pkgname}-${pkgver}" \
-    -DBUILD_TESTING=off \
+  cmake -S "${pkgbase}-src-${pkgver}" \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DVERSION_NUM="${pkgver}"
+    -DBUILD_TESTING=off \
+    -DCPACK=ON \
+    -Bbuild
 
-  cmake --build .
+  cmake --build build -j $(getconf _NPROCESSORS_ONLN)
 }
 
 package_devilutionx() {
@@ -64,7 +58,7 @@ package_devilutionx-fonts() {
     "${pkgdir}/usr/share/diasurgical/devilutionx/fonts.mpq"
 }
 
-sha256sums=('94bd11e05ba53edddfd9df677d30c9f9fdca90f963a3466bf0fb133bd4f8d668'
+sha256sums=('425e63891792c4ab213865f8e1b4401317439bf47450f18064ee72ebf9a2abf8'
             '6b62e03c42ae4427055e0f292a1beafb5e840c397adaf1f641b909be37b8653e'
             'b78c058a51733d9a0513c3cc535312b00a2bdff8ad0efac75971104c9ae11f41'
             '01749f4c4009b93bb1bb40e2ee09dba409fa37501da32bdb0b468146e56c9689')