Merge branch 'master' into local

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

1 files changed, 18 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b792db9acb76..ce884537028c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,38 @@
 # Maintainer: cocreature <moritz.kiefer<at>purelyfunctional<dot>org>
+# Contributor: Christopher Arndt <aur -at- chrisarndt -dot- de>
 
 pkgname=carla-git
-pkgver=1.9.6.r500.g0e81fd3
+pkgver=1.9.7.r16.g5a95517b
 pkgrel=1
 pkgdesc="Audio Plugin Host"
-arch=('i686' 'x86_64')
+arch=("i686" "x86_64")
 url="http://kxstudio.sf.net/carla"
-license=('GPL2')
-conflicts=('carla')
-provides=('carla')
-depends=("python-pyqt4"
-         "clthreads"
+license=("GPL2")
+conflicts=("carla")
+provides=("carla")
+depends=("python-pyqt5"
+         "qt5-svg"
          "fluidsynth"
          "gtk2"
          "gtk3"
+         "qt4"
          "liblo"
-         "linuxsampler-svn"
+         "linuxsampler"
          "mxml"
-         "zita-convolver"
-         "zita-resampler"
-         "clxclient"
          "ntk-git"
-         "qt5-base")
-makedepends=('git')
+         "fftw"
+         "file")
+makedepends=("git")
 optdepends=("pygtk: NekoFilter UI"
             "zlib: extra native plugins"
-            "zynaddsubfx-git: zynaddsubfx banks")
-source=("$pkgname"::'git://github.com/falkTX/Carla.git')
+            "zynaddsubfx: zynaddsubfx banks")
+source=("$pkgname"::"git://github.com/falkTX/Carla.git")
 md5sums=('SKIP')
 install="$pkgname.install"
 
 pkgver() {
   cd "$srcdir/$pkgname"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags | sed "s/\([^-]*-g\)/r\1/;s/-/./g"
 }
 
 prepare() {
@@ -43,10 +43,10 @@ prepare() {
 
 build() {
   cd "$srcdir/$pkgname"
-  make EXPERIMENTAL_PLUGINS=true
+  make DEFAULT_QT=5 EXPERIMENTAL_PLUGINS=true
 }
 
 package() {
   cd "$srcdir/$pkgname"
-  make EXPERIMENTAL_PLUGINS=true DESTDIR="$pkgdir/" PREFIX=/usr install
+  make DEFAULT_QT=5 EXPERIMENTAL_PLUGINS=true DESTDIR="$pkgdir/" PREFIX=/usr install
 }