Update to version 0.24.6

2 files changed, 30 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 916ab9a3112f..f415283daba3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = lib32-lilv
 	pkgdesc = A C library interface to the LV2 plug-in standard (32-bit)
-	pkgver = 0.24.4
+	pkgver = 0.24.6
 	pkgrel = 1
 	url = https://drobilla.net/software/lilv/
 	arch = x86_64
 	license = custom:ISC
 	makedepends = lib32-libsndfile
-	makedepends = lv2
-	makedepends = python
+	makedepends = lib32-lv2
+	makedepends = waf
 	depends = lib32-sratom
 	depends = lilv
-	source = https://download.drobilla.net/lilv-0.24.4.tar.bz2
-	source = https://download.drobilla.net/lilv-0.24.4.tar.bz2.sig
+	source = https://download.drobilla.net/lilv-0.24.6.tar.bz2
+	source = https://download.drobilla.net/lilv-0.24.6.tar.bz2.sig
 	validpgpkeys = 907D226E7E13FA337F014A083672782A9BF368F3
-	sha512sums = cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89
+	sha512sums = 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
 	sha512sums = SKIP
 
 pkgname = lib32-lilv
diff --git a/PKGBUILD b/PKGBUILD
index 59d2137978cb..71611521dce6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,33 @@
 
 _basename=lilv
 pkgname=lib32-lilv
-pkgver=0.24.4
+pkgver=0.24.6
 pkgrel=1
 pkgdesc="A C library interface to the LV2 plug-in standard (32-bit)"
 arch=('x86_64')
 url="https://drobilla.net/software/lilv/"
 license=('custom:ISC')
 depends=('lib32-sratom' 'lilv')
-makedepends=('lib32-libsndfile' 'lv2' 'python')
+makedepends=('lib32-libsndfile' 'lib32-lv2' 'waf')
 source=("https://download.drobilla.net/$_basename-$pkgver.tar.bz2"{,.sig})
-sha512sums=('cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89'
+sha512sums=('0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad'
             'SKIP')
 validpgpkeys=('907D226E7E13FA337F014A083672782A9BF368F3')
 
 prepare() {
     cd "$_basename-$pkgver"
 
-    # don't run local ldconfig
-    sed -i "/ldconfig/d" wscript
+    # let wscript(s) find the custom waf scripts
+    mkdir -pv tools
+    touch __init__.py
+    cp -v waflib/extras/{autoship,autowaf,lv2}.py tools/
+    mkdir -pv plugins/tools/
+    cp -v waflib/extras/{autoship,autowaf,lv2}.py plugins/tools/
+    rm -rv waflib
+    sed -e 's/waflib.extras/tools/g' \
+        -e "s/load('autowaf'/load('autowaf', tooldir='tools'/g" \
+        -e "s/load('lv2'/load('lv2', tooldir='tools'/g" \
+        -i wscript
 }
 
 build() {
@@ -29,27 +38,28 @@ build() {
     export CXX='g++ -m32'
     export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-    python waf configure --prefix=/usr \
-                         --libdir=/usr/lib32 \
-                         --no-bash-completion \
-                         --dyn-manifest \
-                         --test
+    waf configure --prefix=/usr \
+                  --libdir=/usr/lib32 \
+                  --no-bash-completion \
+                  --no-bindings \
+                  --dyn-manifest \
+                  --test
 
-    python waf build
+    waf build
 }
 
 check() {
     cd "$_basename-$pkgver"
 
-    python waf test
+    waf test
 }
 
 package() {
     cd "$_basename-$pkgver"
 
-    python waf install --destdir="$pkgdir"
+    waf install --destdir="$pkgdir"
 
-    install -vDm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -vDm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
 
     cd "$pkgdir"/usr