update to 1.22.1

2 files changed, 36 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a32cc1e91045..e022b1982d29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,15 @@
 pkgbase = vkquake
 	pkgdesc = A modern Quake 1 engine. Forked from Fitzquake. This version contains Vulkan API support.
-	pkgver = 1.20.3
+	pkgver = 1.22.1
 	pkgrel = 1
 	url = https://github.com/Novum/vkquake
 	install = vkquake.install
 	arch = x86_64
 	license = GPL2
 	makedepends = vulkan-validation-layers
+	makedepends = meson
+	makedepends = vulkan-headers
+	makedepends = zopfli
 	depends = flac
 	depends = glibc
 	depends = libgl
@@ -17,11 +20,11 @@ pkgbase = vkquake
 	depends = opusfile
 	depends = sdl2
 	provides = vkquake
-	source = https://github.com/Novum/vkQuake/archive/1.20.3.tar.gz
+	source = https://github.com/Novum/vkQuake/archive/1.22.1.tar.gz
 	source = vkquake.desktop
 	source = vkquake.png
 	source = vkquake.svg
-	sha512sums = e6a1c218f806b697ee4696a4dd20277e0cb6c00c5b8985e7dddf8f9ef4a3d8db84176f9dd99b85300d9d23d1da1bc552001f0b73f98c24258f58990b057129f7
+	sha512sums = a410425d68f7cbbd65dda66d2c387bbb4d8659fb37f1942b9ba1d77a9e6a001c4845496b93c8ad3817deb0c77e5302a4cbf6d24cdb591b4fc5db84ada1069fea
 	sha512sums = 75881c2fea0628dcecff496a5e3035bbb4e408b81527737339ebfd66ad04ca04621d4e13e3e0537f091f8b1127dc231583f746d11cc6c11658cdb976db77e145
 	sha512sums = 9ac17fb2f549656869a02a9a1896786aa4a4f753c6b1174d14b999c94693164ec71a73f9ab6f4a96591ef3af407ffce4f29b0ed87e878f14bb177e396898f29f
 	sha512sums = 5a712a6c0447acea7a6c690cb7e63a2111e28646ef0935dfbd40cc4164c9ed5fc6fdba6eeafe44b618b17e856b3b0f60cc3ddbdedd8e536feef97de969d407b0
diff --git a/PKGBUILD b/PKGBUILD
index b02467d8f84b..a30ba4de1a20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer: Michal Wojdyla < micwoj9292 at gmail dot com >
+# Maintainer: HurricanePootis <hurricanepootis@protonmail.com>
+# Ex-Maintainer: Michal Wojdyla < micwoj9292 at gmail dot com >
 # Contributor: HurricanePootis <hurricanepootis@protonmail.com>
 # Contributor: Michael DeGuzis <mdeguzis@gmail.com>
 # Please note you must have a Vulkan-capable GPU
 
 _quake=vkQuake
 pkgname=vkquake
-pkgver=1.20.3
+pkgver=1.22.1
 pkgrel=1
 pkgdesc="A modern Quake 1 engine. Forked from Fitzquake. This version contains Vulkan API support."
 arch=('x86_64')
@@ -14,13 +15,13 @@ url="https://github.com/Novum/vkquake"
 license=('GPL2')
 depends=('flac' 'glibc' 'libgl' 'libmad' 'libmikmod' 
 	 'libvorbis' 'libx11' 'opusfile' 'sdl2')
-makedepends=('vulkan-validation-layers')
+makedepends=('vulkan-validation-layers' 'meson' 'vulkan-headers' 'zopfli')
 install=$pkgname.install
 source=("https://github.com/Novum/vkQuake/archive/${pkgver}.tar.gz"
 	'vkquake.desktop'
 	'vkquake.png'
 	'vkquake.svg')
-sha512sums=('e6a1c218f806b697ee4696a4dd20277e0cb6c00c5b8985e7dddf8f9ef4a3d8db84176f9dd99b85300d9d23d1da1bc552001f0b73f98c24258f58990b057129f7'
+sha512sums=('a410425d68f7cbbd65dda66d2c387bbb4d8659fb37f1942b9ba1d77a9e6a001c4845496b93c8ad3817deb0c77e5302a4cbf6d24cdb591b4fc5db84ada1069fea'
             '75881c2fea0628dcecff496a5e3035bbb4e408b81527737339ebfd66ad04ca04621d4e13e3e0537f091f8b1127dc231583f746d11cc6c11658cdb976db77e145'
             '9ac17fb2f549656869a02a9a1896786aa4a4f753c6b1174d14b999c94693164ec71a73f9ab6f4a96591ef3af407ffce4f29b0ed87e878f14bb177e396898f29f'
             '5a712a6c0447acea7a6c690cb7e63a2111e28646ef0935dfbd40cc4164c9ed5fc6fdba6eeafe44b618b17e856b3b0f60cc3ddbdedd8e536feef97de969d407b0')
@@ -29,21 +30,32 @@ sha512sums=('e6a1c218f806b697ee4696a4dd20277e0cb6c00c5b8985e7dddf8f9ef4a3d8db841
 build() {
   
   cd "$srcdir/$_quake-$pkgver"
+  if [[ -d build ]]
+  then
+    rm -rf build
+  fi
+  mkdir build && cd build
 
-  # clean
-  msg "Cleaning make files"
-  make -C Quake clean
+  meson setup ../ \
+  --prefix /usr \
+  --libexecdir lib \
+  --sbindir bin \
+  --buildtype plain \
+  --auto-features enabled \
+  --wrap-mode nodownload \
+  -D use_codec_mp3=enabled \
+  -D use_codec_flac=enabled \
+  -D use_codec_vorbis=enabled \
+  -D use_codec_opus=enabled \
+  -D vorbis_lib=vorbis \
+  -D mp3_lib=mad
 
-  msg "Starting make..."
-  make -C Quake \
-		$(maybe_debug) \
-		STRIP=": do not strip:" \
-		DO_USERDIRS=1 \
-		USE_CODEC_FLAC=1 \
-		USE_CODEC_OPUS=1 \
-		USE_CODEC_MIKMOD=1 \
-		USE_CODEC_UMX=1
-  make -C Misc/vq_pak
+  # Compile vkquake binary
+  ninja
+
+  # Package vkquake.pak
+  cd "$srcdir/$_quake-$pkgver/Misc/vq_pak"
+  make
 
 }
 
@@ -52,7 +64,7 @@ package() {
   cd "$srcdir/$_quake-$pkgver"
 
   # Install main binary
-  install -Dm755 Quake/vkquake "$pkgdir"/usr/bin/vkquake
+  install -Dm755 build/vkquake "$pkgdir"/usr/bin/vkquake
 
   # Make doc dir
   mkdir -p $pkgdir/usr/share/doc/vkquake/