summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta2014-09-11 23:46:47 +0200
committerJan Cholasta2014-09-24 23:03:49 +0200
commitf01413ba0e4b5f8c0244d59a325873da343a037c (patch)
treee6b790b19dd7e8ebf06dc2d9e3c240ed26eaa4b3
parent81ff0bdd561bd479832fac1e50d66a9c0af59580 (diff)
downloadaur-f01413ba0e4b5f8c0244d59a325873da343a037c.tar.gz
Use fmodex4.26.36 for libfmodex in *zdoom* packages
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD35
2 files changed, 5 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f72deb4ca86..e23b85f51ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,6 +12,7 @@ pkgbase = gzdoom-git
makedepends = imagemagick
makedepends = mesa
depends = fluidsynth
+ depends = fmodex4.26.36
depends = glew
depends = gtk2
depends = gxmessage
@@ -29,13 +30,11 @@ pkgbase = gzdoom-git
provides = gzdoom
conflicts = gzdoom
source = gzdoom::git://github.com/coelckers/gzdoom.git
- source = http://www.fmod.org/download/fmodex/api/Linux/fmodapi42636linux.tar.gz
source = config-update-fix.patch
source = doom-share-dir.patch
source = stack-noexec.patch
source = gzdoom.desktop
md5sums = SKIP
- md5sums = 220a54f330bdf3056d6207a0facf2096
md5sums = d1df774110f513225760b83fcb271171
md5sums = ed6c7d1175146bedac3f5a59d09d8f4b
md5sums = b83081e982b742010df0afe36b4d49b6
diff --git a/PKGBUILD b/PKGBUILD
index 169c491f026..83d1aab0c93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,5 @@
# Maintainer: Jan Cholasta <grubber at grubber cz>
-_fmodver=42636
-_fmodarch=linux
-if [[ "$CARCH" == x86_64 ]]; then
- _fmodarch=linux64
-fi
-
pkgname=gzdoom-git
pkgver=1.9pre.r1026.g48da2f8
pkgrel=1
@@ -13,7 +7,7 @@ pkgdesc="Doom source port based on ZDoom with an OpenGL renderer (git version)."
arch=('i686' 'x86_64')
url="http://www.osnanet.de/c.oelckers/gzdoom/"
license=('custom')
-depends=('fluidsynth' 'glew' 'gtk2' 'gxmessage' 'sdl')
+depends=('fluidsynth' 'fmodex4.26.36' 'glew' 'gtk2' 'gxmessage' 'sdl')
makedepends=('nasm' 'cmake' 'git' 'imagemagick' 'mesa')
optdepends=('blasphemer: Blasphemer (free Heretic) game data'
'chexquest3-wad: Chex Quest 3 game data'
@@ -28,24 +22,17 @@ optdepends=('blasphemer: Blasphemer (free Heretic) game data'
provides=('gzdoom')
conflicts=('gzdoom')
source=(gzdoom::git://github.com/coelckers/gzdoom.git \
- http://www.fmod.org/download/fmodex/api/Linux/fmodapi${_fmodver}${_fmodarch}.tar.gz \
config-update-fix.patch \
doom-share-dir.patch \
stack-noexec.patch \
gzdoom.desktop)
md5sums=('SKIP'
- '220a54f330bdf3056d6207a0facf2096'
'd1df774110f513225760b83fcb271171'
'ed6c7d1175146bedac3f5a59d09d8f4b'
'b83081e982b742010df0afe36b4d49b6'
'3f5920d839086c9ad04ed1338c3fb546')
-if [[ "$CARCH" == i?86 ]]; then
- md5sums[1]='220a54f330bdf3056d6207a0facf2096'
-elif [[ "$CARCH" == x86_64 ]]; then
- md5sums[1]='355cba00a34eb5f7d027da68b452f6d9'
-fi
-
+_fmodver=4.26.36
_libdir=/usr/lib/gzdoom
_sharedir=/usr/share/games/gzdoom
@@ -67,22 +54,10 @@ prepare() {
build() {
cd gzdoom
- local _fmodlib
- if [[ "$CARCH" == i?86 ]]; then
- _fmodlib=libfmodex-${_fmodver:0:1}.${_fmodver:1:2}.${_fmodver:3:2}.so
- elif [[ "$CARCH" == x86_64 ]]; then
- _fmodlib=libfmodex64-${_fmodver:0:1}.${_fmodver:1:2}.${_fmodver:3:2}.so
- fi
-
- cp "$srcdir/fmodapi${_fmodver}${_fmodarch}/api/lib/$_fmodlib" libfmodex.so
-
- cmake -DFMOD_INCLUDE_DIR="$srcdir/fmodapi${_fmodver}${_fmodarch}/api/inc" \
- -DFMOD_LIBRARY=libfmodex.so \
+ cmake -DFMOD_INCLUDE_DIR=/usr/include/fmodex-$_fmodver \
+ -DFMOD_LIBRARY=/usr/lib/libfmodex-$_fmodver.so \
-DCMAKE_C_FLAGS="$CFLAGS -DSHARE_DIR=\\\"$_sharedir\\\"" \
-DCMAKE_CXX_FLAGS="$CXXFLAGS -DSHARE_DIR=\\\"$_sharedir\\\"" \
- -DCMAKE_INSTALL_RPATH=$_libdir \
- -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \
- -DCMAKE_SKIP_BUILD_RPATH=1 \
.
make
@@ -92,8 +67,6 @@ build() {
package() {
cd gzdoom
- install -Dm755 libfmodex.so "$pkgdir/$_libdir/libfmodex.so"
-
install -Dm755 gzdoom "$pkgdir/usr/bin/gzdoom"
install -Dm755 liboutput_sdl.so "$pkgdir/$_libdir/liboutput_sdl.so"
install -Dm644 gzdoom.pk3 "$pkgdir/$_sharedir/gzdoom.pk3"