Fix compile and default config is now installed in config_default.

5 files changed, 36 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a4459486715..fff0b26f0c5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = actionfps
 	pkgdesc = A game based on the open-source AssaultCube first-person shooter (FPS)
 	pkgver = 1.2.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://actionfps.com
 	arch = i686
 	arch = x86_64
@@ -20,18 +20,15 @@ pkgbase = actionfps
 	depends = curl
 	depends = libogg
 	depends = libvorbis
-	source = https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2.tar.bz2
-	source = actionfps-cubedir.patch
+	source = actionfps-1.2.0.2.tar.gz::https://github.com/ActionFPS/AC/archive/refs/tags/v1.2.0.2.tar.gz
 	source = actionfps
 	source = actionfps-server
 	source = actionfps.desktop
 	source = actionfps.png
-	sha512sums = 50b7b466968ab7570889cc6c4d13b221cc8c5c0d24255f42aa4d0eafb92e186b1b4fb737308691fcb786d07cbfb74622b73967e42a96278e710796790c469ac3
-	sha512sums = 4dae912c01aa50953e3859bacb8ba57c09e0ba22c54eebcc2a6df9223cdba2b14fd2337842ed40ad1850cf8cd380b4a0453dc00d16f83fc145dcc22408429cbf
-	sha512sums = 6124c36968521f395aa43d1e01d0e7f939259b650a24bf639b18bb2adaa329309d14c25ad66e747274ba18e07f5c7d29a95b72f4922565a4ee36a1de61381ff6
-	sha512sums = 621c919fdc766eac79cfaeee11ddb402a02901fad33f27ccdb2bd7404e376092e195fca4a26b82cb21bede8fe7ccf229936123bb5a945d3f89eab9aa3b9bf2af
+	sha512sums = 97a5eaa1fba716d6c29dd1dbcdf3a44fbdaa3c5ba1b350eae3834699d20784b7e4563c4bf729bf7552654aeabe2d577e188cf8ce0ccd5449f092df9cdd76341a
+	sha512sums = c99ae5698749d3c5f3003b2d8403c93ee1964b971a621e48c3013dff1f230a06819bdda5d250cf576186c45154875d900eb546dc71e4fb820299c5d0c12e9705
+	sha512sums = ba4f9cb222e9440dea9c44ca7f492e26a012c850b96adc866b76a30ed93b0b9b38c0b67c63b03e310769801c1be41c604606ddd819af8bce3a6acbb6b91c30f4
 	sha512sums = 751376e2820a3a5d590f4f323e414d5a40b34137ce9988a9dfe9aa857ba00ec3d721c323be7497e7d3f5002de0746c3af02f557029977247d0e72b16bdb6cbb8
 	sha512sums = 30b0e533939831f90695641632b70dbdd3adbab09fb89af24d8eb1fed7056942124775c1f8b2bb22b852800eb6d9749ed54b5fb6661c283ea590b519acbd1975
 
 pkgname = actionfps
-
diff --git a/PKGBUILD b/PKGBUILD
index ed2c7d0940a7..2cd3575ca3f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,40 +8,48 @@
 
 pkgname=actionfps
 pkgver=1.2.0.2
-pkgrel=1
-pkgdesc="A game based on the open-source AssaultCube first-person shooter (FPS)"
+pkgrel=2
+pkgdesc='A game based on the open-source AssaultCube first-person shooter (FPS)'
 arch=('i686' 'x86_64')
-url="https://actionfps.com"
+url='https://actionfps.com'
 license=('ZLIB' 'custom')
 depends=('sdl' 'sdl_mixer' 'sdl_image' 'openal' 'zlib' 'gcc-libs' 'libgl' 'glu' 'curl' 'libogg' 'libvorbis')
 makedepends=('mesa' 'clang')
