Switch to clang in order to fix issues with gcc 9

2 files changed, 15 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8164cb6454e..e024a5f097a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Fri Mar  4 17:23:30 UTC 2016
 pkgbase = distrho-lv2-git
 	pkgdesc = Distrho LV2 Audio Plugins, using the JUCE Toolkit
-	pkgver = r336.7bcbc9b
-	pkgrel = 4
+	pkgver = r417.7e62235e
+	pkgrel = 1
 	url = http://distrho.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -15,6 +13,7 @@ pkgbase = distrho-lv2-git
 	makedepends = libxrender
 	makedepends = libxcursor
 	makedepends = ladspa
+	makedepends = clang
 	depends = gcc-libs
 	depends = lv2
 	depends = libxext
diff --git a/PKGBUILD b/PKGBUILD
index 2eaafff8df4b..dcd19f78a4cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor : speps <speps at aur dot archlinux dot org>
 _pkgbasename=distrho-lv2
 pkgname=${_pkgbasename}-git
-pkgver=r336.7bcbc9b
-pkgrel=4
+pkgver=r417.7e62235e
+pkgrel=1
 pkgdesc="Distrho LV2 Audio Plugins, using the JUCE Toolkit"
 arch=('i686' 'x86_64')
 url="http://distrho.sourceforge.net/"
 license=('GPL' 'GPL3')
 depends=('gcc-libs' 'lv2' 'libxext' 'freetype2' 'alsa-lib')
-makedepends=('git' 'premake3' 'libxinerama' 'libxrender' 'libxcursor' 'ladspa')
+makedepends=('git' 'premake3' 'libxinerama' 'libxrender' 'libxcursor' 'ladspa' 'clang')
 provides=("${_pkgbasename}")
 conflicts=("${_pkgbasename}" 'distrho-plugins' 'distrho-plugins-lv2-git')
 source=("${_pkgbasename}::git://github.com/DISTRHO/DISTRHO-Ports.git")
@@ -31,6 +31,15 @@ prepare() {
 build() {
   cd "${srcdir}/${_pkgbasename}"
 
+  # Work-around issues with GCC version 9 (https://github.com/DISTRHO/DISTRHO-Ports/issues/45)
+  export CC=clang
+  export CXX=clang++
+
+  # Fix compiler flag issue when mixing C++ and C sources (https://github.com/premake/premake-core/issues/198)
+  sed -i 's/-std=c++0x//g' ports/stereosourceseparation/LV2/StereoSourceSeparation.lv2/StereoSourceSeparation.make
+  sed -i 's/CXXFLAGS += \$(CFLAGS)/CXXFLAGS += \$(CFLAGS) -std=c++0x/g' ports/stereosourceseparation/LV2/StereoSourceSeparation.lv2/StereoSourceSeparation.make
+  # End of work-around
+
   make lv2
 }