diff options
| -rw-r--r-- | .SRCINFO | 21 | ||||
| -rw-r--r-- | PKGBUILD | 91 | ||||
| -rw-r--r-- | spearmint-0.5-data.tar.xz.sig | bin | 0 -> 566 bytes | |||
| -rw-r--r-- | spearmint-0.5-linux.tar.xz.sig | bin | 566 -> 0 bytes | |||
| -rwxr-xr-x | spearmint-server.launcher | 11 | ||||
| -rw-r--r-- | spearmint-server.launcher.sig | bin | 543 -> 566 bytes | |||
| -rw-r--r-- | spearmint.install | 4 | ||||
| -rwxr-xr-x | spearmint.launcher | 11 | ||||
| -rw-r--r-- | spearmint.launcher.sig | bin | 543 -> 566 bytes |
9 files changed, 90 insertions, 48 deletions
@@ -1,40 +1,45 @@ # Generated by mksrcinfo v8 -# Mon Oct 23 23:08:56 UTC 2017 +# Sun Nov 12 16:20:56 UTC 2017 pkgbase = spearmint pkgdesc = An ioquake3-based engine with multiple improvements (note: requires pak files from original Q3 CD; incompatible with ioquake3) pkgver = 0.5 - pkgrel = 1 + pkgrel = 2 url = http://spearmint.pw install = spearmint.install arch = i686 arch = x86_64 license = GPL3 + license = custom + makedepends = sdl2 + makedepends = git depends = sdl2 optdepends = curl: use native curl optdepends = openal: use native openal - optdepends = mumble: support for positional audio (as alternative to in-game VOIP feature) + optdepends = mumble: support for positional Mumble VoIP (as alternative to in-game VoIP feature) conflicts = spearmint-git - source = https://github.com/zturtleman/spearmint/releases/download/release-0.5/spearmint-0.5-linux.tar.xz + source = git+https://github.com/zturtleman/spearmint.git + source = https://github.com/zturtleman/spearmint/releases/download/release-0.5/spearmint-0.5-data.tar.xz source = spearmint.svg source = http://ioquake3.org/files/1.36/data/ioquake3-q3a-1.32-9.run source = spearmint.desktop source = spearmint.service source = spearmint.launcher source = spearmint-server.launcher - source = spearmint-0.5-linux.tar.xz.sig + source = spearmint-0.5-data.tar.xz.sig source = spearmint.svg.sig source = ioquake3-q3a-1.32-9.run.sig source = spearmint.desktop.sig source = spearmint.service.sig source = spearmint.launcher.sig source = spearmint-server.launcher.sig - sha512sums = ea43e9ec2ffa708fc78d6b64f40693641cc6523d57159f1dbc8736f79e19782411147d4efca828ea66f8e55eb561ec36407c42d824bb59743c8f97ba413187e0 + sha512sums = SKIP + sha512sums = f2c9746fcfd69efed2e9a3c7ba3f1f4a5d7f90352d5355dada6bf27b8c4a64975d65de19e66da548df1bcb6f38d2ae9524ffb869fa2fcd0da33c2fa533969fab sha512sums = a6991edf1821403be965a40d1534b23b1248c9c6c0aaa23ea7d67e93f03d65610637ac417d6beb9d69c7609249ed68afe90d9a1ce1ad26237dc8e64f072d6d79 sha512sums = 2ff6eff394119697b1c0a76f9c6d70cec21f90aecd89b72f6459661d04821a799a9c70d80f390b2ae7822d5830e247033a79022cd6d3d1754f7780fadd2d418b sha512sums = 9e70a201f26265e29fb9ce2d198d943de8e12094b9d04b5e2fad630508787f036c0ee318604a2899ad4a74b4cef8ba3bffd1e7817de8bcbd512a6f80783aea1a sha512sums = 84c60900e2db08e2e8dc39236d268fea392fcbc7cb51af051b5981301bfd5d6c10cafd29284096728048ed4b54baa580ee3f9824a2a1435ba42e91d644547cc0 - sha512sums = 92fb1693b91fc7e7ba97612990369a0344b23dbdcfd0c3ecbfc5e7519f86caf9348b63e9a641f081ef8ba913fb1f50a4ca830a7107bc939be5c345e89223f640 - sha512sums = 91b9af20e64223d7d7f21e7eb18cac168c9374409358e4e4d7ddad6576ceb68532d67ba82bc525833cd4ae4d8260ea44429299facbfb9186f72f16790f45a023 + sha512sums = 0ab0b8ee4b5c1952b098a99c58073623c9001a8fe4cb135b6795050b27f3fbf4713a0309135ad6d7b2c3bf2e15f3aaedf71b9b0ba3b6c01bd93e9cdbb6ff2b0d + sha512sums = a30de6726c5b797e8f1dbc49487a1ca29ddabf5ba2eb42665c68a4d2033d284dd2ab3817c84cabdb4152e4e43162f6b7dd072c05514fb2f3c284505127b01fd7 sha512sums = SKIP sha512sums = SKIP sha512sums = SKIP @@ -8,40 +8,43 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B') pkgname=spearmint pkgver=0.5 -pkgrel=1 +pkgrel=2 _ioq3v1='1.36' _ioq3v2='1.32-9' pkgdesc="An ioquake3-based engine with multiple improvements (note: requires pak files from original Q3 CD; incompatible with ioquake3)" url="http://spearmint.pw" -license=("GPL3") +license=("GPL3" "custom") arch=('i686' 'x86_64') depends=('sdl2') +makedepends=('sdl2' 'git') optdepends=('curl: use native curl' 'openal: use native openal' - 'mumble: support for positional audio (as alternative to in-game VOIP feature)') + 'mumble: support for positional Mumble VoIP (as alternative to in-game VoIP feature)') conflicts=('spearmint-git') install=spearmint.install -source=("https://github.com/zturtleman/${pkgname}/releases/download/release-${pkgver}/${pkgname}-${pkgver}-linux.tar.xz" +source=("git+https://github.com/zturtleman/spearmint.git" + "https://github.com/zturtleman/${pkgname}/releases/download/release-${pkgver}/${pkgname}-${pkgver}-data.tar.xz" "${pkgname}.svg" "http://ioquake3.org/files/${_ioq3v1}/data/ioquake3-q3a-${_ioq3v2}.run" "spearmint.desktop" "spearmint.service" "spearmint.launcher" "spearmint-server.launcher" - "${pkgname}-${pkgver}-linux.tar.xz.sig" + "${pkgname}-${pkgver}-data.tar.xz.sig" "${pkgname}.svg.sig" "ioquake3-q3a-${_ioq3v2}.run.sig" "spearmint.desktop.sig" "spearmint.service.sig" "spearmint.launcher.sig" "spearmint-server.launcher.sig") -sha512sums=('ea43e9ec2ffa708fc78d6b64f40693641cc6523d57159f1dbc8736f79e19782411147d4efca828ea66f8e55eb561ec36407c42d824bb59743c8f97ba413187e0' +sha512sums=('SKIP' + 'f2c9746fcfd69efed2e9a3c7ba3f1f4a5d7f90352d5355dada6bf27b8c4a64975d65de19e66da548df1bcb6f38d2ae9524ffb869fa2fcd0da33c2fa533969fab' 'a6991edf1821403be965a40d1534b23b1248c9c6c0aaa23ea7d67e93f03d65610637ac417d6beb9d69c7609249ed68afe90d9a1ce1ad26237dc8e64f072d6d79' '2ff6eff394119697b1c0a76f9c6d70cec21f90aecd89b72f6459661d04821a799a9c70d80f390b2ae7822d5830e247033a79022cd6d3d1754f7780fadd2d418b' '9e70a201f26265e29fb9ce2d198d943de8e12094b9d04b5e2fad630508787f036c0ee318604a2899ad4a74b4cef8ba3bffd1e7817de8bcbd512a6f80783aea1a' '84c60900e2db08e2e8dc39236d268fea392fcbc7cb51af051b5981301bfd5d6c10cafd29284096728048ed4b54baa580ee3f9824a2a1435ba42e91d644547cc0' - '92fb1693b91fc7e7ba97612990369a0344b23dbdcfd0c3ecbfc5e7519f86caf9348b63e9a641f081ef8ba913fb1f50a4ca830a7107bc939be5c345e89223f640' - '91b9af20e64223d7d7f21e7eb18cac168c9374409358e4e4d7ddad6576ceb68532d67ba82bc525833cd4ae4d8260ea44429299facbfb9186f72f16790f45a023' + '0ab0b8ee4b5c1952b098a99c58073623c9001a8fe4cb135b6795050b27f3fbf4713a0309135ad6d7b2c3bf2e15f3aaedf71b9b0ba3b6c01bd93e9cdbb6ff2b0d' + 'a30de6726c5b797e8f1dbc49487a1ca29ddabf5ba2eb42665c68a4d2033d284dd2ab3817c84cabdb4152e4e43162f6b7dd072c05514fb2f3c284505127b01fd7' 'SKIP' 'SKIP' 'SKIP' @@ -51,11 +54,16 @@ sha512sums=('ea43e9ec2ffa708fc78d6b64f40693641cc6523d57159f1dbc8736f79e197824111 'SKIP') prepare() { + cd ${srcdir}/${pkgname} + git checkout release-${pkgver} cd ${srcdir} - mv "${pkgname}-${pkgver}-linux" ${pkgname} mkdir -p paks chmod 700 ioquake3-q3a-${_ioq3v2}.run ./ioquake3-q3a-${_ioq3v2}.run --tar xfC ${srcdir}/paks/. + for d in baseq3 missionpack; + do + mkdir -p ${srcdir}/${pkgname}/${d} + done tar -C ${srcdir}/${pkgname}/baseq3 -xf ${srcdir}/paks/idpatchpk3s.tar tar -C ${srcdir}/${pkgname}/missionpack -xf ${srcdir}/paks/idtapatchpk3s.tar cd ${srcdir} @@ -65,25 +73,7 @@ prepare() { build() { cd ${srcdir}/${pkgname} - -if [ ! -f "${pkgname}-server" ]; -then - if [[ "${CARCH}" == 'i686' ]]; - then - rm -f ${pkgname}{,-server}_x86_64 - mv ${pkgname}_x86 ${pkgname} - mv ${pkgname}-server_x86 ${pkgname}-server - _ARCH='x86' - elif [[ "${CARCH}" == 'x86_64' ]]; - then - rm -rf ${pkgname}{,-server}_x86 - mv ${pkgname}_x86_64 ${pkgname} - mv ${pkgname}-server_x86_64 ${pkgname}-server - _ARCH=${CARCH} - fi -fi - - cp ${pkgname}-${pkgver}-readme.txt readme.txt + make } package() { @@ -98,27 +88,48 @@ package() { install -d -m 755 ${pkgdir}/usr/bin install -d -m 755 ${pkgdir}/usr/share/doc/${pkgname} - install -d -m 750 ${pkgdir}/opt/spearmint/{baseq3,missionpack} + install -d -m 755 ${pkgdir}/usr/share/${pkgname} + install -d -m 750 ${pkgdir}/opt/spearmint + + # stuff i wrote install -m 750 ${srcdir}/${pkgname}.launcher ${pkgdir}/opt/spearmint/ install -m 750 ${srcdir}/${pkgname}-server.launcher ${pkgdir}/opt/spearmint/ - install -m 750 ${srcdir}/${pkgname}/${pkgname} ${pkgdir}/opt/spearmint/ - install -m 750 ${srcdir}/${pkgname}/${pkgname}-server ${pkgdir}/opt/spearmint/ - install -m 750 ${srcdir}/${pkgname}/spearmint-renderer-opengl*_${_ARCH}.so ${pkgdir}/opt/spearmint/ - install -m 640 ${srcdir}/${pkgname}/gamecontrollerdb.txt ${pkgdir}/opt/spearmint/ - install -m 640 ${srcdir}/${pkgname}/baseq3/* ${pkgdir}/opt/spearmint/baseq3/ - install -m 640 ${srcdir}/${pkgname}/missionpack/* ${pkgdir}/opt/spearmint/missionpack/ - install -m 644 ${srcdir}/${pkgname}/*.txt ${pkgdir}/usr/share/doc/${pkgname}/ - # unneeded since we have the license tracked by pacman - rm ${pkgdir}/usr/share/doc/${pkgname}/{SPEARMINT_LICENSE,${pkgname}-${pkgver}-readme}.txt + + # https://github.com/zturtleman/spearmint.git + install -m 750 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}_${_ARCH} ${pkgdir}/opt/spearmint/${pkgname} + install -m 750 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}-server_${_ARCH} ${pkgdir}/opt/spearmint/${pkgname}-server + install -m 640 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/spearmint-renderer-opengl1_${_ARCH}.so ${pkgdir}/opt/spearmint/ + install -m 640 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/spearmint-renderer-opengl2_${_ARCH}.so ${pkgdir}/opt/spearmint/ + + # https://github.com/zturtleman/${pkgname}/releases/download/release-${pkgver}/${pkgname}-${pkgver}-data.tar.xz + install -m 640 ${srcdir}/${pkgname}-${pkgver}-data/gamecontrollerdb.txt ${pkgdir}/opt/spearmint/ + install -m 640 ${srcdir}/${pkgname}-${pkgver}-data/spearmint-gamelist.txt ${pkgdir}/opt/spearmint/ + install -D -m 644 ${srcdir}/${pkgname}-${pkgver}-data/LIBERATION_LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/fonts.license.txt + find ${srcdir}/${pkgname}-${pkgver}-data/ -maxdepth 1 -type f -name "*.txt" -exec install -m 644 '{}' ${pkgdir}/usr/share/doc/${pkgname}/. \; + for d in baseq3 missionpack missionpackoa tademo baseoa demoq3 fonts; + do + install -d -m 750 ${pkgdir}/opt/spearmint/${d} + install -m 640 ${srcdir}/${pkgname}-${pkgver}-data/${d}/* ${pkgdir}/opt/spearmint/${d}/ + done + + # http://ioquake3.org/files/${_ioq3v1}/data/ioquake3-q3a-${_ioq3v2}.run + for d in baseq3 missionpack; + do + install -m 640 ${srcdir}/${pkgname}/${d}/* ${pkgdir}/opt/spearmint/${d}/ + done cd ${pkgdir}/usr/bin ln -sf /opt/spearmint/${pkgname}.launcher ${pkgname} ln -sf /opt/spearmint/${pkgname}-server.launcher ${pkgname}-server install -D -m 644 ${srcdir}/spearmint.service ${pkgdir}/usr/lib/systemd/system/spearmint.service - install -D -m 644 ${srcdir}/spearmint.desktop ${pkgdir}/usr/share/applications/spearmint.desktop - install -D -m 644 ${srcdir}/${pkgname}.svg ${pkgdir}/usr/share/pixmaps/spearmint.svg + # icon cleanup + mkdir -p ${pkgdir}/usr/share/pixmaps/${pkgname} + mv ${pkgdir}/usr/share/${pkgname}/${pkgname}.svg ${pkgdir}/usr/share/pixmaps/spearmint.svg + mv ${pkgdir}/usr/share/${pkgname}/*.{svg,png} ${pkgdir}/usr/share/pixmaps/${pkgname}/. + find ${pkgdir}/usr/share/${pkgname}/ -type d -exec chmod 755 '{}' \; + find ${pkgdir}/usr/share/${pkgname}/ -type f -exec chmod 644 '{}' \; } diff --git a/spearmint-0.5-data.tar.xz.sig b/spearmint-0.5-data.tar.xz.sig Binary files differnew file mode 100644 index 000000000000..d689ef6b9936 --- /dev/null +++ b/spearmint-0.5-data.tar.xz.sig diff --git a/spearmint-0.5-linux.tar.xz.sig b/spearmint-0.5-linux.tar.xz.sig Binary files differdeleted file mode 100644 index 36d496f3648e..000000000000 --- a/spearmint-0.5-linux.tar.xz.sig +++ /dev/null diff --git a/spearmint-server.launcher b/spearmint-server.launcher index 695d38742e9b..365dbf805a41 100755 --- a/spearmint-server.launcher +++ b/spearmint-server.launcher @@ -1,4 +1,15 @@ #!/bin/bash +OLDDIR=${HOME}/.spearmint +NEWDIR=${HOME}/.local/share/spearmint + +if [ -d "${OLDDIR}" ]; +then + if [ ! -f "${OLDDIR}/.nomove" ]; + then + mv ${OLDDIR} ${NEWDIR} + fi +fi + cd /opt/spearmint /opt/spearmint/spearmint-server +set sv_pure 0 ${*} diff --git a/spearmint-server.launcher.sig b/spearmint-server.launcher.sig Binary files differindex 2039b15a57b8..22cb924bf6c0 100644 --- a/spearmint-server.launcher.sig +++ b/spearmint-server.launcher.sig diff --git a/spearmint.install b/spearmint.install index 336481d7c936..5bb2265bb65f 100644 --- a/spearmint.install +++ b/spearmint.install @@ -12,6 +12,10 @@ post_install() { echo '!!! When you have the .pk3 file(s) installed, you can run the game via: spearmint' echo '!!! See https://github.com/zturtleman/spearmint/wiki for more documentation.' echo '!!!' + echo '!!! NEW IN VERSION 0.5+: The default user directory has changed from ~/.spearmint to' + echo '!!! ~/.local/share/spearmint. The launcher ("spearmint") will automatically move this' + echo '!!! directory to the new location, if it exists. If you wish to avoid this behaviour,' + echo '!!! simply do "touch ~/.spearmint/.nomove"' } post_upgrade() { diff --git a/spearmint.launcher b/spearmint.launcher index f7e3a72a5b69..9acd791ea910 100755 --- a/spearmint.launcher +++ b/spearmint.launcher @@ -1,4 +1,15 @@ #!/bin/bash +OLDDIR=${HOME}/.spearmint +NEWDIR=${HOME}/.local/share/spearmint + +if [ -d "${OLDDIR}" ]; +then + if [ ! -f "${OLDDIR}/.nomove" ]; + then + mv ${OLDDIR} ${NEWDIR} + fi +fi + cd /opt/spearmint /opt/spearmint/spearmint +set sv_pure 0 ${*} diff --git a/spearmint.launcher.sig b/spearmint.launcher.sig Binary files differindex 7cc1d2beca59..63a176f535cb 100644 --- a/spearmint.launcher.sig +++ b/spearmint.launcher.sig |