diff --git a/gnu/local.mk b/gnu/local.mk index ab53474192f..f42542a0fcf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -17,7 +17,7 @@ # Copyright © 2017, 2020 Mathieu Othacehe # Copyright © 2017, 2018, 2019 Gábor Boskovits # Copyright © 2018 Amirouche Boubekki -# Copyright © 2018, 2019, 2020, 2021, 2022, 2024 Oleg Pykhalov +# Copyright © 2018, 2019, 2020, 2021, 2022, 2024, 2025 Oleg Pykhalov # Copyright © 2018 Stefan Stefanović # Copyright © 2018, 2020-2025 Maxim Cournoyer # Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant @@ -1706,7 +1706,6 @@ dist_patch_DATA = \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ %D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch \ %D%/packages/patches/krita-xsimd-13-compat.patch \ - %D%/packages/patches/kvmfr-linux-module-fix-build.patch \ %D%/packages/patches/kwayland-5-fix-build.patch \ %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\ %D%/packages/patches/laby-make-install.patch \ diff --git a/gnu/packages/patches/kvmfr-linux-module-fix-build.patch b/gnu/packages/patches/kvmfr-linux-module-fix-build.patch deleted file mode 100644 index 49c1a713a52..00000000000 --- a/gnu/packages/patches/kvmfr-linux-module-fix-build.patch +++ /dev/null @@ -1,41 +0,0 @@ -Copied from -https://github.com/gnif/LookingGlass/issues/1075#issuecomment-1546422678 and -https://github.com/gnif/LookingGlass/issues/1134 with adjustments for current -kvmfr source version. - -From c4950a830fbe2ca27337793aa227c86f5c044f46 Mon Sep 17 00:00:00 2001 -From: Oleg Pykhalov -Date: Sat, 5 Oct 2024 16:11:45 +0300 -Subject: [PATCH] Fix build - ---- - module/kvmfr.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/module/kvmfr.c b/module/kvmfr.c -index 121aae5..4c386f9 100644 ---- a/module/kvmfr.c -+++ b/module/kvmfr.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #include - -@@ -539,7 +540,11 @@ static int __init kvmfr_module_init(void) - 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; - --- -2.41.0 - diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 761ad02db2f..467904e5dc2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4392,7 +4392,7 @@ your host privately.") (define-public kvmfr-linux-module (package (name "kvmfr-linux-module") - (version "B6") + (version "B7") (source (origin (method url-fetch) (uri (string-append "https://looking-glass.io/artifact/" version @@ -4400,8 +4400,7 @@ your host privately.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "15d7wwbzfw28yqbz451b6n33ixy50vv8acyzi8gig1mq5a8gzdib")) - (patches (search-patches "kvmfr-linux-module-fix-build.patch")))) + "11crsvy783ig7kzmr2cr68wv9zsjkcbp1akcs28rc6yc1ik0dr89")))) (build-system linux-module-build-system) (inputs (list bash-minimal)) (arguments