summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrent s2017-11-18 23:53:21 -0500
committerbrent s2017-11-18 23:53:21 -0500
commite1257c0f72a3fc617600020548f53f425db9ec78 (patch)
tree05c1ef69ec1f952af404dd10c47bda524252857e
parentbc427871ee761098083e9b9c60c49928dbf2f061 (diff)
downloadaur-e1257c0f72a3fc617600020548f53f425db9ec78.tar.gz
thanks zack - finally cleaned up quite a bit. -git being fixed shortly, rel3 actually builds properly.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD91
-rw-r--r--spearmint.svg105
-rw-r--r--spearmint.svg.sigbin543 -> 0 bytes
4 files changed, 47 insertions, 157 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d9c47c6da8ba..096cdbf73d64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Nov 12 16:20:56 UTC 2017
+# Sun Nov 19 04:53:21 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 = 2
+ pkgrel = 3
url = http://spearmint.pw
install = spearmint.install
arch = i686
@@ -19,14 +19,12 @@ pkgbase = spearmint
conflicts = spearmint-git
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-data.tar.xz.sig
- source = spearmint.svg.sig
source = ioquake3-q3a-1.32-9.run.sig
source = spearmint.desktop.sig
source = spearmint.service.sig
@@ -34,7 +32,6 @@ pkgbase = spearmint
source = spearmint-server.launcher.sig
sha512sums = SKIP
sha512sums = f2c9746fcfd69efed2e9a3c7ba3f1f4a5d7f90352d5355dada6bf27b8c4a64975d65de19e66da548df1bcb6f38d2ae9524ffb869fa2fcd0da33c2fa533969fab
- sha512sums = a6991edf1821403be965a40d1534b23b1248c9c6c0aaa23ea7d67e93f03d65610637ac417d6beb9d69c7609249ed68afe90d9a1ce1ad26237dc8e64f072d6d79
sha512sums = 2ff6eff394119697b1c0a76f9c6d70cec21f90aecd89b72f6459661d04821a799a9c70d80f390b2ae7822d5830e247033a79022cd6d3d1754f7780fadd2d418b
sha512sums = 9e70a201f26265e29fb9ce2d198d943de8e12094b9d04b5e2fad630508787f036c0ee318604a2899ad4a74b4cef8ba3bffd1e7817de8bcbd512a6f80783aea1a
sha512sums = 84c60900e2db08e2e8dc39236d268fea392fcbc7cb51af051b5981301bfd5d6c10cafd29284096728048ed4b54baa580ee3f9824a2a1435ba42e91d644547cc0
@@ -46,7 +43,6 @@ pkgbase = spearmint
sha512sums = SKIP
sha512sums = SKIP
sha512sums = SKIP
- sha512sums = SKIP
pkgname = spearmint
diff --git a/PKGBUILD b/PKGBUILD
index cf3db4f89710..0347dd512f63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,11 +8,12 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
pkgname=spearmint
pkgver=0.5
-pkgrel=2
+pkgrel=3
_ioq3v1='1.36'
_ioq3v2='1.32-9'
+_upver='0.5'
pkgdesc="An ioquake3-based engine with multiple improvements (note: requires pak files from original Q3 CD; incompatible with ioquake3)"
-url="http://spearmint.pw"
+url="http://${pkgname}.pw"
license=("GPL3" "custom")
arch=('i686' 'x86_64')
depends=('sdl2')
@@ -20,26 +21,23 @@ makedepends=('sdl2' 'git')
optdepends=('curl: use native curl'
'openal: use native openal'
'mumble: support for positional Mumble VoIP (as alternative to in-game VoIP feature)')
-conflicts=('spearmint-git')
-install=spearmint.install
-source=("git+https://github.com/zturtleman/spearmint.git"
- "https://github.com/zturtleman/${pkgname}/releases/download/release-${pkgver}/${pkgname}-${pkgver}-data.tar.xz"
- "${pkgname}.svg"
+conflicts=("${pkgname}-git")
+install=${pkgname}.install
+source=("git+https://github.com/zturtleman/${pkgname}.git"
+ "https://github.com/zturtleman/${pkgname}/releases/download/release-${_upver}/${pkgname}-${_upver}-data.tar.xz"
"http://ioquake3.org/files/${_ioq3v1}/data/ioquake3-q3a-${_ioq3v2}.run"
- "spearmint.desktop"
- "spearmint.service"
- "spearmint.launcher"
- "spearmint-server.launcher"
- "${pkgname}-${pkgver}-data.tar.xz.sig"
- "${pkgname}.svg.sig"
+ "${pkgname}.desktop"
+ "${pkgname}.service"
+ "${pkgname}.launcher"
+ "${pkgname}-server.launcher"
+ "${pkgname}-${_upver}-data.tar.xz.sig"
"ioquake3-q3a-${_ioq3v2}.run.sig"
- "spearmint.desktop.sig"
- "spearmint.service.sig"
- "spearmint.launcher.sig"
- "spearmint-server.launcher.sig")
+ "${pkgname}.desktop.sig"
+ "${pkgname}.service.sig"
+ "${pkgname}.launcher.sig"
+ "${pkgname}-server.launcher.sig")
sha512sums=('SKIP'
'f2c9746fcfd69efed2e9a3c7ba3f1f4a5d7f90352d5355dada6bf27b8c4a64975d65de19e66da548df1bcb6f38d2ae9524ffb869fa2fcd0da33c2fa533969fab'
- 'a6991edf1821403be965a40d1534b23b1248c9c6c0aaa23ea7d67e93f03d65610637ac417d6beb9d69c7609249ed68afe90d9a1ce1ad26237dc8e64f072d6d79'
'2ff6eff394119697b1c0a76f9c6d70cec21f90aecd89b72f6459661d04821a799a9c70d80f390b2ae7822d5830e247033a79022cd6d3d1754f7780fadd2d418b'
'9e70a201f26265e29fb9ce2d198d943de8e12094b9d04b5e2fad630508787f036c0ee318604a2899ad4a74b4cef8ba3bffd1e7817de8bcbd512a6f80783aea1a'
'84c60900e2db08e2e8dc39236d268fea392fcbc7cb51af051b5981301bfd5d6c10cafd29284096728048ed4b54baa580ee3f9824a2a1435ba42e91d644547cc0'
@@ -50,22 +48,23 @@ sha512sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP'
'SKIP')
prepare() {
cd ${srcdir}/${pkgname}
- git checkout release-${pkgver}
+ git checkout release-${_upver}
+
+ # Quake 3 point release pk3s
cd ${srcdir}
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}
+ mkdir -p ${srcdir}/q3a/${d}
done
- tar -C ${srcdir}/${pkgname}/baseq3 -xf ${srcdir}/paks/idpatchpk3s.tar
- tar -C ${srcdir}/${pkgname}/missionpack -xf ${srcdir}/paks/idtapatchpk3s.tar
+ tar -C ${srcdir}/q3a/baseq3 -xf ${srcdir}/paks/idpatchpk3s.tar
+ tar -C ${srcdir}/q3a/missionpack -xf ${srcdir}/paks/idtapatchpk3s.tar
cd ${srcdir}
# don't need this anymore.
rm -rf ${srcdir}/paks
@@ -77,7 +76,6 @@ build() {
}
package() {
- cd ${srcdir}/${pkgname}
if [[ "${CARCH}" == 'i686' ]];
then
_ARCH='x86'
@@ -86,49 +84,50 @@ package() {
_ARCH=${CARCH}
fi
+ # Base dirs
install -d -m 755 ${pkgdir}/usr/bin
install -d -m 755 ${pkgdir}/usr/share/doc/${pkgname}
install -d -m 755 ${pkgdir}/usr/share/${pkgname}
- install -d -m 750 ${pkgdir}/opt/spearmint
+ install -d -m 750 ${pkgdir}/opt/${pkgname}
# 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}.launcher ${pkgdir}/opt/${pkgname}/
+ install -m 750 ${srcdir}/${pkgname}-server.launcher ${pkgdir}/opt/${pkgname}/
- # 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}.git
+ install -m 750 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}_${_ARCH} ${pkgdir}/opt/${pkgname}/${pkgname}
+ install -m 750 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}-server_${_ARCH} ${pkgdir}/opt/${pkgname}/${pkgname}-server
+ install -m 640 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}-renderer-opengl1_${_ARCH}.so ${pkgdir}/opt/${pkgname}/
+ install -m 640 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}-renderer-opengl2_${_ARCH}.so ${pkgdir}/opt/${pkgname}/
- # 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}/. \;
+ # https://github.com/zturtleman/${pkgname}/releases/download/release-${_upver}/${pkgname}-${_upver}-data.tar.xz
+ install -m 640 ${srcdir}/${pkgname}-${_upver}-data/gamecontrollerdb.txt ${pkgdir}/opt/${pkgname}/
+ install -m 640 ${srcdir}/${pkgname}-${_upver}-data/${pkgname}-gamelist.txt ${pkgdir}/opt/${pkgname}/
+ install -D -m 644 ${srcdir}/${pkgname}-${_upver}-data/LIBERATION_LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/fonts.license.txt
+ find ${srcdir}/${pkgname}-${_upver}-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}/
+ install -d -m 750 ${pkgdir}/opt/${pkgname}/${d}
+ install -m 640 ${srcdir}/${pkgname}-${_upver}-data/${d}/* ${pkgdir}/opt/${pkgname}/${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}/
+ install -m 640 ${srcdir}/q3a/${d}/pak?.pk3 ${pkgdir}/opt/${pkgname}/${d}/
done
cd ${pkgdir}/usr/bin
- ln -sf /opt/spearmint/${pkgname}.launcher ${pkgname}
- ln -sf /opt/spearmint/${pkgname}-server.launcher ${pkgname}-server
+ ln -sf /opt/${pkgname}/${pkgname}.launcher ${pkgname}
+ ln -sf /opt/${pkgname}/${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}.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+ install -D -m 644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
# 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}/.
+ install -m 644 ${srcdir}/${pkgname}/misc/${pkgname}_text.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
+ mv ${srcdir}/${pkgname}/misc/*.{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.svg b/spearmint.svg
deleted file mode 100644
index 470c840ee01f..000000000000
--- a/spearmint.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1024"
- height="1024"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="spearmint_icon.svg">
- <defs
- id="defs4">
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3025-7"
- id="linearGradient3031-4"
- x1="188.57143"
- y1="688.07648"
- x2="987.14288"
- y2="168.07646"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.59873694,0,0,0.59873694,297.37016,143.09113)" />
- <linearGradient
- inkscape:collect="always"
- id="linearGradient3025-7">
- <stop
- style="stop-color:#4e9a06;stop-opacity:1;"
- offset="0"
- id="stop3027-7" />
- <stop
- style="stop-color:#4e9a06;stop-opacity:0;"
- offset="1"
- id="stop3029-3" />
- </linearGradient>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.7"
- inkscape:cx="782.76749"
- inkscape:cy="513.52888"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="1920"
- inkscape:window-height="993"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-28.362183)">
- <rect
- style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect3178"
- width="997.64111"
- height="997.64111"
- x="13.179454"
- y="41.541637"
- ry="263.64294" />
- <path
- style="fill:#4e9a06;fill-opacity:1;stroke:#2e3436;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="M 512 13.1875 L 512 512 L 1010.8125 512 L 1010.8125 276.8125 C 1010.8125 130.75431 893.24569 13.1875 747.1875 13.1875 L 512 13.1875 z M 512 512 L 13.1875 512 L 13.1875 747.1875 C 13.1875 893.24569 130.75431 1010.8125 276.8125 1010.8125 L 512 1010.8125 L 512 512 z "
- transform="translate(0,28.362183)"
- id="rect3178-4" />
- <g
- inkscape:label="Layer 1"
- id="layer1-5"
- transform="matrix(4.5778762,0,0,4.5778762,455.12887,-9.0510728)"
- style="fill:#73d216">
- <path
- sodipodi:nodetypes="ccccccccccc"
- inkscape:connector-curvature="0"
- id="path4262"
- d="m 25.957183,41.594163 c -7.740369,-12.20204 2.972126,-23.314574 14.138351,-16.97324 9.804333,5.351421 31.806208,22.766039 43.985891,36.91104 l 22.306005,5.399724 7.58532,12.727922 c -7.02745,-0.72793 -10.15493,-0.7291 -16.021917,-1.216798 5.554077,12.062425 -5.841501,23.284359 -20.297652,17.801666 l 0.25713,17.741953 -9.513801,-6.81394 -9.77093,-25.712973 C 46.58443,69.207581 29.551735,47.593492 25.957183,41.594163 z"
- style="fill:#73d216;fill-opacity:1;stroke:none" />
- </g>
- </g>
-</svg>
diff --git a/spearmint.svg.sig b/spearmint.svg.sig
deleted file mode 100644
index 853b674aa1bd..000000000000
--- a/spearmint.svg.sig
+++ /dev/null
Binary files differ