Switch to clang in order to fix issues with gcc 9

2 files changed, 27 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 668f5e177e5..e9943f9af1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Fri May 11 13:06:27 UTC 2018
 pkgbase = distrho-extra-lv2-git
 	pkgdesc = Extra LV2 ports of JUCE-based audio plugins using the DISTRHO framework
 	pkgver = r26.b6f25f1
@@ -11,9 +9,16 @@ pkgbase = distrho-extra-lv2-git
 	license = MIT
 	makedepends = git
 	makedepends = premake3
+	makedepends = libxinerama
+	makedepends = libxrender
+	makedepends = libxcursor
+	makedepends = ladspa
+	makedepends = clang
+	depends = gcc-libs
 	depends = lv2
-	depends = freetype2
 	depends = libxext
+	depends = freetype2
+	depends = alsa-lib
 	provides = distrho-extra-lv2
 	conflicts = distrho-extra-lv2
 	source = distrho::git://github.com/DISTRHO/DISTRHO-Ports.git
diff --git a/PKGBUILD b/PKGBUILD
index ccf7be89a61..3fcfdaeeca9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ pkgdesc="Extra LV2 ports of JUCE-based audio plugins using the DISTRHO framework
 arch=('i686' 'x86_64')
 url="http://distrho.sourceforge.net/"
 license=('GPL' 'MIT')
-depends=('lv2' 'freetype2' 'libxext')
-makedepends=('git' 'premake3')
+depends=('gcc-libs' 'lv2' 'libxext' 'freetype2' 'alsa-lib')
+makedepends=('git' 'premake3' 'libxinerama' 'libxrender' 'libxcursor' 'ladspa' 'clang')
 provides=("${_pkgbasename}")
 conflicts=("${_pkgbasename}")
 source=("${_pkgbasename%%-*}::git://github.com/DISTRHO/DISTRHO-Ports.git"
@@ -22,13 +22,11 @@ pkgver() {
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-# TODO: make DISTRHO-Ports a dependency instead of having to build it in here
 prepare() {
   cd "${srcdir}/${_pkgbasename%%-*}"
 
   # generate build script
   scripts/premake-update.sh linux
-  make
   
   cd "${srcdir}/${_pkgbasename}"
 
@@ -40,8 +38,25 @@ prepare() {
   scripts/premake-update.sh linux
 }
 
+# TODO: make DISTRHO-Ports a dependency instead of having to build it separately
 build() {
+  # Work-around issues with GCC version 9 (https://github.com/DISTRHO/DISTRHO-Ports/issues/45)
+  export CC=clang
+  export CXX=clang++
+
+  cd "${srcdir}/${_pkgbasename%%-*}"
+  # 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
+
+  make lv2
+
   cd "${srcdir}/${_pkgbasename}"
+  # 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/PdPulp/LV2-fx/PdPulpFX.lv2/PdPulpFX.make
+  sed -i 's/CXXFLAGS += \$(CFLAGS)/CXXFLAGS += \$(CFLAGS) -std=c++0x/g' ports/PdPulp/LV2-fx/PdPulpFX.lv2/PdPulpFX.make
+  sed -i 's/-std=c++0x//g' ports/PdPulp/LV2-ins/PdPulp.lv2/PdPulp.make
+  sed -i 's/CXXFLAGS += \$(CFLAGS)/CXXFLAGS += \$(CFLAGS) -std=c++0x/g' ports/PdPulp/LV2-ins/PdPulp.lv2/PdPulp.make
 
   make lv2
 }