Rebase to bin/official release

7 files changed, 108 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5a5f88918b1..8da946da0272 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,36 @@
 pkgbase = warfork
-	pkgdesc = Warfork
-	pkgver = 4269802.OCT.8.2019
-	pkgrel = 2
-	url = https://github.com/TeamForbiddenLLC/warfork-qfusion
-	arch = i686
+	pkgdesc = Free online multiplayer competitive FPS based on the Qfusion engine
+	pkgver = 19.10.08
+	pkgrel = 1
+	url = https://www.warfork.com/
 	arch = x86_64
 	license = GPL2
-	makedepends = cmake
-	makedepends = libvorbis
-	makedepends = libtheora
-	makedepends = curl
-	makedepends = zlib
-	makedepends = freetype2
-	makedepends = openal
-	makedepends = mesa
-	makedepends = git
+	makedepends = imagemagick
+	makedepends = gendesk
 	depends = sdl2
-	depends = warfork-data>=4269802.OCT.8.2019
-	source = git+https://github.com/TeamForbiddenLLC/warfork-qfusion.git#branch=4269802-OCT-8-2019
-	source = warfork.desktop
-	sha256sums = SKIP
-	sha256sums = 98faaf4fcb90753e88e303fda478ec195ae412a4bee5fb74cc3d94b6692c884a
+	depends = libjpeg
+	depends = libpng
+	depends = curl
+	depends = libvorbis
+	depends = freetype2
+	depends = libxinerama
+	depends = libxxf86vm
+	depends = libxrandr
+	depends = libtheora
+	depends = libxi
+	optdepends = openal: for openal audio support
+	provides = warfork
+	conflicts = warfork
+	source = warfork.png
+	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
+	sha512sums = 073959aebd70807b893d474c7005341356f974acc573eae49eb2d23273068318ee855ccaeb0a037caf9a7a4ce545927b939f3b31d996384f56a90b54ff2cd5c0
+	sha512sums = 9fd472b186477259270aecef8456b72db51a3f7f161280b23633f25a5169f3d3ada7583aff50e7510df08f9b38514d77420adef5f761365e1b9aa29737f1c1c4
+	sha512sums = 10952bc4e123c0d75d492761b505a3b1ddf6c8e27143bf25bbb0e28dede5b44238849a96542345f9e068aaf442b0df4859f23b6e18049e7dfc94535e7aaefc65
+	sha512sums = 5706446df5fd8bd3ebd507750145a6300f0f158bffeee0d5dbb61ce02c275eabe4cc25c80ae81f4416617d80f186714a6ccf420c6294274edbab1edac66eb67a
 
 pkgname = warfork
 
diff --git a/PKGBUILD b/PKGBUILD
index 08cd8bac0839..0ff3c9113d67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,63 @@
-pkgname=warfork
-pkgver=4269802.OCT.8.2019
-_fullver=4269802-OCT-8-2019
-pkgrel=2
-pkgdesc='Warfork'
-arch=('i686' 'x86_64')
+# Maintainer: Gelmo <gelmo[at]outlook.com>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Slash <demodevil5[at]yahoo[dot]com>
+# Contributor: Babets
+# Contributor: Vain
+# Contributor: Aleksej Komarov <stylemistake@gmail.com>
+
+pkgname='warfork'
+pkgver=19.10.08
+pkgrel=1
+relver=4269802_Oct_08_2019
+pkgdesc='Free online multiplayer competitive FPS based on the Qfusion engine'
+url='https://www.warfork.com/'
 license=('GPL2')
