Followup-For: Bug #1089505
Control: tag -1 pending
Hi,
I've just uploaded my proposed changes and the Linux 6.12 fix extracted
from upstream's commit to DELAYED/10 s.t. the package could get into
trixie.
Please let me know if I should dely it longer.
I did not include the Linux 6.13 support part from upstream's commit as
that didn't apply cleanly.
Andreas
>From 3f6aaeed9fe2df55ed9dd4b5fa99d5e8ea2c5c8a Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Wed, 5 Mar 2025 11:37:25 +0100
Subject: [PATCH 3/4] Fix build with v6.12 kernel
Closes: #1089505
---
debian/patches/fix-Linux-6.12-build.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 23 insertions(+)
create mode 100644 debian/patches/fix-Linux-6.12-build.patch
diff --git a/debian/patches/fix-Linux-6.12-build.patch
b/debian/patches/fix-Linux-6.12-build.patch
new file mode 100644
index 0000000..7ec5319
--- /dev/null
+++ b/debian/patches/fix-Linux-6.12-build.patch
@@ -0,0 +1,22 @@
+From 2a6b1cae1a2334b19bd74f695d54a7d6cab28041 Mon Sep 17 00:00:00 2001
+From: Teddy Wang <59642778+teddy...@users.noreply.github.com>
+Date: Fri, 21 Feb 2025 17:47:43 +0800
+Subject: [PATCH] Add support kernel above 6.11
+
+---
+ smi_main.c | 2 ++
+
+diff --git a/smi_main.c b/smi_main.c
+index 39baa73..faaefe8 100644
+--- a/smifb2/smi_main.c
++++ b/smifb2/smi_main.c
+@@ -57,7 +57,9 @@ static const struct drm_mode_config_helper_funcs
smi_mode_config_helper_funcs =
+
+ static const struct drm_mode_config_funcs smi_mode_config_funcs = {
+ .fb_create = smi_user_framebuffer_create,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
+ .output_poll_changed = drm_fb_helper_output_poll_changed,
++#endif
+ .atomic_check = drm_atomic_helper_check,
+ .atomic_commit = drm_atomic_helper_commit,
+ };
diff --git a/debian/patches/series b/debian/patches/series
index 232c8cf..a3691e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ encoding.patch
fix-linux-6.10-build.patch
fix-linux-6.11-build.patch
fix-Linux-5.x-build.patch
+fix-Linux-6.12-build.patch
--
2.39.5
>From ad0280724e5926fa329c9cfae0b70b800be688fc Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Wed, 5 Mar 2025 11:48:59 +0100
Subject: [PATCH 4/4] release smifb2 (2.4.0-2.1) to unstable
---
debian/changelog | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 5f94476..8920985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+smifb2 (2.4.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Simplify -dkms package installation.
+ * Fix version constraints to restore support for some ancient kernels.
+ * Fix build with v6.12 kernel. (Closes: #1089505)
+
+ -- Andreas Beckmann <a...@debian.org> Wed, 05 Mar 2025 11:48:52 +0100
+
smifb2 (2.4.0-2) unstable; urgency=medium
* Fix build with v6.11 kernel. (Closes: #1082716)
--
2.39.5
