gzdoom-git-2.3pre.1078.g8708c69f8

* Build with the last fmodex version by default
* nasm is no longer required

1 files changed, 9 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c04a272eca24..efa0ce14dc63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,7 @@
 # Maintainer: Jan Cholasta <grubber at grubber cz>
 
-# Build with the recommended fmodex version:
-_fmodex=fmodex4.26.36
-# Build with the currently installed fmodex version:
-#_fmodex=$(LC_ALL=C pacman -Q fmodex | sed -r 's/ /=/;s/-.*$//')
+# Build with fmodex:
+_fmodex=fmodex
 # Build without fmodex:
 #_fmodex=
 
@@ -14,16 +12,14 @@ _openal=openal
 
 _name=gzdoom
 pkgname=${_name}-git
-pkgver=2.2pre.1644.gded479b
+pkgver=2.3pre.1078.g8708c69f8
 pkgrel=1
-_label='GZDoom'
-_desc='Advanced Doom source port with OpenGL support'
-pkgdesc="${_desc} (git version)"
+pkgdesc='Advanced Doom source port with OpenGL support  (git version)'
 arch=('i686' 'x86_64')
 url='http://www.zdoom.org/'
 license=('BSD' 'custom:BUILD' 'custom:doom' 'custom:dumb' 'LGPL')
 depends=('fluidsynth'
-         ${_fmodex}
+         ${_fmodex:+$(LC_ALL=C pacman -Q $_fmodex | sed -r 's/ /=/;s/-.*$//')}
          'gtk2'
          'libgl'
          'libgme'
@@ -36,7 +32,6 @@ makedepends=('cmake'
              'git'
              'imagemagick'
              'xdg-utils')
-makedepends_i686=('nasm')
 optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
             'chexquest3-wad: Chex Quest 3 game data'
             'doom1-wad: Doom shareware game data'
@@ -65,15 +60,15 @@ pkgver() {
     git describe --long --tags --match '[Gg]*' | sed -r 's/^[Gg]//;s/([^-]*-g)/\1/;s/-/./g'
 }
 
-prepare() {
+build() {
     cd "${_srcsubdir}"
 
     local _nofmod _noopenal _fmodincdir _fmodlib
 
     if [[ -n "${_fmodex}" ]]; then
         _nofmod=OFF
-        _fmodincdir=$(LC_ALL=C pacman -Ql ${_fmodex%=*} | grep -Eo '/usr/include/fmodex[^/]*/$')
-        _fmodlib=$(LC_ALL=C pacman -Ql ${_fmodex%=*} | grep -Eo '/usr/lib/libfmodex-[^/]*\.so$')
+        _fmodincdir=$(LC_ALL=C pacman -Ql $_fmodex | grep -Eo '/usr/include/fmodex[^/]*/$')
+        _fmodlib=$(LC_ALL=C pacman -Ql $_fmodex | grep -Eo '/usr/lib/libfmodex-[^/]*\.so$')
     else
         _nofmod=ON
     fi
@@ -94,18 +89,13 @@ prepare() {
           -DCMAKE_CXX_FLAGS="$CXXFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \
           -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,noexecstack" \
           .
-}
-
-build() {
-    cd "${_srcsubdir}"
+    make
 
     cat >"${_name}.sh" <<EOF
 #!/bin/sh
 exec /usr/lib/${_name}/${_name} "\$@"
 EOF
 
-    make
-
     sed -n '/\*\*-/,/\*\*-/p' 'src/version.h' >'bsd.txt'
 
     cp "${srcdir}/launcher.desktop" "${_name}.desktop"