summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorViech2021-05-15 15:01:22 +0200
committerViech2021-05-15 15:01:22 +0200
commit8650bd78776602a2f6aa648f8ffa7e9b4327699e (patch)
treee44a09dd902261fd71e1c83382df103dec9aac91
parent8db105e15b8ccee3d6b24bdd9a8be5e7f3731021 (diff)
downloadaur-unvanquished.tar.gz
Update to 0.52.0.
-rw-r--r--.SRCINFO30
-rw-r--r--PKGBUILD124
2 files changed, 75 insertions, 79 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4d0ed230bc9..a23d7caa6ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
pkgbase = unvanquished
pkgdesc = A team-based, fast-paced, fps/rts hybrid game which pits aliens against humans.
- pkgver = 0.51.2
+ pkgver = 0.52.0
pkgrel = 1
- url = http://www.unvanquished.net
+ url = https://www.unvanquished.net
install = unvanquished.install
arch = x86_64
license = GPL3
makedepends = cmake
- depends = unvanquished-data>=0.51.2
+ depends = unvanquished-data>=0.52.0
depends = zlib
depends = gmp
depends = nettle
@@ -38,19 +38,19 @@ pkgbase = unvanquished
backup = etc/unvanquished/server.cfg
backup = etc/unvanquished/maprotation.cfg
source = unvanquished.install
- source = unvanquished_0.51.2.tar.gz::https://github.com/Unvanquished/Unvanquished/archive/archlinux/0.51.2-1.tar.gz
- source = daemon_0.51.2.tar.gz::https://github.com/DaemonEngine/Daemon/archive/v0.51.1.tar.gz
- source = breakpad_15fbc760aa1e4db2a3b36493ff3b4cf49e3df282.tar.gz::https://github.com/DaemonEngine/breakpad/archive/15fbc760aa1e4db2a3b36493ff3b4cf49e3df282.tar.gz
- source = crunch_559a1b045b50b5f716294b47325c0170c8236dbc.tar.gz::https://github.com/DaemonEngine/crunch/archive/559a1b045b50b5f716294b47325c0170c8236dbc.tar.gz
- source = recast_6b68934d6d2715501e01b1e115413cefaa0aa7d3.tar.gz::https://github.com/DaemonEngine/recastnavigation/archive/6b68934d6d2715501e01b1e115413cefaa0aa7d3.tar.gz
- source = naclsdk_linux64-4.tar.bz2::https://dl.unvanquished.net/deps/linux64-4.tar.bz2
+ source = unvanquished_0.52.0.tar.gz::https://github.com/Unvanquished/Unvanquished/archive/refs/tags/unvanquished/0.52.0.tar.gz
+ source = daemon_0.52.0.tar.gz::https://github.com/DaemonEngine/Daemon/archive/refs/tags/unvanquished/0.52.0.tar.gz
+ source = breakpad_0.52.0.tar.gz::https://github.com/DaemonEngine/breakpad/archive/refs/tags/unvanquished/0.52.0.tar.gz
+ source = crunch_0.52.0.tar.gz::https://github.com/DaemonEngine/crunch/archive/refs/tags/unvanquished/0.52.0.tar.gz
+ source = recastnavigation_0.52.0.tar.gz::https://github.com/DaemonEngine/recastnavigation/archive/refs/tags/unvanquished/0.52.0.tar.gz
+ source = naclsdk_linux64-5.tar.bz2::https://dl.unvanquished.net/deps/linux64-5.tar.bz2
md5sums = 6d9430b5b06b93a43a1cb79e14637f0b
- md5sums = 15a63c77160500de3ed3d69a471d458e
- md5sums = 589523f6028bcd3869505b6a3968c411
- md5sums = 256f388e18018f638958a47f53f2a8d9
- md5sums = 356bbda9890f48dca1db3b80001d40c0
- md5sums = 2b1989f17e3ae0cab77cae8d397deafb
- md5sums = 2ba12c71625919ddc282172b74fa4887
+ md5sums = 1821ecc4185d15145d78296249c7e612
+ md5sums = 049b3aea1db9bfbc5664d035c7ae8ee9
+ md5sums = 1610e084189b435a2e0614a07f8871d2
+ md5sums = 733baa91bb57497be69b3912bd4f40f5
+ md5sums = 37d95bd19b051238b03cfb30f1f27609
+ md5sums = 3c2cceeb5c653c4e53543fc892377f38
pkgname = unvanquished
diff --git a/PKGBUILD b/PKGBUILD
index 0a76cc61376..5c4542b355a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
# Contributor: Martin F. Schumann
pkgname=unvanquished
-pkgver=0.51.2
+pkgver=0.52.0
pkgrel=1
pkgdesc='A team-based, fast-paced, fps/rts hybrid game which pits aliens against humans.'
arch=('x86_64')
-url='http://www.unvanquished.net'
+url='https://www.unvanquished.net'
license=('GPL3')
makedepends=('cmake')
depends=("unvanquished-data>=${pkgver}"
@@ -23,120 +23,116 @@ backup=('etc/conf.d/unvanquished.conf'
'etc/unvanquished/maprotation.cfg')
install=unvanquished.install
-# Unvanquished refers to the game's branding and gamelogic.
-# Note that the gamelogic is not compiled here but shipped in unvanquished-data.
-_unvver="archlinux/${pkgver}-${pkgrel}"
-_unvdir="Unvanquished-${_unvver/\//-}"
-
-# Dæmon is the game's engine.
-_daemonver="v${pkgver}"
-_daemondir="Daemon-${pkgver}"
-
-# HACK: One-time mismatch between Unvanquished and Dæmon
-# ------------------------------------------------------
-_daemonver="v0.51.1"
-_daemondir="Daemon-0.51.1"
-# ------------------------------------------------------
-
-# breakpad, crunch, and recastnavigation are Dæmon submodules.
-_breakpadver=15fbc760aa1e4db2a3b36493ff3b4cf49e3df282
-_crunchver=559a1b045b50b5f716294b47325c0170c8236dbc
-_recastver=6b68934d6d2715501e01b1e115413cefaa0aa7d3
-_breakpaddir="breakpad-${_breakpadver}"
-_crunchdir="crunch-${_crunchver}"
-_recastdir="recastnavigation-${_recastver}"
+# Shorthand strings.
+_archive="archive/refs/tags/unvanquished/${pkgver}.tar.gz"
+_suffix="unvanquished-${pkgver}"
+_unvanquished="Unvanquished-${_suffix}"
+_daemon="Daemon-${_suffix}"
+_breakpad="breakpad-${_suffix}"
+_crunch="crunch-${_suffix}"
+_recast="recastnavigation-${_suffix}"
# NaCL SDK is a buildtime dependency of Dæmon.
-# Note that due to enormous compile times, we use a binary distribution.
-_naclsdkbasever="4"
-_naclsdkarch=linux64
-_naclsdkver="${_naclsdkarch}-${_naclsdkbasever}"
-_naclsdkdir="${_naclsdkver}"
+# NOTE: Due to enormous compile times, we use a binary distribution.
+_naclsdk_base_ver=5
+_naclsdk_ver="linux64-${_naclsdk_base_ver}"
+_naclsdk="${_naclsdk_ver}"
source=("unvanquished.install"
- "unvanquished_${pkgver}.tar.gz::https://github.com/Unvanquished/Unvanquished/archive/${_unvver}.tar.gz"
- "daemon_${pkgver}.tar.gz::https://github.com/DaemonEngine/Daemon/archive/${_daemonver}.tar.gz"
- "breakpad_${_breakpadver}.tar.gz::https://github.com/DaemonEngine/breakpad/archive/${_breakpadver}.tar.gz"
- "crunch_${_crunchver}.tar.gz::https://github.com/DaemonEngine/crunch/archive/${_crunchver}.tar.gz"
- "recast_${_recastver}.tar.gz::https://github.com/DaemonEngine/recastnavigation/archive/${_recastver}.tar.gz"
- "naclsdk_${_naclsdkver}.tar.bz2::https://dl.unvanquished.net/deps/${_naclsdkver}.tar.bz2")
+ "unvanquished_${pkgver}.tar.gz::https://github.com/Unvanquished/Unvanquished/${_archive}"
+ "daemon_${pkgver}.tar.gz::https://github.com/DaemonEngine/Daemon/${_archive}"
+ "breakpad_${pkgver}.tar.gz::https://github.com/DaemonEngine/breakpad/${_archive}"
+ "crunch_${pkgver}.tar.gz::https://github.com/DaemonEngine/crunch/${_archive}"
+ "recastnavigation_${pkgver}.tar.gz::https://github.com/DaemonEngine/recastnavigation/${_archive}"
+ "naclsdk_${_naclsdk_ver}.tar.bz2::https://dl.unvanquished.net/deps/${_naclsdk_ver}.tar.bz2")
md5sums=('6d9430b5b06b93a43a1cb79e14637f0b'
- '15a63c77160500de3ed3d69a471d458e'
- '589523f6028bcd3869505b6a3968c411'
- '256f388e18018f638958a47f53f2a8d9'
- '356bbda9890f48dca1db3b80001d40c0'
- '2b1989f17e3ae0cab77cae8d397deafb'
- '2ba12c71625919ddc282172b74fa4887')
+ '1821ecc4185d15145d78296249c7e612'
+ '049b3aea1db9bfbc5664d035c7ae8ee9'
+ '1610e084189b435a2e0614a07f8871d2'
+ '733baa91bb57497be69b3912bd4f40f5'
+ '37d95bd19b051238b03cfb30f1f27609'
+ '3c2cceeb5c653c4e53543fc892377f38')
# The prepare function mimics the git submodule dance.
prepare() {
cd "${srcdir}"
- # From Unvanquished: Remove an empty Dæmon submodule directory.
- rmdir --ignore-fail-on-non-empty "${_unvdir}/daemon"
+ # From Unvanquished: Remove empty submodule directories.
+ rmdir --ignore-fail-on-non-empty "${_unvanquished}/daemon"
+ rmdir --ignore-fail-on-non-empty "${_unvanquished}/libs/recastnavigation"
# From Dæmon: Remove empty submodule directories.
- rmdir --ignore-fail-on-non-empty "${_daemondir}/libs/breakpad"
- rmdir --ignore-fail-on-non-empty "${_daemondir}/libs/crunch"
- rmdir --ignore-fail-on-non-empty "${_daemondir}/libs/recastnavigation"
+ rmdir --ignore-fail-on-non-empty "${_daemon}/libs/breakpad"
+ rmdir --ignore-fail-on-non-empty "${_daemon}/libs/crunch"
- # Link Dæmon in the Unvanquished source tree.
- ln -sfr "${_daemondir}" "${_unvdir}/daemon"
-
- # Link the NaCL SDK in the Dæmon source tree.
- ln -sfr "${_naclsdkdir}" "${_unvdir}/daemon/external_deps/${_naclsdkdir}"
+ # Link Unvanquished's submodules.
+ ln -sfr "${_daemon}" "${_unvanquished}/daemon"
+ ln -sfr "${_recast}" "${_unvanquished}/libs/recastnavigation"
# Link Dæmon's submodules.
- ln -sfr "${_breakpaddir}" "${_daemondir}/libs/breakpad"
- ln -sfr "${_crunchdir}" "${_daemondir}/libs/crunch"
- ln -sfr "${_recastdir}" "${_daemondir}/libs/recastnavigation"
+ ln -sfr "${_breakpad}" "${_daemon}/libs/breakpad"
+ ln -sfr "${_crunch}" "${_daemon}/libs/crunch"
+
+ # Link the NaCL SDK in the Dæmon source tree.
+ ln -sfr "${_naclsdk}" "${_daemon}/external_deps/${_naclsdk}"
}
build() {
- cd "${srcdir}/${_unvdir}"
+ cd "${srcdir}/${_unvanquished}"
mkdir -p build
cd build
- cmake -D BUILD_CGAME=OFF -D BUILD_SGAME=OFF ..
+ cmake \
+ -D BUILD_CGAME=OFF \
+ -D BUILD_SGAME=OFF \
+ -D USE_BREAKPAD=ON \
+ ..
make
}
package() {
- # create installation directories
cd "${pkgdir}"
- install -dm755 \
+ # Create installation directories.
+ install -d -m 755 \
etc/conf.d \
etc/unvanquished \
usr/bin \
usr/lib/systemd/system \
usr/lib/unvanquished \
usr/share/applications \
- usr/share/icons/hicolor/128x128/apps \
usr/share/licenses/unvanquished \
usr/share/unvanquished/pkg \
var/lib/unvanquished-server/config \
var/lib/unvanquished-server/game
- # install content
- cd "${srcdir}/${_unvdir}"
+ # Install content.
+ cd "${srcdir}/${_unvanquished}"
+
+ for resolution in $(ls -c1 dist/icons/); do
+ icondir="${pkgdir}/usr/share/icons/hicolor/${resolution}/apps"
+ install -d -m 755 "${icondir}"
+ install -m 644 "dist/icons/${resolution}/unvanquished.png" "${icondir}"
+ done
- install -m 644 debian/unvanquished.png "${pkgdir}/usr/share/icons/hicolor/128x128/apps/"
install -m 644 COPYING.txt "${pkgdir}/usr/share/licenses/unvanquished/"
- cd "${srcdir}/${_unvdir}/build"
+ cd "${srcdir}/${_unvanquished}/build"
install -m 755 daemon "${pkgdir}/usr/lib/unvanquished/"
install -m 755 daemonded "${pkgdir}/usr/lib/unvanquished/"
install -m 755 daemon-tty "${pkgdir}/usr/lib/unvanquished/"
+ install -m 755 crash_server "${pkgdir}/usr/lib/unvanquished/"
install -m 755 irt_core-x86*.nexe "${pkgdir}/usr/lib/unvanquished/"
install -m 755 nacl_helper_bootstrap "${pkgdir}/usr/lib/unvanquished/"
install -m 755 nacl_loader "${pkgdir}/usr/lib/unvanquished/"
# install starters and dedicated server config
- cd "${srcdir}/${_unvdir}/archlinux"
+ # TODO: Use the distro-independent distribution files as much as possible,
+ # ship all archlinux-specific files with the AUR package.
+ cd "${srcdir}/${_unvanquished}/archlinux"
install -m 755 unvanquished.sh "${pkgdir}/usr/bin/unvanquished"
install -m 755 unvanquished-tty.sh "${pkgdir}/usr/bin/unvanquished-tty"