Use fmodex4.26.36 for libfmodex in *zdoom* packages

2 files changed, 5 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 914ba001e79f..2e5f1ffdb34c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = zdoom
 	makedepends = imagemagick
 	makedepends = p7zip
 	depends = fluidsynth
+	depends = fmodex4.26.36
 	depends = gtk2
 	depends = gxmessage
 	depends = sdl
@@ -26,12 +27,10 @@ pkgbase = zdoom
 	optdepends = urbanbrawl-wad: Urban Brawl: Action Doom 2 game data
 	noextract = zdoom-2.7.1-src.7z
 	source = http://zdoom.org/files/zdoom/2.7/zdoom-2.7.1-src.7z
-	source = http://www.fmod.org/download/fmodex/api/Linux/fmodapi42636linux.tar.gz
 	source = doom-share-dir.patch
 	source = stack-noexec.patch
 	source = zdoom.desktop
 	md5sums = 900a13cca9283fa91874210eeef0c839
-	md5sums = 355cba00a34eb5f7d027da68b452f6d9
 	md5sums = 4885de42e92dc1d5250db561f7ce9537
 	md5sums = 7437cdf6478360c87649564e6e1dcb3b
 	md5sums = 83e47fdae2768da78cd4ac151ec92ad1
diff --git a/PKGBUILD b/PKGBUILD
index 1fed079ef2cc..2f97686a62f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,6 @@
 # Maintainer: Jan Cholasta <grubber at grubber cz>
 # Contributor: Andrew Rabert <arabert@nullsum.net>
 
-_fmodver=42636
-_fmodarch=linux
-if [[ "$CARCH" == x86_64 ]]; then
-  _fmodarch=linux64
-fi
-
 pkgname=zdoom
 pkgver=2.7.1
 pkgrel=3
@@ -14,7 +8,7 @@ pkgdesc="An enhanced Doom port with additional support for Heretic, Hexen and St
 arch=('i686' 'x86_64')
 url="http://www.zdoom.org/"
 license=('custom')
-depends=('fluidsynth' 'gtk2' 'gxmessage' 'sdl')
+depends=('fluidsynth' 'fmodex4.26.36' 'gtk2' 'gxmessage' 'sdl')
 makedepends=('nasm' 'cmake' 'imagemagick' 'p7zip')
 optdepends=('blasphemer: Blasphemer (free Heretic) game data'
             'chexquest3-wad: Chex Quest 3 game data'
@@ -27,23 +21,16 @@ optdepends=('blasphemer: Blasphemer (free Heretic) game data'
             'strife0-wad: Strife shareware game data'
             'urbanbrawl-wad: Urban Brawl: Action Doom 2 game data')
 source=(http://zdoom.org/files/zdoom/2.7/zdoom-$pkgver-src.7z \
-        http://www.fmod.org/download/fmodex/api/Linux/fmodapi${_fmodver}${_fmodarch}.tar.gz \
         doom-share-dir.patch \
         stack-noexec.patch \
         zdoom.desktop)
 noextract=(zdoom-$pkgver-src.7z)
 md5sums=('900a13cca9283fa91874210eeef0c839'
-         '355cba00a34eb5f7d027da68b452f6d9'
          '4885de42e92dc1d5250db561f7ce9537'
          '7437cdf6478360c87649564e6e1dcb3b'
          '83e47fdae2768da78cd4ac151ec92ad1')
 
-if [[ "$CARCH" == i?86 ]]; then
-  md5sums[1]='220a54f330bdf3056d6207a0facf2096'
-elif [[ "$CARCH" == x86_64 ]]; then
-  md5sums[1]='355cba00a34eb5f7d027da68b452f6d9'
-fi
-
+_fmodver=4.26.36
 _libdir=/usr/lib/zdoom
 _sharedir=/usr/share/games/zdoom
 
@@ -61,20 +48,10 @@ prepare() {
 build() {
   cd $pkgname-$pkgver
 
-  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" libzdoom-fmodex.so
-
-  cmake -DFMOD_INCLUDE_DIR="$srcdir/fmodapi${_fmodver}${_fmodarch}/api/inc" \
-        -DFMOD_LIBRARY=libzdoom-fmodex.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_SKIP_BUILD_RPATH=1 \
         .
   make
 
@@ -84,8 +61,6 @@ build() {
 package() {
   cd $pkgname-$pkgver
 
-  install -Dm755 libzdoom-fmodex.so "$pkgdir/usr/lib/libzdoom-fmodex.so"
-
   install -Dm755 zdoom "$pkgdir/usr/bin/zdoom"
   install -Dm755 liboutput_sdl.so "$pkgdir/$_libdir/liboutput_sdl.so"
   install -Dm644 zdoom.pk3 "$pkgdir/$_sharedir/zdoom.pk3"