summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Arndt2017-01-21 16:08:35 +0100
committerChristopher Arndt2017-01-21 16:08:35 +0100
commit8cb4e80c171b18cc91cfac758b701c7eb16b1cd7 (patch)
tree595775e76bc84eea09a2930fdaefda78cc6fab2c
parent923affd3307ed1b9e91ed98f08b02f8c4180c92e (diff)
parent55961d427a2468952b36ff8252ad92e55764f5af (diff)
downloadaur-8cb4e80c171b18cc91cfac758b701c7eb16b1cd7.tar.gz
Merge branch 'master' into local
Signed-off-by: Christopher Arndt <chris@chrisarndt.de>
-rw-r--r--.SRCINFO21
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD36
-rw-r--r--carla-git.install3
4 files changed, 29 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index da1d11e1842..74adb0ff9ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Fri Jan 6 12:38:06 UTC 2017
pkgbase = carla-git
pkgdesc = Audio Plugin Host
- pkgver = 1.9.6.r118.g3130631
+ pkgver = 1.9.7.r6.g3075aa2c
pkgrel = 1
url = http://kxstudio.sf.net/carla
install = carla-git.install
@@ -8,23 +10,20 @@ pkgbase = carla-git
arch = x86_64
license = GPL2
makedepends = git
- depends = python-pyqt4
- depends = clthreads
+ depends = python-pyqt5
+ depends = qt5-svg
depends = fluidsynth
depends = gtk2
depends = gtk3
+ depends = qt4
depends = liblo
- depends = linuxsampler-svn
+ depends = linuxsampler
depends = mxml
- depends = zita-convolver
- depends = zita-resampler
- depends = clxclient
depends = ntk-git
- depends = qt5-base
- depends = libpng12
- optdepends = pygtk: NekoFilter UI
+ depends = fftw
+ depends = file
optdepends = zlib: extra native plugins
- optdepends = zynaddsubfx-git: zynaddsubfx banks
+ optdepends = zynaddsubfx: zynaddsubfx banks
provides = carla
conflicts = carla
source = carla-git::git://github.com/falkTX/Carla.git
diff --git a/.gitignore b/.gitignore
index 653f858f45f..a37bb0b8544 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
*.xz
*.gz
/carla-git/
+*.tar
diff --git a/PKGBUILD b/PKGBUILD
index b792db9acb7..ce884537028 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
}
diff --git a/carla-git.install b/carla-git.install
index 792422c9c61..e69de29bb2d 100644
--- a/carla-git.install
+++ b/carla-git.install
@@ -1,3 +0,0 @@
-update-mime-database usr/share/mime
-update-desktop-database -q
-xdg-icon-resource \ No newline at end of file