From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id UMfTN09IAWevWwAAqHPOHw:P1 (envelope-from ) for ; Sat, 05 Oct 2024 14:08:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id UMfTN09IAWevWwAAqHPOHw (envelope-from ) for ; Sat, 05 Oct 2024 16:08:15 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Tfke08eh; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=TZK4ZmFv; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1728137295; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=HV60W7ssCLx2jWXMg95TLxjOv27BFpjFHcJsnQhQ8Xo=; b=V2sNnQv+RZOz9WPT91Y7aULGRwpQuIBcdYoA4B6+MnA3gpULvmojWGcrx1vMuw9r2MfCxx lgCNi1PJGXrUhHmQlDGRE77FtA9knNEpnLLB+4TM3vHsabUUS0TfSN6zpSgo1GdkY/R/Gd DIOQz/0ZISsyz4ehLVhCNM1Vm/u7gEjTRoSgQl6WIACHAmHoJFY0L6sg91yYKEHC8yPyvL pGsRK7roYnSS4cPj8bzsthacr3DLxahyOdEsgczHcvdJhXL6ZmoD5CbKQ0QiLkomJQKXOe LghH2ieknCc8F4tnVkKZgXJvJg8wYWcUZaDWCFwx5nr+qoL4Zuqvj8b3pyZ6Rw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1728137295; a=rsa-sha256; cv=none; b=s59esXAnTi8Kdd5ANxTWOfa9PXeHoGXmwu9I0j8yN4UxCp+nApJrCiuRSNwlLIKsnil93j cMTGHXLjV2wRMqbfZu9eJOZJrbktdTXQQxT2I/IPSEDN++Vaf+QCFvd6eS6uI3EI9CKocP JpJ6d7jSYrc8ln8w8F52aq53syBRmQfgcKNrQBcFa1Lwi4XfHvvyTNsoIo2bgnqaU8Gt8n QkUkEXbBIEqFge1lHAqiSRFNcAKAWmaezeLxvrWRZbz6TPuOFJPjkhqQLQ/soF1OMpVKdG rvmrKfakvRq9a+WMxR1+uj3PTupnY7HQZ2KV1jk64VxIlG1xhJ3XdvZ7Sw0Fyw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Tfke08eh; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=TZK4ZmFv; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3AE7954BC8 for ; Sat, 05 Oct 2024 16:08:15 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sx5Rw-0007LY-PJ; Sat, 05 Oct 2024 10:08:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sx5Rv-0007LK-D1 for guix-patches@gnu.org; Sat, 05 Oct 2024 10:07:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sx5Rv-0002qA-1b for guix-patches@gnu.org; Sat, 05 Oct 2024 10:07:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=HV60W7ssCLx2jWXMg95TLxjOv27BFpjFHcJsnQhQ8Xo=; b=Tfke08ehLJTYVE1+ajeyx6XZ3ujuLS5bb/lwdCPl+losqCRY3JMy1N5G6MyL/P/h8e6MzQYQoKdN7jK7OJgAd7Ab7iyvbADUT1nYucFfT1ttpSeyxJF44AGc5Z19T5DM3KU8IGjReeW7sgErEzWgGBqVZIrql4TaQTufpoh9u2H3+ZF49WJnWt36aZspbl6sVCKj+YK9vvh87aTLW9SaFFa3B3NcnFJDBa4V4ZJWWdgmvsXpkKD0TU4Seh/mx7VGHo1CFi0+J0l8vTn2a7OaxSzogyp1LxBBSVlQ/qMBtUUXGyBbJokJ5Ocs4a9QLh+G4MAaCDCO8NHKN9g5bFeNWw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sx5Ry-0001X8-Io for guix-patches@gnu.org; Sat, 05 Oct 2024 10:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73642] [PATCH] gnu: Add kvmfr-linux-module. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Oct 2024 14:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73642 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73642@debbugs.gnu.org Cc: Oleg Pykhalov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17281372635863 (code B ref -1); Sat, 05 Oct 2024 14:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Oct 2024 14:07:43 +0000 Received: from localhost ([127.0.0.1]:39336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sx5Re-0001WV-VE for submit@debbugs.gnu.org; Sat, 05 Oct 2024 10:07:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:55964) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sx5Rc-0001WL-Gd for submit@debbugs.gnu.org; Sat, 05 Oct 2024 10:07:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sx5RX-0007KL-3u for guix-patches@gnu.org; Sat, 05 Oct 2024 10:07:35 -0400 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sx5RV-0002pa-3v for guix-patches@gnu.org; Sat, 05 Oct 2024 10:07:34 -0400 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-539983beb19so3859278e87.3 for ; Sat, 05 Oct 2024 07:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728137251; x=1728742051; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HV60W7ssCLx2jWXMg95TLxjOv27BFpjFHcJsnQhQ8Xo=; b=TZK4ZmFvqmwLa8zFQtjVfnoylw3irEEMszxPG++tInmpVo3tT3+KoXokNuwjHgVx4y uI+bUnIs27qTmfSLriIpTV3TlG8PUd5cU5VdRXYEdJnxlZ6AZbUtsG8AuOAHMDQuwQrd 0pD9UhhG+DJNZnTX0Y3i+aqUoMsZ5oKHh2zrs6NopN/VMgS4ByE0QO0p6xlL2f626s/4 RPmNyjHq6QcCDJoYXu4FYYc6ldf6cfdHcOC3et1WHztDlnXp+qXk5ox5PQIwqy/scQsj Z+n+VbpHeQJf5TxfdAT+S1XB6wZL4kDmZmfMjGqks22ZnaVUDNzY24dI1ROfNi+O9oSO cD3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728137251; x=1728742051; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HV60W7ssCLx2jWXMg95TLxjOv27BFpjFHcJsnQhQ8Xo=; b=ao0ddcsvXBESCE3UU1WhdTkl+uePNStJsmlyEQ/K9GCSxKtZvS5/upaC8xN96IK2j1 b6UCoiHOtHlZ37FG28kQI+RgWQMjzgT43WaXpzk6e9P+gCc3KMyvqQ0oC1pmhCbul4uq rcXAoDQH+6jfuvn5TOOTr0ztslXemKMpeAbtsoOVS60gVAPufTlOr1U79+H/R5KYlH80 c79/XjNGGiRqFmZRjPGC4jNvs5etwdchjxEpD/x+hcgb9xqtVaEpFDVXuHADB7UdtFMw 4g1R3cJIKQXS6ZlBObly3aW+KVTLRYMeNYgQcPyV57YySdBafR0unrh4yCNpFRRlatIQ 0ZvA== X-Gm-Message-State: AOJu0Yy/SJChF1bP/G6yp6eCYau1Dq1YLh7bOcmYx9VRbIzTl8zcAYvZ 1UfZiC77333r7pBSgHBr7e/PgrgiNgkrnXJpHwsDQ7jwy4rW1cc97HhjlTD8 X-Google-Smtp-Source: AGHT+IGqk/gBTdg8Yy9Vry+ZGB4ZgHwvB5HGK0qKj00dghzqXw/JQ2e1uotsFkgZkRCvoF2voNILVg== X-Received: by 2002:a05:6512:b90:b0:539:936c:983e with SMTP id 2adb3069b0e04-539ab9ed416mr3225570e87.53.1728137250406; Sat, 05 Oct 2024 07:07:30 -0700 (PDT) Received: from guixsd.wugi.info ([93.100.15.190]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-539aff27fb2sm234861e87.244.2024.10.05.07.07.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 07:07:29 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 5 Oct 2024 17:07:01 +0300 Message-ID: <7fdced63c1329619438e0e51734f59302f949773.1728137221.git.go.wigust@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::12f; envelope-from=go.wigust@gmail.com; helo=mail-lf1-x12f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.33 X-Spam-Score: -0.33 X-Migadu-Queue-Id: 3AE7954BC8 X-Migadu-Scanner: mx13.migadu.com X-TUID: eweGb511fuOI * gnu/packages/patches/kvmfr-fix-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/video.scm (kvmfr-linux-module): New variable. Change-Id: I113c1c8e1f6c9ebd541083b620ea0e098d56d588 --- gnu/local.mk | 3 +- .../kvmfr-linux-module-fix-build.patch | 41 +++++++++++++++++++ gnu/packages/video.scm | 28 +++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/kvmfr-linux-module-fix-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2adf196a87..2808e301b5 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 Oleg Pykhalov +# Copyright © 2018, 2019, 2020, 2021, 2022, 2024 Oleg Pykhalov # Copyright © 2018 Stefan Stefanović # Copyright © 2018, 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer # Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant @@ -1639,6 +1639,7 @@ dist_patch_DATA = \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ %D%/packages/patches/kodi-mesa-eglchromium.patch \ %D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch \ + %D%/packages/patches/kvmfr-linux-module-fix-build.patch \ %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\ %D%/packages/patches/laby-make-install.patch \ %D%/packages/patches/laby-use-tmpdir-from-runtime.patch \ diff --git a/gnu/packages/patches/kvmfr-linux-module-fix-build.patch b/gnu/packages/patches/kvmfr-linux-module-fix-build.patch new file mode 100644 index 0000000000..49c1a713a5 --- /dev/null +++ b/gnu/packages/patches/kvmfr-linux-module-fix-build.patch @@ -0,0 +1,41 @@ +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 1d2ab5fbeb..86a30c2cca 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -104,6 +104,7 @@ (define-module (gnu packages video) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system linux-module) #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system pyproject) @@ -4349,6 +4350,33 @@ (define-public obs-looking-glass your host privately.") (license license:gpl2+))) +(define-public kvmfr-linux-module + (package + (name "kvmfr-linux-module") + (version "B6") + (source (origin + (method url-fetch) + (uri (string-append "https://looking-glass.io/artifact/" version + "/source")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15d7wwbzfw28yqbz451b6n33ixy50vv8acyzi8gig1mq5a8gzdib")) + (patches (search-patches "kvmfr-linux-module-fix-build.patch")))) + (build-system linux-module-build-system) + (inputs (list bash-minimal)) + (arguments + (list + #:tests? #f ;there are none. + #:source-directory "module")) + (home-page "https://looking-glass.io/") + (synopsis + "Linux Kernel module to interface with Looking Glass") + (description + "This kernel module implements a basic interface to the IVSHMEM device for +Looking Glass.") + (license license:gpl2+))) + (define-public obs-move-transition (package (name "obs-move-transition") base-commit: 73ec844389e91cb0f5a2647070516fc8d19d8730 -- 2.41.0