-url='https://github.com/TeamForbiddenLLC/warfork-qfusion'
-depends=('sdl2' "warfork-data>=$pkgver")
-makedepends=('cmake' 'libvorbis' 'libtheora' 'curl' 'zlib' 'freetype2' 'openal' 'mesa' 'git')
-source=("git+https://github.com/TeamForbiddenLLC/warfork-qfusion.git#branch=$_fullver"
-        "warfork.desktop")
-sha256sums=('SKIP'
-'98faaf4fcb90753e88e303fda478ec195ae412a4bee5fb74cc3d94b6692c884a')
-
-build() {
-  cd "$srcdir"/warfork-qfusion/source
-  cmake .
-  make -j7
+arch=('x86_64')
+depends=('sdl2' 'libjpeg' 'libpng' 'curl' 'libvorbis' 'freetype2'
+         'libxinerama' 'libxxf86vm' 'libxrandr' 'libtheora' 'libxi')
+makedepends=('imagemagick' 'gendesk')
+optdepends=('openal: for openal audio support')
+provides=('warfork')
+conflicts=('warfork')
+source=('warfork.png'
+        'warfork.launcher'
+        'wf-server.launcher'
+        'wftv-server.launcher'
+        "https://warfork.com/downloads/warfork_${relver}_unified.tar")
+sha512sums=('5bdf675f0f5e036d3650fe23cc6be6aca09b64cf68d6665a670419baa5a502255471ad72effdf4ada0c0e24190f90dba5539a1723222443e6d914cdf5c3bd1d3'
+            '073959aebd70807b893d474c7005341356f974acc573eae49eb2d23273068318ee855ccaeb0a037caf9a7a4ce545927b939f3b31d996384f56a90b54ff2cd5c0'
+            '9fd472b186477259270aecef8456b72db51a3f7f161280b23633f25a5169f3d3ada7583aff50e7510df08f9b38514d77420adef5f761365e1b9aa29737f1c1c4'
+            '10952bc4e123c0d75d492761b505a3b1ddf6c8e27143bf25bbb0e28dede5b44238849a96542345f9e068aaf442b0df4859f23b6e18049e7dfc94535e7aaefc65'
+            '5706446df5fd8bd3ebd507750145a6300f0f158bffeee0d5dbb61ce02c275eabe4cc25c80ae81f4416617d80f186714a6ccf420c6294274edbab1edac66eb67a')
+
+prepare() {
+  gendesk -n -f --pkgname 'warfork' --pkgdesc "${pkgdesc}" --name 'Warfork' --categories 'Game;ActionGame;Shooter'
 }
 
 package() {
-  [ "$CARCH" == "x86_64" ] && EXT="x86_64" || EXT="i386"
-  install -Dm644 warfork.desktop "$pkgdir"/usr/share/applications/warfork.desktop
-
-  mkdir -p "$pkgdir"/usr/share/games/warfork/{libs,basewf}
-  install -m755 "$srcdir"/warfork-qfusion/source/build/{wf,warfork}* "$pkgdir"/usr/share/games/warfork
-  install -Dm644 "$srcdir"/warfork-qfusion/icons/warfork256x256.xpm "$pkgdir"/usr/share/pixmaps/warfork.xpm
-  install -m644 "$srcdir"/warfork-qfusion/source/build/libs/*.so "$pkgdir"/usr/share/games/warfork/libs
-  install -m644 "$srcdir"/warfork-qfusion/source/build/basewf/*.so "$pkgdir"/usr/share/games/warfork/basewf
-
-  mkdir -p "$pkgdir"/usr/bin
-  touch "$pkgdir"/usr/bin/warfork
-  echo "#\!/bin/bash" > "$pkgdir"/usr/bin/warfork
-  echo "pushd /usr/share/games/warfork > /dev/null" >> "$pkgdir"/usr/bin/warfork
-  echo "./warfork.$EXT" >> "$pkgdir"/usr/bin/warfork
+
+  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"
+
+  cp -a 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
+
+  # Install launchers to /usr/bin
+  install -D -m 0755 "${srcdir}/warfork.launcher" "${pkgdir}/usr/bin/warfork"
+  install -D -m 0755 "${srcdir}/wf-server.launcher" "${pkgdir}/usr/bin/wf-server"
+  install -D -m 0755 "${srcdir}/wftv-server.launcher" "${pkgdir}/usr/bin/wftv-server"
+
+  # Install the menu entry
+  install -D -m 0644 "${srcdir}/warfork.desktop" "${pkgdir}/usr/share/applications/warfork.desktop"
+
+  # Install the launcher icon
+  install -D -m 0644 "${srcdir}/warfork.png" "${pkgdir}/usr/share/pixmaps/warfork.png"
 }
+
+# vim: ts=2 sts=2 et:
diff --git a/warfork.desktop b/warfork.desktop
deleted file mode 100644
index ec3e73eb20c7..000000000000
--- a/warfork.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Warfork
-Icon=warfork
-Exec=warfork
-Categories=Game;Shooter;
-Terminal=false
-StartupNotify=false
diff --git a/warfork.launcher b/warfork.launcher
new file mode 100644
index 000000000000..192a98cceea4
--- /dev/null
+++ b/warfork.launcher
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+basepath="/opt/warfork"
+
+${basepath}/warfork \
+  +set fs_basepath ${basepath} \
+  +set fs_usehomedir 1 "${@}"
diff --git a/warfork.png b/warfork.png
new file mode 100644
index 000000000000..f470c7fc9fff
--- /dev/null
+++ b/warfork.png
diff --git a/wf-server.launcher b/wf-server.launcher
new file mode 100644
index 000000000000..6d6a3eb09948
--- /dev/null
+++ b/wf-server.launcher
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+basepath="/opt/warfork"
+
+${basepath}/wf_server \
+  +set fs_basepath ${basepath} \
+  +set fs_usehomedir 1 "${@}"
diff --git a/wftv-server.launcher b/wftv-server.launcher
new file mode 100644
index 000000000000..1c11021b546a
--- /dev/null
+++ b/wftv-server.launcher
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+basepath="/opt/warfork"
+
+${basepath}/wftv_server \
+  +set fs_basepath ${basepath} \
+  +set fs_usehomedir 1 "${@}"