Backport upstream patch for module build on kernel 6.4+ to B6 release.

3 files changed, 26 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e15a21bc8d8c..bd225e43a2d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = looking-glass
 	pkgdesc = An extremely low latency KVMFR (KVM FrameRelay) implementation for guests with VGA PCI Passthrough
 	pkgver = B6
-	pkgrel = 5
+	pkgrel = 6
 	epoch = 2
 	url = https://looking-glass.io/
 	arch = x86_64
@@ -18,7 +18,9 @@ pkgbase = looking-glass
 	makedepends = spice-protocol
 	makedepends = wayland-protocols
 	source = looking-glass-B6.tar.gz::https://looking-glass.io/artifact/B6/source
+	source = module-kernel-64.patch
 	sha512sums = 558981d6b32098076ef0775a748da349941551352cbef836e37310e43e5cd6072df3dec6fa2418a9abecc7729ef0c1c6869e3168d05a3d76bea46c6eb8c4e82c
+	sha512sums = 562c6714f480cbbc144fd4a2e9ca9047292ca89800425e627f7e2d87cb0ba8741ad31e88d70952c381196fd70368308c9d8f8bf9cba0c4fec7431f37307d5bf5
 
 pkgname = looking-glass
 	pkgdesc = A client application for accessing the LookingGlass IVSHMEM device of a VM
diff --git a/PKGBUILD b/PKGBUILD
index 94569a2f82b4..6c8cbec1f640 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=("${pkgbase}"
          "obs-plugin-${pkgbase}")
 epoch=2
 pkgver=B6
-pkgrel=5
+pkgrel=6
 pkgdesc="An extremely low latency KVMFR (KVM FrameRelay) implementation for guests with VGA PCI Passthrough"
 url="https://looking-glass.io/"
 arch=('x86_64')
@@ -15,14 +15,19 @@ license=('GPL2')
 makedepends=('cmake' 'fontconfig' 'libpipewire' 'libpulse'
              'libsamplerate' 'libxi' 'libxpresent' 'libxss' 'obs-studio'
              'spice-protocol' 'wayland-protocols')
-source=("looking-glass-${pkgver}.tar.gz::https://looking-glass.io/artifact/${pkgver}/source")
-sha512sums=('558981d6b32098076ef0775a748da349941551352cbef836e37310e43e5cd6072df3dec6fa2418a9abecc7729ef0c1c6869e3168d05a3d76bea46c6eb8c4e82c')
+source=("looking-glass-${pkgver}.tar.gz::https://looking-glass.io/artifact/${pkgver}/source"
+        "module-kernel-64.patch")
+sha512sums=('558981d6b32098076ef0775a748da349941551352cbef836e37310e43e5cd6072df3dec6fa2418a9abecc7729ef0c1c6869e3168d05a3d76bea46c6eb8c4e82c'
+            '562c6714f480cbbc144fd4a2e9ca9047292ca89800425e627f7e2d87cb0ba8741ad31e88d70952c381196fd70368308c9d8f8bf9cba0c4fec7431f37307d5bf5')
 
 _lgdir="${pkgbase}-${pkgver}"
 
 prepare() {
+	cd "${srcdir}/${_lgdir}"
+	patch -p1 < "${srcdir}/module-kernel-64.patch"
+
 	sed -i '1 i\#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
-		"${srcdir}/${_lgdir}/host/platform/Linux/capture/pipewire/src/portal.c"
+		"host/platform/Linux/capture/pipewire/src/portal.c"
 }
 
 build() {
diff --git a/module-kernel-64.patch b/module-kernel-64.patch
new file mode 100644
index 000000000000..13025e55be2f
--- /dev/null
+++ b/module-kernel-64.patch
@@ -0,0 +1,14 @@
+--- a/module/kvmfr.c
++++ b/module/kvmfr.c
+@@ -539,7 +539,11 @@
+   if (kvmfr->major < 0)
+     goto out_free;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
+   kvmfr->pClass = class_create(THIS_MODULE, KVMFR_DEV_NAME);
++#else
++  kvmfr->pClass = class_create(KVMFR_DEV_NAME);
++#endif
+   if (IS_ERR(kvmfr->pClass))
+     goto out_unreg;
+