update: PKGBUILD fixes, new local RIR database

2 files changed, 36 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b704c7a34b7..3d18a7220cb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,31 @@
 pkgbase = hybridreverb2-git
 	pkgdesc = Hybrid impulse convolution reverb, available as LV2 and VST
-	pkgver = r12.3a5e6dc
+	pkgver = r92.6beac8e
 	pkgrel = 1
 	url = https://github.com/jpcima/HybridReverb2
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = git
+	makedepends = cmake
 	makedepends = unzip
+	makedepends = libxrandr
+	makedepends = libxinerama
+	makedepends = libxcursor
 	depends = fftw
-	depends = alsa-lib
+	depends = jack
 	depends = freetype2
 	depends = libxext
+	depends = hicolor-icon-theme
 	provides = hybridreverb2
 	conflicts = hybridreverb2
+	noextract = RIR-1.0.0.zip
 	source = git+https://github.com/jpcima/HybridReverb2.git
-	source = http://www2.ika.ruhr-uni-bochum.de/HybridReverb2/HybridReverb2_large_database.zip
+	source = git+https://github.com/jpcima/JUCE.git
+	source = RIR-1.0.0.zip::https://github.com/jpcima/HybridReverb2-impulse-response-database/archive/v1.0.0.zip
 	sha256sums = SKIP
-	sha256sums = 55805e9b1c914d3486aec02d0242e3ff92e85b9e24aaa9899be9a3ae562edb4a
+	sha256sums = SKIP
+	sha256sums = 8ada57a590e6b04c272312874c67656ccf7e3de71b2cc7dbaadf53880fb77fd7
 
 pkgname = hybridreverb2-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6acf0b96de0a..7578997e93f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: JP Cimalando <jp-dev inbox.ru>
 pkgname=hybridreverb2-git
 _pkgname=HybridReverb2
-pkgver=r12.3a5e6dc
+pkgver=r92.6beac8e
+_rirver=1.0.0
 pkgrel=1
 epoch=
 pkgdesc="Hybrid impulse convolution reverb, available as LV2 and VST"
@@ -9,8 +10,8 @@ arch=('i686' 'x86_64')
 url="https://github.com/jpcima/HybridReverb2"
 license=('GPL')
 groups=()
-depends=('fftw' 'alsa-lib' 'freetype2' 'libxext')
-makedepends=('unzip')
+depends=('fftw' 'jack' 'freetype2' 'libxext' 'hicolor-icon-theme')
+makedepends=('git' 'cmake' 'unzip' 'libxrandr' 'libxinerama' 'libxcursor')
 checkdepends=()
 optdepends=()
 provides=('hybridreverb2')
@@ -21,10 +22,12 @@ options=()
 install=
 changelog=
 source=("git+https://github.com/jpcima/$_pkgname.git"
-        "http://www2.ika.ruhr-uni-bochum.de/$_pkgname/${_pkgname}_large_database.zip")
-noextract=()
+        "git+https://github.com/jpcima/JUCE.git"
+        "RIR-$_rirver.zip::https://github.com/jpcima/HybridReverb2-impulse-response-database/archive/v$_rirver.zip")
+noextract=("RIR-$_rirver.zip")
 sha256sums=('SKIP'
-            '55805e9b1c914d3486aec02d0242e3ff92e85b9e24aaa9899be9a3ae562edb4a')
+            'SKIP'
+            '8ada57a590e6b04c272312874c67656ccf7e3de71b2cc7dbaadf53880fb77fd7')
 validpgpkeys=()
 
 pkgver() {
@@ -34,18 +37,29 @@ pkgver() {
 
 prepare() {
   cd "$_pkgname"
-  git submodule update --init --recursive
+  git submodule init
+  git config submodule.Thirdparty/JUCE.url "$srcdir"/JUCE
+  git submodule update
 }
 
 build() {
   mkdir -p "$_pkgname"/build
   cd "$_pkgname"/build
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
+  cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DHybridReverb2_UseLocalDatabase=ON \
+    ..
   make
 }
 
 package() {
   cd "$_pkgname/build"
   make DESTDIR="$pkgdir/" install
-  unzip -d "$pkgdir"/usr/share/"$_pkgname" "$srcdir"/"$_pkgname"_large_database.zip
+
+  unzip -d "$pkgdir"/usr/share/"$_pkgname" "$srcdir/RIR-$_rirver.zip"
+  cd "$pkgdir"/usr/share/"$_pkgname"
+  mv -f "HybridReverb2-impulse-response-database-$_rirver"/* .
+  rmdir "HybridReverb2-impulse-response-database-$_rirver"
 }