Update to 2.11

- i386 support coming soon
- Package being renamed to warfork-bin soon
- warfork-git package being created once 2.2 development resumes

3 files changed, 14 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8da946da0272..ed0b480b1a7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = warfork
 	pkgdesc = Free online multiplayer competitive FPS based on the Qfusion engine
-	pkgver = 19.10.08
+	pkgver = 21.03.04
 	pkgrel = 1
 	url = https://www.warfork.com/
 	arch = x86_64
@@ -25,12 +25,12 @@ pkgbase = warfork
 	source = warfork.launcher
 	source = wf-server.launcher
 	source = wftv-server.launcher
-	source = https://warfork.com/downloads/warfork_4269802_Oct_08_2019_unified.tar
-	sha512sums = 5bdf675f0f5e036d3650fe23cc6be6aca09b64cf68d6665a670419baa5a502255471ad72effdf4ada0c0e24190f90dba5539a1723222443e6d914cdf5c3bd1d3
+	source = https://warfork.com/downloads/warfork_6328154_Mar_04_2021_unified.tar
+	sha512sums = f78af226cad17ff9eaeebeafd754bb35f10549abede755f4fa9d6616118003877f036f3329b490a9c342267fdda4eaffde926878bf1d24c33488f0a02d4bc697
 	sha512sums = 073959aebd70807b893d474c7005341356f974acc573eae49eb2d23273068318ee855ccaeb0a037caf9a7a4ce545927b939f3b31d996384f56a90b54ff2cd5c0
 	sha512sums = 9fd472b186477259270aecef8456b72db51a3f7f161280b23633f25a5169f3d3ada7583aff50e7510df08f9b38514d77420adef5f761365e1b9aa29737f1c1c4
 	sha512sums = 10952bc4e123c0d75d492761b505a3b1ddf6c8e27143bf25bbb0e28dede5b44238849a96542345f9e068aaf442b0df4859f23b6e18049e7dfc94535e7aaefc65
-	sha512sums = 5706446df5fd8bd3ebd507750145a6300f0f158bffeee0d5dbb61ce02c275eabe4cc25c80ae81f4416617d80f186714a6ccf420c6294274edbab1edac66eb67a
+	sha512sums = 9dbf2ab31ed9f87180cf555b1fdfc1593f6bbe0f173811e97d2070d1089e18ebb1317a2ba0fab692086e164bf5805dbb968d335b83f6187f187963278f30531d
 
 pkgname = warfork
 
diff --git a/PKGBUILD b/PKGBUILD
index 0ff3c9113d67..2ff59d3af77e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,9 @@
 # Contributor: Aleksej Komarov <stylemistake@gmail.com>
 
 pkgname='warfork'
-pkgver=19.10.08
+pkgver=21.03.04
 pkgrel=1
-relver=4269802_Oct_08_2019
+_relver=6328154_Mar_04_2021
 pkgdesc='Free online multiplayer competitive FPS based on the Qfusion engine'
 url='https://www.warfork.com/'
 license=('GPL2')
@@ -23,12 +23,12 @@ source=('warfork.png'
         'warfork.launcher'
         'wf-server.launcher'
         'wftv-server.launcher'
-        "https://warfork.com/downloads/warfork_${relver}_unified.tar")
-sha512sums=('5bdf675f0f5e036d3650fe23cc6be6aca09b64cf68d6665a670419baa5a502255471ad72effdf4ada0c0e24190f90dba5539a1723222443e6d914cdf5c3bd1d3'
+        "https://warfork.com/downloads/warfork_${_relver}_unified.tar")
+sha512sums=('f78af226cad17ff9eaeebeafd754bb35f10549abede755f4fa9d6616118003877f036f3329b490a9c342267fdda4eaffde926878bf1d24c33488f0a02d4bc697'
             '073959aebd70807b893d474c7005341356f974acc573eae49eb2d23273068318ee855ccaeb0a037caf9a7a4ce545927b939f3b31d996384f56a90b54ff2cd5c0'
             '9fd472b186477259270aecef8456b72db51a3f7f161280b23633f25a5169f3d3ada7583aff50e7510df08f9b38514d77420adef5f761365e1b9aa29737f1c1c4'
             '10952bc4e123c0d75d492761b505a3b1ddf6c8e27143bf25bbb0e28dede5b44238849a96542345f9e068aaf442b0df4859f23b6e18049e7dfc94535e7aaefc65'
-            '5706446df5fd8bd3ebd507750145a6300f0f158bffeee0d5dbb61ce02c275eabe4cc25c80ae81f4416617d80f186714a6ccf420c6294274edbab1edac66eb67a')
+            '9dbf2ab31ed9f87180cf555b1fdfc1593f6bbe0f173811e97d2070d1089e18ebb1317a2ba0fab692086e164bf5805dbb968d335b83f6187f187963278f30531d')
 
 prepare() {
   gendesk -n -f --pkgname 'warfork' --pkgdesc "${pkgdesc}" --name 'Warfork' --categories 'Game;ActionGame;Shooter'
@@ -36,14 +36,12 @@ prepare() {
 
 package() {
 
-  install -Dm755 wf_server "${pkgdir}/opt/warfork/wf_server"
-  install -Dm755 wftv_server "${pkgdir}/opt/warfork/wftv_server"
-  install -Dm755 Warfork.app/Contents/Resources/wf_server.x86_64 "${pkgdir}/opt/warfork/wf_server.x86_64"
-  install -Dm755 Warfork.app/Contents/Resources/wftv_server.x86_64 "${pkgdir}/opt/warfork/wftv_server.x86_64"
-  install -Dm755 Warfork.app/Contents/Resources/warfork.x86_64 "${pkgdir}/opt/warfork/warfork.x86_64"
-  install -Dm755 Warfork.app/Contents/Resources/warfork.x86_64 "${pkgdir}/opt/warfork/warfork"
+  install -Dm755 fvi-launcher/applications/warfork/Warfork.app/Contents/Resources/wf_server.x86_64 "${pkgdir}/opt/warfork/wf_server.x86_64"
+  install -Dm755 fvi-launcher/applications/warfork/Warfork.app/Contents/Resources/wftv_server.x86_64 "${pkgdir}/opt/warfork/wftv_server.x86_64"
+  install -Dm755 fvi-launcher/applications/warfork/Warfork.app/Contents/Resources/warfork.x86_64 "${pkgdir}/opt/warfork/warfork.x86_64"
+  install -Dm755 fvi-launcher/applications/warfork/Warfork.app/Contents/Resources/warfork.x86_64 "${pkgdir}/opt/warfork/warfork"
 
-  cp -a Warfork.app/Contents/Resources/{basewf,libs} "${pkgdir}/opt/warfork/"
+  cp -a fvi-launcher/applications/warfork/Warfork.app/Contents/Resources/{basewf,libs} "${pkgdir}/opt/warfork/"
 
   find "${pkgdir}/opt/warfork"/{basewf,libs} -type d | xargs chmod 755
   find "${pkgdir}/opt/warfork"/{basewf,libs} -type f | xargs chmod 644
diff --git a/warfork.png b/warfork.png
index f470c7fc9fff..3ba65eda7f5b 100644
--- a/warfork.png
+++ b/warfork.png