summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlashbunny2016-03-14 20:08:37 -0400
committerSlashbunny2016-03-14 20:08:37 -0400
commit89f786941c0fc75dc3eca9076a91cdb91e7ac731 (patch)
tree53ef5b58c640ec78db0c0be640b3425083b0e617
parent73f03b3a8d7b926251dc52adf97c36204bf37bf7 (diff)
downloadaur-89f786941c0fc75dc3eca9076a91cdb91e7ac731.tar.gz
Remove speex dep, use CPPFLAGS from makepkg.conf, remove superfluous content in .install file
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
-rw-r--r--quake3.install9
3 files changed, 5 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b01216d96f1..8047064173e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Tue Mar 15 00:07:38 UTC 2016
pkgbase = ioquake3-git
pkgdesc = The de-facto OSS Quake 3 distribution. You need the retail/demo .pk3 files to play.
pkgver = 20140829.gc621589
@@ -16,7 +18,6 @@ pkgbase = ioquake3-git
depends = opus
depends = opusfile
depends = sdl2
- depends = speex
depends = zlib
optdepends = mumble: Mumble VoIP support
provides = quake3
diff --git a/PKGBUILD b/PKGBUILD
index 1cb33e71cbe..aed8fb8bf53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="The de-facto OSS Quake 3 distribution. You need the retail/demo .pk3 fi
url="http://ioquake3.org/"
license=('GPL')
arch=('i686' 'x86_64')
-depends=('curl' 'freetype2' 'libjpeg' 'libvorbis' 'openal' 'opus' 'opusfile' 'sdl2' 'speex' 'zlib')
+depends=('curl' 'freetype2' 'libjpeg' 'libvorbis' 'openal' 'opus' 'opusfile' 'sdl2' 'zlib')
makedepends=('git')
optdepends=('mumble: Mumble VoIP support')
conflicts=('quake3' 'quake3-icculus-svn' 'quake3-svn' 'ioquake3-svn')
@@ -37,6 +37,8 @@ prepare() {
}
q3make() {
+ export CFLAGS+=" ${CPPFLAGS}"
+
make $@ \
BUILD_CLIENT=1 \
BUILD_SERVER=1 \
diff --git a/quake3.install b/quake3.install
index c64cd8056c6..72bc85a9bcf 100644
--- a/quake3.install
+++ b/quake3.install
@@ -21,12 +21,3 @@ post_upgrade() {
post_install $1
}
-pre_remove() {
- /bin/true
-}
-
-op=$1
-shift
-
-$op $*
-