dependencies and build flags updates

2 files changed, 20 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d8dfc983414..0cde0caccff8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Sun Jan 26 11:27:22 UTC 2020
+# Sun Jan 26 16:18:05 UTC 2020
 pkgbase = guitarix-git
-	pkgdesc = A simple mono guitar amplifier and FX for JACK using Faust
+	pkgdesc = virtual guitar amplifier for Jack/Linux
 	pkgver = 0.39.0.r5.g2addb8b8
 	pkgrel = 1
 	url = https://guitarix.org
@@ -18,30 +18,20 @@ pkgbase = guitarix-git
 	makedepends = ladspa
 	makedepends = lv2
 	makedepends = waf
-	depends = avahi
-	depends = bluez-libs
-	depends = cairo
-	depends = cairomm
-	depends = gcc-libs
-	depends = gdk-pixbuf2
-	depends = glib2
-	depends = glibc
-	depends = glibmm
-	depends = gtk2
+	depends = jack
 	depends = gtkmm
-	depends = libboost_iostreams.so
-	depends = libcurl.so
-	depends = libjack.so
-	depends = liblilv-0.so
-	depends = liblrdf.so
-	depends = libsndfile.so
-	depends = libzita-convolver.so
-	depends = libzita-resampler.so
-	depends = pango
-	depends = pangomm
+	depends = liblrdf
+	depends = lilv
+	depends = bluez-libs
+	depends = boost-libs
+	depends = zita-convolver
+	depends = zita-resampler
 	depends = ttf-roboto
+	depends = libsndfile
+	provides = guitarix
 	provides = libgxw.so
 	provides = libgxwmm.so
+	conflicts = guitarix
 	replaces = guitarix2
 	source = guitarix::git+https://git.code.sf.net/p/guitarix/git
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 0be27211d4de..3f7dd7dd1b8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,17 +7,16 @@
 pkgname=guitarix-git
 pkgver=0.39.0.r5.g2addb8b8
 pkgrel=1
-pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust"
+pkgdesc="virtual guitar amplifier for Jack/Linux"
 arch=('x86_64')
 url="https://guitarix.org"
 license=('GPL3')
 groups=('ladspa-plugins' 'lv2-plugins' 'pro-audio')
-depends=('avahi' 'bluez-libs' 'cairo' 'cairomm' 'gcc-libs' 'gdk-pixbuf2'
-'glib2' 'glibc' 'glibmm' 'gtk2' 'gtkmm' 'libboost_iostreams.so' 'libcurl.so'
-'libjack.so' 'liblilv-0.so' 'liblrdf.so' 'libsndfile.so' 'libzita-convolver.so'
-'libzita-resampler.so' 'pango' 'pangomm' 'ttf-roboto')
+depends=('jack' 'gtkmm' 'liblrdf' 'lilv' 'bluez-libs' 'boost-libs' 
+'zita-convolver' 'zita-resampler' 'ttf-roboto' 'libsndfile')
 makedepends=('git' 'boost' 'eigen' 'gperf' 'intltool' 'ladspa' 'lv2' 'waf')
-provides=('libgxw.so' 'libgxwmm.so')
+provides=('guitarix' 'libgxw.so' 'libgxwmm.so')
+conflicts=('guitarix')
 replaces=('guitarix2')
 source=("${pkgname%-*}::git+https://git.code.sf.net/p/guitarix/git")
 md5sums=('SKIP')
@@ -29,10 +28,11 @@ pkgver() {
 
 build() {
   cd "${pkgname%-*}/trunk"
-  # when building with faust 2.20.2 it fails: https://sourceforge.net/p/guitarix/bugs/86/
   waf configure --prefix=/usr \
+  				--optimization \
+				--includeresampler \
+				--includeconvolver \
                 --enable-nls \
-                --ladspa \
                 --new-ladspa \
                 --no-faust \
                 --shared-lib \