Add new RTNeural sub-module

Add soname dependencies

Clean-up and sort dependencies

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

3 files changed, 88 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abc2d1bbd718..c9a1e7f7088a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,33 @@
 pkgbase = guitarix.vst-git
 	pkgdesc = A versatile (guitar) amplifier VST3 plugin (git version)
-	pkgver = v0.2.r0.g821480e
+	pkgver = v0.2.r4.g2a58bea
 	pkgrel = 1
 	url = https://github.com/brummer10/guitarix.vst
 	arch = x86_64
 	groups = vst3-plugins
 	groups = pro-audio
 	license = GPL-3.0-or-later
-	makedepends = git
+	makedepends = alsa-lib
+	makedepends = avahi
 	makedepends = boost
+	makedepends = curl
 	makedepends = eigen
+	makedepends = fftw
+	makedepends = freetype2
+	makedepends = git
 	makedepends = gperf
 	makedepends = intltool
-	makedepends = lv2
-	makedepends = waf
+	makedepends = lilv
+	makedepends = libsndfile
 	makedepends = sassc
-	makedepends = pkgconfig
+	makedepends = waf
 	makedepends = webkit2gtk
-	depends = alsa-lib
-	depends = curl
 	depends = gcc-libs
 	depends = glib2
 	depends = glibc
-	depends = libsigc++
-	depends = libsndfile
-	depends = lilv
-	depends = fftw
-	depends = freetype2
 	depends = glibmm
-	depends = avahi
+	depends = graphite
+	depends = libsigc++
 	optdepends = vst3-host: for VST3 plugins
 	optdepends = gxplugins.lv2: for Guitarix LV2 plugins
 	provides = guitarix.vst
@@ -37,9 +36,32 @@ pkgbase = guitarix.vst-git
 	source = guitarix::git+https://github.com/brummer10/guitarix.git
 	source = NAM::git+https://github.com/sdatkinson/NeuralAmpModelerCore.git
 	source = eigen::git+https://gitlab.com/libeigen/eigen.git
+	source = RTNeural::git+https://github.com/jatinchowdhury18/RTNeural.git
+	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = guitarix.vst-git
+	depends = gcc-libs
+	depends = glib2
+	depends = glibc
+	depends = glibmm
+	depends = graphite
+	depends = libsigc++
+	depends = libasound.so
+	depends = libavahi-client.so
+	depends = libavahi-common.so
+	depends = libavahi-glib.so
+	depends = libavahi-gobject.so
+	depends = libcurl.so
+	depends = libfftw3f.so
+	depends = libfreetype.so
+	depends = libgio-2.0.so
+	depends = libglib-2.0.so
+	depends = libglibmm-2.4.so
+	depends = libgobject-2.0.so
+	depends = liblilv-0.so
+	depends = libsigc-2.0.so
+	depends = libsndfile.so
diff --git a/.gitignore b/.gitignore
index 403a910dbc61..2ec02b8aa641 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-pkg/
-src/
-NAM/
 eigen/
 guitarix/
 guitarix.vst/
 guitarix.vst-git-*.pkg.tar.*
+NAM/
+pkg/
+RTNeural
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 68b0fc4fdf75..992fd62e8703 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,38 @@
 
 _pkgname=guitarix.vst
 pkgname=$_pkgname-git
-pkgver=v0.2.r0.g821480e
+pkgver=v0.2.r4.g2a58bea
 pkgrel=1
 pkgdesc='A versatile (guitar) amplifier VST3 plugin (git version)'
 arch=(x86_64)
 url='https://github.com/brummer10/guitarix.vst'
 license=(GPL-3.0-or-later)
 groups=(vst3-plugins pro-audio)
-depends=(alsa-lib curl gcc-libs glib2 glibc libsigc++ libsndfile lilv fftw freetype2 glibmm avahi)
-makedepends=(git boost eigen gperf intltool lv2 waf sassc pkgconfig webkit2gtk)
+depends=(
+  gcc-libs
+  glib2
+  glibc
+  glibmm
+  graphite
+  libsigc++
+)
+makedepends=(
+  alsa-lib
+  avahi
+  boost
+  curl
+  eigen
+  fftw
+  freetype2
+  git
+  gperf
+  intltool
+  lilv
+  libsndfile
+  sassc
+  waf
+  webkit2gtk
+)
 optdepends=(
   'vst3-host: for VST3 plugins'
   'gxplugins.lv2: for Guitarix LV2 plugins'
@@ -21,8 +44,9 @@ conflicts=($_pkgname)
 source=("$_pkgname::git+https://github.com/brummer10/guitarix.vst"
         'guitarix::git+https://github.com/brummer10/guitarix.git'
         'NAM::git+https://github.com/sdatkinson/NeuralAmpModelerCore.git'
-        'eigen::git+https://gitlab.com/libeigen/eigen.git')
-sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
+        'eigen::git+https://gitlab.com/libeigen/eigen.git'
+        'RTNeural::git+https://github.com/jatinchowdhury18/RTNeural.git')
+sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
 
 pkgver() {
   cd $_pkgname
@@ -42,6 +66,9 @@ prepare() {
   git submodule init trunk/src/NAM/NeuralAmpModelerCore
   git submodule set-url trunk/src/NAM/NeuralAmpModelerCore "$srcdir"/NAM
   git -c protocol.file.allow=always submodule update trunk/src/NAM/NeuralAmpModelerCore
+  git submodule init trunk/src/RTNeural/RTNeural
+  git submodule set-url trunk/src/RTNeural/RTNeural "$srcdir"/RTNeural
+  git -c protocol.file.allow=always submodule update trunk/src/RTNeural/RTNeural
   cd trunk/src/NAM/NeuralAmpModelerCore
   git submodule init Dependencies/eigen
   git submodule set-url Dependencies/eigen "$srcdir"/eigen
@@ -54,6 +81,23 @@ build() {
 }
 
 package() {
+  depends+=(
+    libasound.so
+    libavahi-client.so
+    libavahi-common.so
+    libavahi-glib.so
+    libavahi-gobject.so
+    libcurl.so
+    libfftw3f.so
+    libfreetype.so
+    libgio-2.0.so
+    libglib-2.0.so
+    libglibmm-2.4.so
+    libgobject-2.0.so
+    liblilv-0.so
+    libsigc-2.0.so
+    libsndfile.so
+  )
   cd $_pkgname
   make JUCE_VST3DESTDIR="$pkgdir"/usr/lib/vst3 install
 }