summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrent s2016-04-07 00:50:37 -0400
committerbrent s2016-04-07 00:50:37 -0400
commit5de404673b26882014a927dc5f7b761eae1022a3 (patch)
tree212f4b075ecdc0ab8bbdab143772057e6817c3b9
parentfe90f75ba1bd3a754a363c5a8b1b547a27e97bf9 (diff)
downloadaur-5de404673b26882014a927dc5f7b761eae1022a3.tar.gz
adding upstream tarball
-rw-r--r--.SRCINFO9
-rw-r--r--.gitignore1
-rw-r--r--Makefile.local.sigbin543 -> 543 bytes
-rw-r--r--PKGBUILD53
-rw-r--r--ioquake3-q3a-1.32-9.run.sigbin543 -> 543 bytes
-rw-r--r--spearmint-server.launcher.sigbin543 -> 543 bytes
-rw-r--r--spearmint.desktop.sigbin543 -> 543 bytes
-rw-r--r--spearmint.launcher.sigbin543 -> 543 bytes
-rw-r--r--spearmint.service.sigbin543 -> 543 bytes
-rw-r--r--spearmint.svg.sigbin543 -> 543 bytes
-rw-r--r--upstream.tar.xz.sigbin0 -> 543 bytes
11 files changed, 42 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 981d5c4d0fa..fea9702991b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Apr 7 03:53:38 UTC 2016
+# Thu Apr 7 04:50:37 UTC 2016
pkgbase = spearmint-git
pkgdesc = An ioquake3-based engine with multiple improvements (note: requires pak files from original Q3 CD; incompatible with ioquake3)-git master:HEAD
pkgver = r4064.33b5758
- pkgrel = 2
+ pkgrel = 4
url = http://spearmint.pw
install = spearmint.install
arch = i686
@@ -11,8 +11,12 @@ pkgbase = spearmint-git
license = GPL3
makedepends = sdl2
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)
provides = spearmint
conflicts = spearmint
+ source = upstream.tar.xz::https://github.com/zturtleman/spearmint/releases/download/release-0.2/spearmint-0.2-linux.tar.xz
source = spearmint-engine::git+https://github.com/zturtleman/spearmint.git
source = spearmint-game::git+https://github.com/zturtleman/mint-arena.git
source = spearmint-patch::git+https://github.com/zturtleman/spearmint-patch-data.git
@@ -29,6 +33,7 @@ pkgbase = spearmint-git
source = spearmint.launcher.sig
source = spearmint-server.launcher.sig
source = ioquake3-q3a-1.32-9.run.sig
+ sha512sums = 53a3b3b2bb139b9e5ecbd12c5876048dd2b2cffab07acf2db5fd7697f5624af24d503539bfe4a9acf721fdb6886063ff24d848637781f6639550e79f4a1abd26
sha512sums = SKIP
sha512sums = SKIP
sha512sums = SKIP
diff --git a/.gitignore b/.gitignore
index 2a55c02f94b..037cfb62652 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,5 @@ pkg/
*.7z
*.rar
*.deb
+*.pkg.tar.xz.sig
gamecontrollerdb.txt*
diff --git a/Makefile.local.sig b/Makefile.local.sig
index 0c5e768e401..83ceeac3981 100644
--- a/Makefile.local.sig
+++ b/Makefile.local.sig
Binary files differ
diff --git a/PKGBUILD b/PKGBUILD
index f34c792b959..d74f4af6080 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,10 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
pkgname=spearmint-git
_pkgname=spearmint
pkgver=r4064.33b5758
-pkgrel=2
+pkgrel=4
_ioq3v1='1.36'
_ioq3v2='1.32-9'
+_upver='0.2' # upstream release- needed for some pk3's.
## What games do you want to build in support for?
## baseq3 should at the LEAST be enabled.
@@ -24,11 +25,15 @@ url="http://spearmint.pw"
license=("GPL3")
arch=('i686' 'x86_64')
depends=('sdl2')
+optdepends=('curl: use native curl'
+ 'openal: use native openal'
+ 'mumble: support for positional audio (as alternative to in-game VOIP feature)')
makedepends=('sdl2')
conflicts=('spearmint')
provides=('spearmint')
install=spearmint.install
-source=("${_pkgname}-engine::git+https://github.com/zturtleman/spearmint.git"
+source=("upstream.tar.xz::https://github.com/zturtleman/${_pkgname}/releases/download/release-${_upver}/${_pkgname}-${_upver}-linux.tar.xz"
+ "${_pkgname}-engine::git+https://github.com/zturtleman/spearmint.git"
"${_pkgname}-game::git+https://github.com/zturtleman/mint-arena.git"
"${_pkgname}-patch::git+https://github.com/zturtleman/spearmint-patch-data.git"
"https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt"
@@ -44,7 +49,8 @@ source=("${_pkgname}-engine::git+https://github.com/zturtleman/spearmint.git"
"spearmint.launcher.sig"
"spearmint-server.launcher.sig"
"ioquake3-q3a-${_ioq3v2}.run.sig")
-sha512sums=('SKIP'
+sha512sums=('53a3b3b2bb139b9e5ecbd12c5876048dd2b2cffab07acf2db5fd7697f5624af24d503539bfe4a9acf721fdb6886063ff24d848637781f6639550e79f4a1abd26'
+ 'SKIP'
'SKIP'
'SKIP'
'950e7cd01fd272a7feed853f3bd9934ae050ccd1363d2d1d6a7fee78364ae697df9f4a1d98be949d8beb34afcb15de3908b267c1b19806cee996244ece7142fa'
@@ -95,6 +101,8 @@ prepare() {
cp ${srcdir}/Makefile.local ${srcdir}/${_pkgname}-game/.
mkdir -p ${srcdir}/${_pkgname}-{engine,game}/tmp
+ ## Extra .pk3 files needed
+ # Demo/ioq3
cd ${srcdir}
mkdir -p paks
chmod 700 ioquake3-q3a-${_ioq3v2}.run
@@ -102,11 +110,14 @@ prepare() {
install -d -m 750 ${srcdir}/${_pkgname}/{baseq3,missionpack}
tar -C ${srcdir}/${_pkgname}/baseq3 -xf ${srcdir}/paks/idpatchpk3s.tar
tar -C ${srcdir}/${_pkgname}/missionpack -xf ${srcdir}/paks/idtapatchpk3s.tar
+ # upstream
cd ${srcdir}
- # don't need this anymore.
- rm -rf ${srcdir}/paks
+ mv "${_pkgname}-${_upver}-linux" ${_pkgname}_upstream
+ cp -a ${srcdir}/${_pkgname}_upstream/baseq3/* ${srcdir}/${_pkgname}/baseq3/.
+ cp -a ${srcdir}/${_pkgname}_upstream/missionpack/* ${srcdir}/${_pkgname}/missionpack/.
-
+ # done with this, let's save some disk space.
+ rm -rf ${srcdir}/paks ${srcdir}/${_pkgname}_upstream
}
build() {
@@ -178,21 +189,25 @@ package() {
## GAME ##
cd ${srcdir}/${_pkgname}-game/build/release-linux-${_ARCH}
- for i in tools/{lburg,cpp,rcc,etc,asm} baseq3/{,vm,common,ui,game,cgame} missionpack/{,vm,qcommon,q3ui,ui,game,cgame};
+ #for i in tools/{lburg,cpp,rcc,etc,asm} baseq3/{,vm,common,ui,game,cgame} missionpack/{,vm,qcommon,q3ui,ui,game,cgame}; # per upstream- only needed for debug
+ for i in {baseq3,missionpack}/vm;
do
install -d -m 750 ${pkgdir}/opt/spearmint/${i}
done
- for i in baseq3 tools missionpack;
- do
- for f in $(find ${i} -type f);
- do
- install -D -m 640 ${f} ${pkgdir}/opt/spearmint/${f}
- done
- for x in $(find ${i} -type f -executable);
- do
- chmod 750 ${pkgdir}/opt/spearmint/${x}
- done
- done
+ #for i in baseq3 tools missionpack; # per upstream- tools is mostly debug, compiler, etc. most people won't need them. if they do, they can just switch this back in.
+ #for i in baseq3 missionpack;
+ #do
+ # for f in $(find ${i} -type f);
+ # do
+ # install -D -m 640 ${f} ${pkgdir}/opt/spearmint/${f}
+ # done
+ # for x in $(find ${i} -type f -executable);
+ # do
+ # chmod 750 ${pkgdir}/opt/spearmint/${x}
+ # done
+ #done
+
+
## PATCH ##
cd ${srcdir}/${_pkgname}-patch
@@ -209,7 +224,7 @@ package() {
done
done
- # PK3 PAKs from demo
+ # PK3 PAKs from demo and upstream
install -m 640 ${srcdir}/${_pkgname}/baseq3/* ${pkgdir}/opt/spearmint/baseq3/
install -m 640 ${srcdir}/${_pkgname}/missionpack/* ${pkgdir}/opt/spearmint/missionpack/
diff --git a/ioquake3-q3a-1.32-9.run.sig b/ioquake3-q3a-1.32-9.run.sig
index 14055e9ba07..b9588fb0b29 100644
--- a/ioquake3-q3a-1.32-9.run.sig
+++ b/ioquake3-q3a-1.32-9.run.sig
Binary files differ
diff --git a/spearmint-server.launcher.sig b/spearmint-server.launcher.sig
index 7125e7dbd32..ae421d6ba90 100644
--- a/spearmint-server.launcher.sig
+++ b/spearmint-server.launcher.sig
Binary files differ
diff --git a/spearmint.desktop.sig b/spearmint.desktop.sig
index 6de0d89d2cd..f7a222d0ad3 100644
--- a/spearmint.desktop.sig
+++ b/spearmint.desktop.sig
Binary files differ
diff --git a/spearmint.launcher.sig b/spearmint.launcher.sig
index 1b01281c16b..636fc9c603d 100644
--- a/spearmint.launcher.sig
+++ b/spearmint.launcher.sig
Binary files differ
diff --git a/spearmint.service.sig b/spearmint.service.sig
index fa2f7663b0c..fd4674cf7de 100644
--- a/spearmint.service.sig
+++ b/spearmint.service.sig
Binary files differ
diff --git a/spearmint.svg.sig b/spearmint.svg.sig
index 3f87eb8c581..6354831b4ad 100644
--- a/spearmint.svg.sig
+++ b/spearmint.svg.sig
Binary files differ
diff --git a/upstream.tar.xz.sig b/upstream.tar.xz.sig
new file mode 100644
index 00000000000..828c6bb664e
--- /dev/null
+++ b/upstream.tar.xz.sig
Binary files differ