-source=("https://github.com/assaultcube/AC/releases/download/v${pkgver}/AssaultCube_v${pkgver}.tar.bz2"
-        'actionfps-cubedir.patch'
+source=("$pkgname-$pkgver.tar.gz::https://github.com/ActionFPS/AC/archive/refs/tags/v${pkgver}.tar.gz"
         'actionfps'
         'actionfps-server'
         'actionfps.desktop'
         'actionfps.png')
-sha512sums=('50b7b466968ab7570889cc6c4d13b221cc8c5c0d24255f42aa4d0eafb92e186b1b4fb737308691fcb786d07cbfb74622b73967e42a96278e710796790c469ac3'
-            '4dae912c01aa50953e3859bacb8ba57c09e0ba22c54eebcc2a6df9223cdba2b14fd2337842ed40ad1850cf8cd380b4a0453dc00d16f83fc145dcc22408429cbf'
-            '6124c36968521f395aa43d1e01d0e7f939259b650a24bf639b18bb2adaa329309d14c25ad66e747274ba18e07f5c7d29a95b72f4922565a4ee36a1de61381ff6'
-            '621c919fdc766eac79cfaeee11ddb402a02901fad33f27ccdb2bd7404e376092e195fca4a26b82cb21bede8fe7ccf229936123bb5a945d3f89eab9aa3b9bf2af'
+sha512sums=('97a5eaa1fba716d6c29dd1dbcdf3a44fbdaa3c5ba1b350eae3834699d20784b7e4563c4bf729bf7552654aeabe2d577e188cf8ce0ccd5449f092df9cdd76341a'
+            'c99ae5698749d3c5f3003b2d8403c93ee1964b971a621e48c3013dff1f230a06819bdda5d250cf576186c45154875d900eb546dc71e4fb820299c5d0c12e9705'
+            'ba4f9cb222e9440dea9c44ca7f492e26a012c850b96adc866b76a30ed93b0b9b38c0b67c63b03e310769801c1be41c604606ddd819af8bce3a6acbb6b91c30f4'
             '751376e2820a3a5d590f4f323e414d5a40b34137ce9988a9dfe9aa857ba00ec3d721c323be7497e7d3f5002de0746c3af02f557029977247d0e72b16bdb6cbb8'
             '30b0e533939831f90695641632b70dbdd3adbab09fb89af24d8eb1fed7056942124775c1f8b2bb22b852800eb6d9749ed54b5fb6661c283ea590b519acbd1975')
             
+_srcdir="AC-${pkgver}"
+
 prepare() {
-    cd "AssaultCube_v${pkgver}"
-    rm -rf "source/lib"
-    patch -uN < "../actionfps-cubedir.patch"
-    cd "source/src"
-    make
+	cd "${_srcdir}"
+	rm -rf 'source/lib'
+	sed -i 's|CUBE_DIR=./|CUBE_DIR=$(dirname "$(readlink -f "${0}")")|' 'server.sh'
+	cd 'source/src'
+	sed -i 's|static inline float round|//static inline float round|' 'tools.h'
+	make
 }
 
 package() {
-    install -m755 -d "$pkgdir/usr/share/games/actionfps"
-    cp -r "AssaultCube_v${pkgver}"/* "$pkgdir/usr/share/games/actionfps"
-    install -Dm644 actionfps.png "${pkgdir}/usr/share/pixmaps/actionfps.png"
-    install -Dm644 actionfps.desktop "${pkgdir}/usr/share/applications/actionfps.desktop"
-    install -Dm644 "AssaultCube_v${pkgver}/docs/package_copyrights.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    install -Dm755 actionfps "${pkgdir}/usr/bin/actionfps"
-    install -Dm755 actionfps-server "${pkgdir}/usr/bin/actionfps-server"
+	install -dm755 "${pkgdir}/usr/share/games/actionfps/bin_unix"
+	cp -r "${_srcdir}"/{bot,docs,mods,packages,scripts,assaultcube.sh,changelog.txt,README.html,server.sh,server_wizard.sh} \
+		"${pkgdir}/usr/share/games/actionfps"
+		
+	install -dm755 "${pkgdir}/usr/share/games/actionfps/config_default"
+	cp -r "${_srcdir}/config"/* "${pkgdir}/usr/share/games/actionfps/config_default"
+	
+	install -Dm755 "${_srcdir}/source/src/ac_client" "${pkgdir}/usr/share/games/actionfps/bin_unix/native_client"
+	install -Dm755 "${_srcdir}/source/src/ac_server" "${pkgdir}/usr/share/games/actionfps/bin_unix/native_server"
+	install -Dm644 'actionfps.png' "${pkgdir}/usr/share/pixmaps/actionfps.png"
+	install -Dm644 'actionfps.desktop' "${pkgdir}/usr/share/applications/actionfps.desktop"
+	install -Dm644 "${_srcdir}/docs/package_copyrights.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm755 'actionfps' "${pkgdir}/usr/bin/actionfps"
+	install -Dm755 'actionfps-server' "${pkgdir}/usr/bin/actionfps-server"
 }
diff --git a/actionfps b/actionfps
index 3d916acc2f22..f5b00dea1936 100644
--- a/actionfps
+++ b/actionfps
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env sh
 /usr/share/games/actionfps/assaultcube.sh "$@"
diff --git a/actionfps-cubedir.patch b/actionfps-cubedir.patch
deleted file mode 100644
index 642610b96db5..000000000000
--- a/actionfps-cubedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- server.sh.orig	2019-02-03 17:40:47.795480878 -0800
-+++ server.sh	2019-02-03 17:41:35.728521639 -0800
-@@ -3,7 +3,7 @@
- # CUBE_DIR should refer to the directory in which AssaultCube is placed.
- #CUBE_DIR=~/assaultcube
- #CUBE_DIR=/usr/local/assaultcube
--CUBE_DIR=./
-+CUBE_DIR=$(dirname "$(readlink -f "${0}")")
- 
- # CUBE_OPTIONS starts AssaultCube with any command line options you choose.
- CUBE_OPTIONS=""
diff --git a/actionfps-server b/actionfps-server
index b4272239b60f..f9fadb6fd96e 100644
--- a/actionfps-server
+++ b/actionfps-server
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env sh
 /usr/share/games/actionfps/server.sh "$@"