Add 'autowaf' submodule to sources

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

3 files changed, 23 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7c549b86cfc..df203b66c86d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = raul-git
 	pkgdesc = Realtime Audio Utility Library aimed at audio and musical applications
-	pkgver = 0.8.10.r592.045e70d
+	pkgver = 1.0.0.r603.10fb82f
 	pkgrel = 1
 	epoch = 1
 	url = http://drobilla.net/software/raul/
@@ -10,9 +10,11 @@ pkgbase = raul-git
 	makedepends = git
 	makedepends = python
 	provides = raul
-	provides = raul=0.8.10
+	provides = raul=1.0.0
 	conflicts = raul
-	source = raul::git+http://git.drobilla.net/raul.git
+	source = raul::git+https://gitlab.com/drobilla/raul.git
+	source = autowaf::git+https://gitlab.com/drobilla/autowaf.git
+	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = raul-git
diff --git a/.gitignore b/.gitignore
index 84ef3a7fed40..8cde785b3ff1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-raul
-pkg
-src
+autowaf/
+raul/
+pkg/
+src/
 raul-git-*.tar.xz
 raul-git-*.src.tar.xz
 .AURINFO
diff --git a/PKGBUILD b/PKGBUILD
index b8c31a071296..010e13cdb4d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname="raul"
 pkgname="${_pkgname}-git"
-pkgver=0.8.10.r592.045e70d
+pkgver=1.0.0.r603.10fb82f
 pkgrel=1
 epoch=1
 pkgdesc="Realtime Audio Utility Library aimed at audio and musical applications"
@@ -14,8 +14,9 @@ depends=()
 makedepends=('doxygen' 'git' 'python')
 provides=("$_pkgname" "$_pkgname=${pkgver//.r*/}")
 conflicts=("$_pkgname")
-source=("${_pkgname}::git+http://git.drobilla.net/${_pkgname}.git")
-sha256sums=('SKIP')
+source=("${_pkgname}::git+https://gitlab.com/drobilla/${_pkgname}.git"
+        'autowaf::git+https://gitlab.com/drobilla/autowaf.git')
+sha256sums=('SKIP' 'SKIP')
 
 
 pkgver() {
@@ -24,6 +25,14 @@ pkgver() {
   echo "$ver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+
+  git submodule init
+  git config submodule.waflib.url "${srcdir}/autowaf"
+  git submodule update
+}
+
 build(){
   cd "${srcdir}/${_pkgname}"
   python waf configure \
@@ -37,6 +46,6 @@ package() {
   cd "${srcdir}/${_pkgname}"
   python waf install --destdir=${pkgdir}
   install -m 644 README NEWS "$pkgdir/usr/share/doc/$pkgname"
-  mv "$pkgdir/usr/share/doc/$pkgname/raul-0/html" "$pkgdir/usr/share/doc/$pkgname"
-  rm -rf "$pkgdir/usr/share/doc/$pkgname/raul-0"
+  mv "$pkgdir/usr/share/doc/$pkgname/raul-1/html" "$pkgdir/usr/share/doc/$pkgname"
+  rm -rf "$pkgdir/usr/share/doc/$pkgname/raul-1"
 }