Added patches for compilation in kernel 5.x and rewrite of dkms configuration

3 files changed, 28 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0e272ed1725..62605691f833 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ravenna-alsa-lkm-dkms
 	pkgdesc = A kernel module for ALSA RAVENNA/AES67 Driver
 	pkgver = r106.5a06f0d
-	pkgrel = 3
+	pkgrel = 4
 	url = https://bitbucket.org/MergingTechnologies/ravenna-alsa-lkm
 	install = ravenna-dkms.install
 	arch = x86_64
@@ -14,9 +14,11 @@ pkgbase = ravenna-alsa-lkm-dkms
 	optdepends = linux-lts-headers: Needed for build the module for LTS Arch kernel
 	optdepends = linux-zen-headers: Needed for build the module for ZEN Arch kernel
 	source = git+https://bitbucket.org/MergingTechnologies/ravenna-alsa-lkm.git
+	source = git+https://github.com/bondagit/aes67-linux-daemon.git
 	source = dkms.conf
 	sha256sums = SKIP
-	sha256sums = b8dc1647d50d9e12e482a2cc768b37a48bf7d99bfb895d87767f7faf560cc48a
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = ravenna-alsa-lkm-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 18bc70220217..f43461ffee81 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgbase=ravenna-alsa-lkm
 pkgname="${_pkgbase}-dkms"
 pkgver=r106.5a06f0d
-pkgrel=3
+pkgrel=4
 pkgdesc="A kernel module for ALSA RAVENNA/AES67 Driver"
 url="https://bitbucket.org/MergingTechnologies/ravenna-alsa-lkm"
 license=("GPL")
@@ -15,8 +15,8 @@ optdepends=(
     'linux-headers: Needed for build the module for Arch kernel'
 	'linux-lts-headers: Needed for build the module for LTS Arch kernel'
 	'linux-zen-headers: Needed for build the module for ZEN Arch kernel')
-source=("git+https://bitbucket.org/MergingTechnologies/ravenna-alsa-lkm.git" "dkms.conf")
-sha256sums=('SKIP' 'b8dc1647d50d9e12e482a2cc768b37a48bf7d99bfb895d87767f7faf560cc48a')
+source=("git+https://bitbucket.org/MergingTechnologies/ravenna-alsa-lkm.git" "git+https://github.com/bondagit/aes67-linux-daemon.git" "dkms.conf")
+sha256sums=('SKIP' 'SKIP' 'SKIP')
 install=ravenna-dkms.install
 
 pkgver() {
@@ -24,8 +24,23 @@ pkgver() {
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"                          
 }
 
+prepare() {
+  cd "$srcdir"/"$_pkgbase"/driver
+  echo "Apply patches to ravenna-alsa-lkm module ..."
+  git apply "$srcdir"/aes67-linux-daemon/3rdparty/patches/ravenna-alsa-lkm-kernel-v5.patch
+  git apply "$srcdir"/aes67-linux-daemon/3rdparty/patches/ravenna-alsa-lkm-enable-loopback.patch  
+  git apply "$srcdir"/aes67-linux-daemon/3rdparty/patches/ravenna-alsa-lkm-fixes.patch
+  git apply "$srcdir"/aes67-linux-daemon/3rdparty/patches/ravenna-alsa-lkm-arm-32bit.patch
+  git apply "$srcdir"/aes67-linux-daemon/3rdparty/patches/ravenna-alsa-lkm-add-codec-am824.patch
+}
+
 package() {
   install -Dm644 dkms.conf "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
-  cp -dr --no-preserve='ownership' $srcdir/$_pkgbase/driver "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/src"
-  cp -dr --no-preserve='ownership' $srcdir/$_pkgbase/common "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/common"
+    # Set name and version
+  sed -e "s/@_PKGBASE@/${_pkgbase}/" \
+      -e "s/@PKGVER@/${pkgver}/" \
+      -i "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/dkms.conf
+  sed -i 's/\.\.\/common/common/g' $srcdir/$_pkgbase/driver/*
+  cp -r $srcdir/$_pkgbase/driver/* "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/
+  cp -r $srcdir/$_pkgbase/common "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/common
 }
diff --git a/dkms.conf b/dkms.conf
index 6d3398b20385..e55ab8875c4b 100755
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,8 +1,7 @@
-PACKAGE_NAME="ravenna-alsa-lkm"
-PACKAGE_VERSION="ravenna-alsa-lkm"
-MAKE[0]="make -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build/src EXTRA_CFLAGS='' modules"
-CLEAN="rm src/MergingRavennaALSA.ko src/*.o || true"
+PACKAGE_NAME="@_PKGBASE@"
+PACKAGE_VERSION="@PKGVER@"
+MAKE[0]="make M=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build/driver modules"
+CLEAN="make M=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build/driver clean"
 BUILT_MODULE_NAME[0]="MergingRavennaALSA"
-BUILT_MODULE_LOCATION[0]="src/"
 DEST_MODULE_LOCATION[0]="/kernel/sound/drivers/"
 AUTOINSTALL="yes"