Better workaround for upstream issue #144

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

2 files changed, 6 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd8df301d349..192df251526d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dexed-git
 	pkgdesc = A software synth closely modelled on the Yamaha DX7 (git version)
-	pkgver = 0.9.4.r228.eea1256
+	pkgver = 0.9.4.1.r233.73a266d
 	pkgrel = 1
 	url = http://asb2m10.github.io/dexed/
 	changelog = ChangeLog
diff --git a/PKGBUILD b/PKGBUILD
index 1b58b6aaccb9..535ea70f8aaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=dexed
 pkgname="${_pkgname}-git"
-pkgver=0.9.4.r228.eea1256
+pkgver=0.9.4.1.r233.73a266d
 pkgrel=1
 pkgdesc="A software synth closely modelled on the Yamaha DX7 (git version)"
 arch=('i686' 'x86_64')
@@ -24,35 +24,21 @@ pkgver() {
   cd "${srcdir}/${_pkgname}"
 
   local ver=$(cpp -dM Source/Dexed.h | grep '^#define DEXED_ID' | cut -d '"' -f 2)
+  # replace alpha chars with a dot
+  ver=$(echo $ver | sed -e 's/[a-z]\+/./')
   echo "$ver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
   msg2 "Building Dexed stand-alone..."
-  cd "$srcdir/${_pkgname}"
-  sed -i \
-    -e 's|JUCE_JACK="0"|JUCE_JACK="1"|' \
-    -e 's|buildVST="1"|buildVST="0"|' \
-    Dexed.jucer
-  Projucer --resave Dexed.jucer
-
   cd "${srcdir}/${_pkgname}/Builds/Linux"
-  make CONFIG=Release
+  make CONFIG=Release CXXFLAGS="-D JUCE_JACK=1 -D JUCE_ALSA=1 -D buildVST=0 -D buildStandalone=1"
   cp -f build/Dexed "${srcdir}/${_pkgname}"
 
   msg2 "Building Dexed VST plug-in..."
-  cd "$srcdir/${_pkgname}"
-  sed -i \
-    -e 's|JUCE_ALSA="1"|JUCE_ALSA="0"|' \
-    -e 's|JUCE_JACK="1"|JUCE_JACK="0"|' \
-    -e 's|buildVST="0"|buildVST="1"|' \
-    -e 's|buildStandalone="1"|buildStandalone="0"|' \
-    Dexed.jucer
-  Projucer --resave Dexed.jucer
-
   cd "${srcdir}/${_pkgname}/Builds/Linux"
   make clean
-  make CONFIG=Release
+  make CONFIG=Release CXXFLAGS="-D JUCE_JACK=0 -D JUCE_ALSA=0 -D buildVST=1 -D buildStandalone=0"
   cp -f build/Dexed.so "${srcdir}/${_pkgname}"
 }