source change to bondagit fork

4 files changed, 11 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03d88f3542c7..4e29479ec525 100644..100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = ravenna-alsa-daemon
 	pkgdesc = A daemon for ALSA RAVENNA/AES67 Driver
 	pkgver = 1.1
-	pkgrel = 1
-	url = https://bitbucket.org/MergingTechnologies/ravenna-alsa-lkm
+	pkgrel = 2
+	url = https://github.com/bondagit/ravenna-alsa-lkm
 	arch = x86_64
 	license = custom
 	depends = glibc
 	depends = avahi
 	depends = ravenna-alsa-lkm-dkms
-	source = git+https://bitbucket.org/MergingTechnologies/ravenna-alsa-lkm.git
+	depends = libcurl-compat
+	source = git+https://github.com/bondagit/ravenna-alsa-lkm.git#branch=aes67-daemon
 	source = ravenna-alsa.service
-	source = merging_ravenna_daemon.conf
 	source = ravenna_start.sh
 	sha256sums = SKIP
 	sha256sums = cb8a2a9a19828c211b69c91752b65dece52302ccff4e051408e24ba4aa66c4b9
-	sha256sums = 87b5aeae3de90122a0c85458f8e597e6c3d365e7aff91c8c441c978623144de9
 	sha256sums = 359748b578e06808a4df5d9bc8f64cacfaf7d54025114a0cc83a2af2e65f1bdf
 
 pkgname = ravenna-alsa-daemon
diff --git a/PKGBUILD b/PKGBUILD
index a17f85cea2e1..cc1e2fc25140 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,15 @@
 
 pkgname=ravenna-alsa-daemon
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A daemon for ALSA RAVENNA/AES67 Driver"
-url="https://bitbucket.org/MergingTechnologies/ravenna-alsa-lkm"
+url="https://github.com/bondagit/ravenna-alsa-lkm"
 license=("custom")
 arch=('x86_64')
-depends=('glibc' 'avahi' 'ravenna-alsa-lkm-dkms')
-source=("git+https://bitbucket.org/MergingTechnologies/ravenna-alsa-lkm.git" 'ravenna-alsa.service' 'merging_ravenna_daemon.conf' 'ravenna_start.sh')
+depends=('glibc' 'avahi' 'ravenna-alsa-lkm-dkms' 'libcurl-compat')
+source=("git+https://github.com/bondagit/ravenna-alsa-lkm.git#branch=aes67-daemon" 'ravenna-alsa.service' 'ravenna_start.sh')
 sha256sums=('SKIP'
             'cb8a2a9a19828c211b69c91752b65dece52302ccff4e051408e24ba4aa66c4b9'
-            '87b5aeae3de90122a0c85458f8e597e6c3d365e7aff91c8c441c978623144de9'
             '359748b578e06808a4df5d9bc8f64cacfaf7d54025114a0cc83a2af2e65f1bdf')
 
 package() {
@@ -20,8 +19,7 @@ package() {
   install -Dm644 ravenna-alsa.service $pkgdir/usr/lib/systemd/user/ravenna-alsa.service
   install -d $pkgdir/opt/ravenna-alsa
   cp -r $srcdir/ravenna-alsa-lkm/Butler/* $pkgdir/opt/ravenna-alsa/
-  cp $pkgdir/opt/ravenna-alsa/merging_ravenna_daemon.conf $pkgdir/opt/ravenna-alsa/merging_ravenna_daemon.conf.bak
-  cp merging_ravenna_daemon.conf $pkgdir/opt/ravenna-alsa/merging_ravenna_daemon.conf
   install -Dm755 ravenna_start.sh $pkgdir/opt/ravenna-alsa/ravenna_start.sh
   chmod +x $pkgdir/opt/ravenna-alsa/Merging_RAVENNA_Daemon
+  echo "web_app_path=/opt/ravenna-alsa/webapp/advanced/" >> $pkgdir/opt/ravenna-alsa/merging_ravenna_daemon.conf
 }
diff --git a/merging_ravenna_daemon.conf b/merging_ravenna_daemon.conf
deleted file mode 100644
index 2d9637ace84b..000000000000
--- a/merging_ravenna_daemon.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-interface_name=bridge0
-web_app_port=9090
-web_app_path=/opt/ravenna-alsa/webapp/advanced/
-tic_frame_size_at_1fs=256
-
diff --git a/ravenna-alsa.service b/ravenna-alsa.service
index b1c4e6e33fc4..3678c07a4134 100644
--- a/ravenna-alsa.service
+++ b/ravenna-alsa.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=daemon for ALSA RAVENNA/AES67 Driver
-Requires=sound.target
-After=sound.target
+Requires=sound.target avahi-daemon.service
+After=sound.target avahi-daemon.service
 
 [Service]
 Type=simple