mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: kvmfr-linux-module: Update to B7.
* gnu/packages/video.scm (kvmfr-linux-module)[version]: Update to B7. [source]: Remove patch. * gnu/packages/patches/kvmfr-linux-module-fix-build.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister file. Change-Id: I5cb6dadd6640a34d0f667079e272a97d7abae0aa
This commit is contained in:
parent
3300dba9eb
commit
7bf508edfe
3 changed files with 3 additions and 46 deletions
|
@ -17,7 +17,7 @@
|
||||||
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
# Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
|
# Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
|
||||||
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
||||||
# Copyright © 2018, 2019, 2020, 2021, 2022, 2024 Oleg Pykhalov <go.wigust@gmail.com>
|
# Copyright © 2018, 2019, 2020, 2021, 2022, 2024, 2025 Oleg Pykhalov <go.wigust@gmail.com>
|
||||||
# Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
|
# Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
|
||||||
# Copyright © 2018, 2020-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
# Copyright © 2018, 2020-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||||
# Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant <glv@posteo.net>
|
# Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant <glv@posteo.net>
|
||||||
|
@ -1706,7 +1706,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \
|
%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-bump-sip-abi-version-to-12.8.patch \
|
||||||
%D%/packages/patches/krita-xsimd-13-compat.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/kwayland-5-fix-build.patch \
|
||||||
%D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
|
%D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
|
||||||
%D%/packages/patches/laby-make-install.patch \
|
%D%/packages/patches/laby-make-install.patch \
|
||||||
|
|
|
@ -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 <go.wigust@gmail.com>
|
|
||||||
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 <linux/highmem.h>
|
|
||||||
#include <linux/memremap.h>
|
|
||||||
#include <linux/version.h>
|
|
||||||
+#include <linux/vmalloc.h>
|
|
||||||
|
|
||||||
#include <asm/io.h>
|
|
||||||
|
|
||||||
@@ -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
|
|
||||||
|
|
|
@ -4392,7 +4392,7 @@ your host privately.")
|
||||||
(define-public kvmfr-linux-module
|
(define-public kvmfr-linux-module
|
||||||
(package
|
(package
|
||||||
(name "kvmfr-linux-module")
|
(name "kvmfr-linux-module")
|
||||||
(version "B6")
|
(version "B7")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://looking-glass.io/artifact/" version
|
(uri (string-append "https://looking-glass.io/artifact/" version
|
||||||
|
@ -4400,8 +4400,7 @@ your host privately.")
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"15d7wwbzfw28yqbz451b6n33ixy50vv8acyzi8gig1mq5a8gzdib"))
|
"11crsvy783ig7kzmr2cr68wv9zsjkcbp1akcs28rc6yc1ik0dr89"))))
|
||||||
(patches (search-patches "kvmfr-linux-module-fix-build.patch"))))
|
|
||||||
(build-system linux-module-build-system)
|
(build-system linux-module-build-system)
|
||||||
(inputs (list bash-minimal))
|
(inputs (list bash-minimal))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue