From 58c676a9c8470054829d5807b21afcaf1b0c9f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 23 Apr 2020 02:24:51 +0200
Subject: [PATCH] Carla: update to 2.1.

---
 srcpkgs/Carla/patches/gcc-9.2.0.patch | 29 ---------------------------
 srcpkgs/Carla/template                | 14 ++++++-------
 2 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/Carla/patches/gcc-9.2.0.patch

diff --git a/srcpkgs/Carla/patches/gcc-9.2.0.patch b/srcpkgs/Carla/patches/gcc-9.2.0.patch
deleted file mode 100644
index b20cc9a6852..00000000000
--- a/srcpkgs/Carla/patches/gcc-9.2.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- source/bridges-ui/CarlaBridgeToolkitQt.cpp
-+++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
-@@ -256,12 +256,6 @@
- #endif
- };
- 
--#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
--# include "CarlaBridgeToolkitQt5.moc"
--#else
--# include "CarlaBridgeToolkitQt4.moc"
--#endif
--
- // -------------------------------------------------------------------------
- 
- CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
-@@ -279,9 +273,13 @@
- int qInitResources();
- int qCleanupResources();
- 
-+CARLA_BRIDGE_UI_USE_NAMESPACE
-+
- #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-+# include "CarlaBridgeToolkitQt5.moc"
- # include "resources.qt5.cpp"
- #else
-+# include "CarlaBridgeToolkitQt4.moc"
- # include "resources.qt4.cpp"
- #endif
- 
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 67d611b1db6..d7998ca66fe 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,12 +1,12 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.0.0
-revision=3
+version=2.1
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
 hostmakedepends="pkg-config python3-PyQt5-devel-tools which"
-makedepends="python3-PyQt5 libmagic file-devel
+makedepends="python3-PyQt5 libmagic file-devel libsndfile-devel
  liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
  gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel
  python3-rdflib"
@@ -14,9 +14,9 @@ depends="python3 python3-PyQt5 python3-PyQt5-svg which"
 short_desc="Audio plugin host"
 maintainer="nutcase84 <nutcase84@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://kxstudio.linuxaudio.org/Applications:Carla"
+homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
 distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
-checksum=d0c8d8417f8cce9abe807f6359231f187d60db7121ec1dccce3b596a22ef6c41
+checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963
 python_version=3
 
 case $XBPS_TARGET_MACHINE in
@@ -30,11 +30,11 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 pre_build() {
-	sed -e '1,1i#include <unistd.h>' \
+	vsed -e '1,1i#include <unistd.h>' \
 		-i source/modules/water/text/CharacterFunctions.h
 
 	if [ "$CROSS_BUILD" ]; then
-		sed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \
+		vsed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \
 			source/plugin/Makefile
 	fi