merge rvxx-ex-amp-bin back with rvxx-amp-bin

4 files changed, 31 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 288eb76a2dac..01d83a16fa7c 100755..100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = rvxx-amp-bin
-	pkgdesc = Audio Assault RVXX Aggressive Guitar Amplifier
-	pkgver = 2.0.0
+	pkgdesc = Audio Assault RVXX Aggressive Guitar Amplifier Next Generation
+	pkgver = 20220309
 	pkgrel = 1
 	url = https://audio-assault.com/rvxx.php
 	arch = x86_64
 	groups = pro-audio
 	groups = vst-plugins
+	groups = vst3-plugins
 	license = EULA
 	makedepends = xdg-user-dirs
 	makedepends = unzip
 	depends = libcurl-gnutls
 	depends = glibc
-	source = RVXX Amp.desktop
-	sha256sums = 858a49f32dacebe3bdbdbae578b9398e97470b0311fdb00b91314da88fbd552c
+	conflicts = rvxx-ex-amp-bin
+	source = RVXX EX Amp.desktop
+	sha256sums = 9cb4ea4e896f31d72324134cbabe47899020b92164ade82f18302bb78eb391cf
 
 pkgname = rvxx-amp-bin
diff --git a/PKGBUILD b/PKGBUILD
index 7658a02c2b47..f4ec7233a9a1 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,20 @@
 pkgname=rvxx-amp-bin
-pkgver=2.0.0
+pkgver=20220309
 pkgrel=1
-pkgdesc="Audio Assault RVXX Aggressive Guitar Amplifier"
+pkgdesc="Audio Assault RVXX Aggressive Guitar Amplifier Next Generation"
 arch=('x86_64')
 url="https://audio-assault.com/rvxx.php"
 license=('EULA')
-groups=('pro-audio' 'vst-plugins')
+groups=('pro-audio' 'vst-plugins' 'vst3-plugins')
 depends=('libcurl-gnutls' 'glibc')
 makedepends=('xdg-user-dirs' 'unzip')
-source=("RVXX Amp.desktop")
-sha256sums=('858a49f32dacebe3bdbdbae578b9398e97470b0311fdb00b91314da88fbd552c')
+conflicts=('rvxx-ex-amp-bin')
+source=("RVXX EX Amp.desktop")
+sha256sums=('9cb4ea4e896f31d72324134cbabe47899020b92164ade82f18302bb78eb391cf')
 
 prepare () {
 	## Extract AIR Impulse Response
-	_archive="`xdg-user-dir DOWNLOAD`/RVXX+v2+Installers+Feb_26_2021.zip"
+	_archive="`xdg-user-dir DOWNLOAD`/RVXX_EX_v1.0.zip"
 	ln -srf "${_archive}" "$srcdir/`basename "${_archive}"`"
 	unzip "$srcdir/`basename "${_archive}"`"
 	find $srcdir -name ".DS_Store" -delete
@@ -21,15 +22,17 @@ prepare () {
 
 package() {
     ## Install Preset and Default Libraries
-    mkdir -p "$pkgdir/opt/Audio Assault/RVXX/"{IRs,Presets} "$pkgdir/usr/bin" "$pkgdir/usr/share/applications"
-    cp -rf $srcdir/RVXX\ v2\ Linux\ /InstallerData/RVXX/IRs/*.wav "$pkgdir/opt/Audio Assault/RVXX/IRs"
-    cp -rf $srcdir/RVXX\ v2\ Linux\ /InstallerData/RVXX/Presets/*.preset "$pkgdir/opt/Audio Assault/RVXX/Presets"
+    mkdir -p "$pkgdir/opt/Audio Assault/RVXX EX" "$pkgdir/usr/bin" "$pkgdir/usr/share/applications"
+    cp -rf "$srcdir/RVXX EX Linux/RVXX EX"/{IRs,MIDI,Presets} "$pkgdir/opt/Audio Assault/RVXX EX"
 
     ## Install VST Plugin
-    install -Dm755 "$srcdir/RVXX v2 Linux /InstallerData/RVXX/RVXX v2.so" "$pkgdir/usr/lib/vst/RVXX v2.so"
+    install -Dm755 "$srcdir/RVXX EX Linux/RVXX EX VST2.so" "$pkgdir/usr/lib/vst/RVXX EX.so"
+
+    ## Install VST3 Plugin
+    install -Dm755 "$srcdir/RVXX EX Linux/RVXX EX.vst3/Contents/x86_64-linux/RVXX EX.so" "$pkgdir/usr/lib/vst3/RVXX EX.vst3/Contents/x86_64-linux/RVXX EX.so"
 
     ## Install Standalone Binary
-    cp "$srcdir/RVXX v2 Linux /InstallerData/RVXX/RVXX v2 Standalone" "$pkgdir/usr/bin/RVXX v2 Standalone"
-    chmod +x "$pkgdir/usr/bin/RVXX v2 Standalone"
-    install -Dm644 "$srcdir/RVXX Amp.desktop" "$pkgdir/usr/share/applications/RVXX Amp.desktop"
+    cp "$srcdir/RVXX EX Linux/RVXX EX Standalone" "$pkgdir/usr/bin/RVXX EX Standalone"
+    chmod +x "$pkgdir/usr/bin/RVXX EX Standalone"
+    install -Dm644 "$srcdir/RVXX EX Amp.desktop" "$pkgdir/usr/share/applications/RVXX EX Amp.desktop"
 }
diff --git a/RVXX Amp.desktop b/RVXX Amp.desktop
deleted file mode 100755
index f422575c4138..000000000000
--- a/RVXX Amp.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Comment=Audio Assault RVXX Aggressive Guitar Amplifier
-Type=Application
-Categories=AudioVideo;X-AudioEditing
-Terminal=false
-Exec="/usr/bin/RVXX v2 Standalone"
-Name=RVXX Guitar Amp
diff --git a/RVXX EX Amp.desktop b/RVXX EX Amp.desktop
new file mode 100755
index 000000000000..bdcbd3421d98
--- /dev/null
+++ b/RVXX EX Amp.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Comment=Audio Assault RVXX EX Aggressive Guitar Amplifier
+Type=Application
+Categories=AudioVideo;X-AudioEditing
+Terminal=false
+Exec="/usr/bin/RVXX EX Standalone"
+Name=RVXX EX Guitar Amp