Merge ~vicamo/ubuntu/+source/v4l2loopback/+git/v4l2loopback:bug-2114259/ftbfs-6.16/noble/mp into ubuntu/+source/v4l2loopback:ubuntu/noble-devel

[You-Sheng Yang]

* Failed to build against linux-6.16 (LP: #2114259)
  - added functionality for linux 6.15+ (#626)
  - only use `timer_delete_sync` compat macro for linux<6.2.0
  - Drop from_timer macro usage

diff --git a/debian/changelog b/debian/changelog
index 70e0c43..538493a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+v4l2loopback (0.12.7-2ubuntu5.1) noble; urgency=medium
+
+  * Failed to build against linux-6.16 (LP: #2114259)
+    - added functionality for linux 6.15+ (#626)
+    - only use `timer_delete_sync` compat macro for linux<6.2.0
+    - Drop from_timer macro usage
+
+ -- You-Sheng Yang <[e-mail]>  Thu, 18 Dec 2025 15:44:14 +0800
+
 v4l2loopback (0.12.7-2ubuntu5) noble; urgency=medium
 
   * Support Linux 6.8 (LP: #2052801):
diff --git a/debian/patches/Drop-from_timer-macro-usage.patch b/debian/patches/Drop-from_timer-macro-usage.patch
new file mode 100644
index 0000000..82703ae
--- /dev/null
+++ b/debian/patches/Drop-from_timer-macro-usage.patch
@@ -0,0 +1,48 @@
+From: Neil Armstrong <[e-mail]>
+Date: Tue, 10 Jun 2025 17:00:38 +0200
+Subject: Drop from_timer macro usage
+
+The from_timer() macro is dropped for v6.16-rc1, just
+use container_of() just like the from_timer() macro does.
+
+Signed-off-by: Neil Armstrong <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2114259
+Origin: upstream, https://github.com/v4l2loopback/v4l2loopback/commit/196ae48c0f08dfcdcad0aded4917cf8a303bf237.patch
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ v4l2loopback.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/v4l2loopback.c b/v4l2loopback.c
+index d2247af..bbc4e6c 100644
+--- a/v4l2loopback.c
++++ b/v4l2loopback.c
+@@ -45,7 +45,7 @@
+ #define strscpy strlcpy
+ #endif
+ 
+-#if defined(timer_setup) && defined(from_timer)
++#if defined(timer_setup)
+ #define HAVE_TIMER_SETUP
+ #endif
+ 
+@@ -2675,7 +2675,8 @@ static void check_timers(struct v4l2_loopback_device *dev)
+ #ifdef HAVE_TIMER_SETUP
+ static void sustain_timer_clb(struct timer_list *t)
+ {
+-	struct v4l2_loopback_device *dev = from_timer(dev, t, sustain_timer);
++	struct v4l2_loopback_device *dev =
++		container_of(t, struct v4l2_loopback_device, sustain_timer);
+ #else
+ static void sustain_timer_clb(unsigned long nr)
+ {
+@@ -2700,7 +2701,8 @@ static void sustain_timer_clb(unsigned long nr)
+ #ifdef HAVE_TIMER_SETUP
+ static void timeout_timer_clb(struct timer_list *t)
+ {
+-	struct v4l2_loopback_device *dev = from_timer(dev, t, timeout_timer);
++	struct v4l2_loopback_device *dev =
++		container_of(t, struct v4l2_loopback_device, timeout_timer);
+ #else
+ static void timeout_timer_clb(unsigned long nr)
+ {
diff --git a/debian/patches/added-functionality-for-linux-6.15-626.patch b/debian/patches/added-functionality-for-linux-6.15-626.patch
new file mode 100644
index 0000000..604b511
--- /dev/null
+++ b/debian/patches/added-functionality-for-linux-6.15-626.patch
@@ -0,0 +1,52 @@
+From: Theodore Chiu <[e-mail]>
+Date: Wed, 9 Apr 2025 14:16:51 -0400
+Subject: added functionality for linux 6.15+ (#626)
+
+* added functionality for linux 6.15+
+
+* use macro for linux kernel version changes for timer
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2114259
+Origin: upstream, https://github.com/v4l2loopback/v4l2loopback/commit/3cf949864d25d9b5c776d78a780b0ea9badbebb7
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ v4l2loopback.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/v4l2loopback.c b/v4l2loopback.c
+index 9f0b0b4..9059d58 100644
+--- a/v4l2loopback.c
++++ b/v4l2loopback.c
+@@ -44,6 +44,10 @@
+ #define strscpy strlcpy
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 15, 0)
++#define timer_delete_sync del_timer_sync
++#endif
++
+ #if defined(timer_setup) && defined(from_timer)
+ #define HAVE_TIMER_SETUP
+ #endif
+@@ -1580,8 +1584,8 @@ static int vidioc_querybuf(struct file *file, void *fh, struct v4l2_buffer *b)
+ static void buffer_written(struct v4l2_loopback_device *dev,
+ 			   struct v4l2l_buffer *buf)
+ {
+-	del_timer_sync(&dev->sustain_timer);
+-	del_timer_sync(&dev->timeout_timer);
++	timer_delete_sync(&dev->sustain_timer);
++	timer_delete_sync(&dev->timeout_timer);
+ 	spin_lock_bh(&dev->lock);
+ 
+ 	dev->bufpos2index[dev->write_position % dev->used_buffers] =
+@@ -2105,8 +2109,8 @@ static int v4l2_loopback_close(struct file *file)
+ 
+ 	atomic_dec(&dev->open_count);
+ 	if (dev->open_count.counter == 0) {
+-		del_timer_sync(&dev->sustain_timer);
+-		del_timer_sync(&dev->timeout_timer);
++		timer_delete_sync(&dev->sustain_timer);
++		timer_delete_sync(&dev->timeout_timer);
+ 	}
+ 	try_free_buffers(dev);
+ 
diff --git a/debian/patches/only-use-timer_delete_sync-compat-macro-for-linux-6.2.0.patch b/debian/patches/only-use-timer_delete_sync-compat-macro-for-linux-6.2.0.patch
new file mode 100644
index 0000000..5128e0d
--- /dev/null
+++ b/debian/patches/only-use-timer_delete_sync-compat-macro-for-linux-6.2.0.patch
@@ -0,0 +1,37 @@
+From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= <[e-mail]>
+Date: Wed, 9 Apr 2025 20:21:49 +0200
+Subject: only use `timer_delete_sync` compat macro for linux<6.2.0
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2114259
+Origin: upstream, https://github.com/v4l2loopback/v4l2loopback/commit/20a4b78244dc3cb35b3d32fa8455a3c93d0e5b7f
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ v4l2loopback.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/v4l2loopback.c b/v4l2loopback.c
+index 9059d58..d66fb55 100644
+--- a/v4l2loopback.c
++++ b/v4l2loopback.c
+@@ -44,10 +44,6 @@
+ #define strscpy strlcpy
+ #endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 15, 0)
+-#define timer_delete_sync del_timer_sync
+-#endif
+-
+ #if defined(timer_setup) && defined(from_timer)
+ #define HAVE_TIMER_SETUP
+ #endif
+@@ -56,6 +52,10 @@
+ #define VFL_TYPE_VIDEO VFL_TYPE_GRABBER
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)
++#define timer_delete_sync del_timer_sync
++#endif
++
+ #define V4L2LOOPBACK_VERSION_CODE KERNEL_VERSION(0, 12, 7)
+ 
+ MODULE_DESCRIPTION("V4L2 loopback video device");
diff --git a/debian/patches/series b/debian/patches/series
index c089734..7e04e75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,6 @@ dkms.patch
 0006-UBUNTU-SAUCE-event-support-V4L2_EVENT_PRI_CLIENT_USA.patch
 0007-v4l2loopback-Fixup-bytesused-field-when-writer-sends.patch
 0008-handle-strlcpy.patch
+added-functionality-for-linux-6.15-626.patch
+only-use-timer_delete_sync-compat-macro-for-linux-6.2.0.patch
+Drop-from_timer-macro-usage.patch