mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-04-07 03:10:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

x11-drivers/evdi: bump 1.14.7-r2 fix kernel-6.1 build

Browse Source 
Includes
88d67b6348
which fixes a check for versions > 6.1.51 <=6.2.0

Closes: https://bugs.gentoo.org/939313
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
This commit is contained in:
Paul Zander
2025-01-13 13:38:21 +01:00
parent 3db390852b
commit e1ab8bf47f
2 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
x11-drivers/evdi/evdi-1.14.7-r1.ebuild → x11-drivers/evdi/evdi-1.14.7-r2.ebuild
View File

@@ -42,6 +42,7 @@ CONFIG_CHECK="~FB_VIRTUAL ~I2C ~DRM ~USB_SUPPORT ~USB_ARCH_HAS_HCD MODULES"
PATCHES=(
"${FILESDIR}/${PN}-1.14.4-format-truncation.patch"
"${FILESDIR}/${PN}-1.14.7-removed-output_poll_changed.patch"
"${FILESDIR}/${PN}-1.14.7-drm_fb_helper.info.patch" # backport from 1.14.8
)
pkg_setup() {

55
x11-drivers/evdi/files/evdi-1.14.7-drm_fb_helper.info.patch Normal file
View File

@@ -0,0 +1,55 @@
https://github.com/DisplayLink/evdi/commit/88d67b63487ad484dff31d9e1355a32771787979.patch
From 88d67b63487ad484dff31d9e1355a32771787979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Spintzyk?= <Lukasz.Spintzyk@synaptics.com>
Date: Mon, 7 Oct 2024 09:17:43 +0200
Subject: [PATCH] Validate build with CONFIG_FB define
---
ci/build_against_kernel | 2 +-
module/evdi_fb.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ci/build_against_kernel b/ci/build_against_kernel
index ebd0562..25cf174 100755
--- a/ci/build_against_kernel
+++ b/ci/build_against_kernel
@@ -236,7 +236,7 @@ build_one() { # KVER
local src_dir
local KTAG=v${KVER}
- local extra_cflags=
+ local extra_cflags="-DCONFIG_FB"
if [ "${KVER}" == "master" ]; then
KTAG="origin/master"
else
diff --git a/module/evdi_fb.c b/module/evdi_fb.c
index 6bd364e..d8feca6 100644
--- a/module/evdi_fb.c
+++ b/module/evdi_fb.c
@@ -404,7 +404,7 @@ static int evdifb_create(struct drm_fb_helper *helper,
fb = &efbdev->efb.base;
efbdev->helper.fb = fb;
-#if KERNEL_VERSION(6, 1, 51) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9)
+#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9)
efbdev->helper.info = info;
#else
efbdev->helper.fbdev = info;
@@ -464,7 +464,7 @@ static void evdi_fbdev_destroy(__always_unused struct drm_device *dev,
{
struct fb_info *info;
-#if KERNEL_VERSION(6, 1, 51) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9)
+#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9)
if (efbdev->helper.info) {
info = efbdev->helper.info;
#else
@@ -556,7 +556,7 @@ void evdi_fbdev_unplug(struct drm_device *dev)
return;
efbdev = evdi->fbdev;
-#if KERNEL_VERSION(6, 1, 51) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9)
+#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9)
if (efbdev->helper.info) {
struct fb_info *info;