Revert "Dependency tuning."

This reverts commit 462ff4b4b6a80918477fcc5cfc7c695113ac188e.

2 files changed, 39 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f0f070a6b11..f931e4629e44 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Feb 13 19:55:24 UTC 2016
+# Wed Jan 27 04:48:51 UTC 2016
 pkgbase = carla
 	pkgdesc = Audio Plugin Host
 	pkgver = 1.2.4
@@ -9,40 +9,30 @@ pkgbase = carla
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = ffmpeg
-	makedepends = fftw
-	makedepends = fluidsynth
-	makedepends = glu
 	makedepends = gtk2
 	makedepends = gtk3
-	makedepends = libsmf
-	makedepends = linuxsampler-svn
-	makedepends = mxml
-	makedepends = ntk-git
 	makedepends = pygtk
-	makedepends = python-pyqt4
-	makedepends = python-pyliblo
-	makedepends = qt5-base
 	makedepends = zlib
 	makedepends = zynaddsubfx
+	depends = clthreads
+	depends = clxclient
+	depends = ffmpeg
+	depends = fluidsynth
+	depends = glu
 	depends = liblo
-	depends = python
-	depends = qt4
-	optdepends = ffmpeg: Extra - Native plugin
-	optdepends = fftw: Extra - Native plugin
-	optdepends = fluidsynth: SF2 support
-	optdepends = glu: OpenGL support
-	optdepends = gtk2: LV2 GTK2 UI support
-	optdepends = gtk3: LV2 GTK3 UI support
-	optdepends = libsmf: Extra - Native Plugin
-	optdepends = linuxsampler-svn: GIG and SFZ support
-	optdepends = mxml: Extra - Native plugin
-	optdepends = ntk-git: Extra - Native plugin
-	optdepends = python-pyliblo: Carla-Control
-	optdepends = python-rdflib: LADSPA-RDF support
+	depends = libpng12
+	depends = libsmf
+	depends = linuxsampler-svn
+	depends = mxml
+	depends = ntk-git
+	depends = python-pyliblo
+	depends = python-pyqt4
+	depends = zita-convolver
+	depends = zita-resampler
+	optdepends = gtk2: lv2 gtk2 ui support
+	optdepends = gtk3: lv2 gtk3 ui support
 	optdepends = pygtk: NekoFilter UI
-	optdepends = qt5-base: LV2 UI support
-	optdepends = zlib: Extra - Native plugin
+	optdepends = zlib: extra native plugins
 	optdepends = zynaddsubfx: ZynAddSubFX banks
 	provides = carla
 	conflicts = carla-git
diff --git a/PKGBUILD b/PKGBUILD
index be7a9be17a36..6ec398436aed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,24 +8,29 @@ pkgdesc="Audio Plugin Host"
 arch=('i686' 'x86_64')
 url="http://kxstudio.sf.net/carla"
 license=('GPL2')
-depends=('liblo' 'python' 'qt4')
-makedepends=('ffmpeg' 'fftw' 'fluidsynth' 'glu' 'gtk2' 'gtk3' 'libsmf' 'linuxsampler-svn' 'mxml' 'ntk-git' 'pygtk' 'python-pyqt4' 'python-pyliblo' 'qt5-base' 'zlib' 'zynaddsubfx')
+depends=(
+  'clthreads'
+  'clxclient'
+  'ffmpeg'
+  'fluidsynth'
+  'glu'
+  'liblo'
+  'libpng12'
+  'libsmf'
+  'linuxsampler-svn'
+  'mxml'
+  'ntk-git'
+  'python-pyliblo'
+  'python-pyqt4'
+  'zita-convolver'
+  'zita-resampler'
+)
+makedepends=('gtk2' 'gtk3' 'pygtk' 'zlib' 'zynaddsubfx')
 optdepends=(
-  'ffmpeg: Extra - Native plugin'
-  'fftw: Extra - Native plugin'
-  'fluidsynth: SF2 support'
-  'glu: OpenGL support'
-  'gtk2: LV2 GTK2 UI support'
-  'gtk3: LV2 GTK3 UI support'
-  'libsmf: Extra - Native Plugin'
-  'linuxsampler-svn: GIG and SFZ support'
-  'mxml: Extra - Native plugin'
-  'ntk-git: Extra - Native plugin'
-  'python-pyliblo: Carla-Control'
-  'python-rdflib: LADSPA-RDF support'
+  'gtk2: lv2 gtk2 ui support'
+  'gtk3: lv2 gtk3 ui support'
   'pygtk: NekoFilter UI'
-  'qt5-base: LV2 UI support'
-  'zlib: Extra - Native plugin'
+  'zlib: extra native plugins'
   'zynaddsubfx: ZynAddSubFX banks'
 )
 provides=("${pkgname}")