diff -Nru v4l-utils-1.26.1/debian/changelog v4l-utils-1.26.1/debian/changelog
--- v4l-utils-1.26.1/debian/changelog	2024-03-01 01:05:14.000000000 +0000
+++ v4l-utils-1.26.1/debian/changelog	2024-03-01 16:52:19.000000000 +0000
@@ -1,8 +1,8 @@
-v4l-utils (1.26.1-3.1build1) noble; urgency=medium
+v4l-utils (1.26.1-4) unstable; urgency=medium
 
-  * No-change rebuild against libelf1t64
+  * Avoid invalid file and time bits combination (Closes: #1065153)
 
- -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 01 Mar 2024 01:05:14 +0000
+ -- Gregor Jasny <gjasny@googlemail.com>  Fri, 01 Mar 2024 17:52:19 +0100
 
 v4l-utils (1.26.1-3.1) unstable; urgency=medium
 
diff -Nru v4l-utils-1.26.1/debian/control v4l-utils-1.26.1/debian/control
--- v4l-utils-1.26.1/debian/control	2024-03-01 01:05:14.000000000 +0000
+++ v4l-utils-1.26.1/debian/control	2024-03-01 16:52:19.000000000 +0000
@@ -1,8 +1,7 @@
 Source: v4l-utils
 Section: video
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Gregor Jasny <gjasny@googlemail.com>
+Maintainer: Gregor Jasny <gjasny@googlemail.com>
 Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                clang:native [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x powerpc powerpcspe riscv64 ppc64 sparc64],
                doxygen,
@@ -19,7 +18,7 @@
                qtbase5-dev,
                libudev-dev [linux-any],
                libx11-dev,
-               pkg-config,
+               pkgconf,
                systemd-dev [linux-any]
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/debian/libv4l
@@ -95,7 +94,7 @@
          libjpeg-dev,
          ${shlibs:Depends},
          ${misc:Depends}
-Suggests: pkg-config
+Suggests: pkgconf
 Multi-Arch: same
 Description: Collection of video4linux support libraries (development files)
  libv4l is a collection of libraries which adds a thin abstraction layer on
@@ -158,7 +157,7 @@
          libudev-dev,
          ${shlibs:Depends},
          ${misc:Depends}
-Suggests: pkg-config, libdvbv5-doc
+Suggests: pkgconf, libdvbv5-doc
 Multi-Arch: same
 Description: Development files for libdvbv5
  This library provides functions to work with DVB devices that
diff -Nru v4l-utils-1.26.1/debian/libv4l-0t64.lintian-overrides v4l-utils-1.26.1/debian/libv4l-0t64.lintian-overrides
--- v4l-utils-1.26.1/debian/libv4l-0t64.lintian-overrides	2024-02-28 21:38:15.000000000 +0000
+++ v4l-utils-1.26.1/debian/libv4l-0t64.lintian-overrides	2024-03-01 16:52:19.000000000 +0000
@@ -1,2 +1 @@
 libv4l-0t64: package-name-doesnt-match-sonames libv4l1-0 libv4l2-0
-libv4l-0t64: package-name-doesnt-match-sonames libv4l-0
diff -Nru v4l-utils-1.26.1/debian/libv4l-dev.links v4l-utils-1.26.1/debian/libv4l-dev.links
--- v4l-utils-1.26.1/debian/libv4l-dev.links	2023-11-25 14:49:30.000000000 +0000
+++ v4l-utils-1.26.1/debian/libv4l-dev.links	2024-03-01 16:52:19.000000000 +0000
@@ -1 +1 @@
-usr/share/doc/libv4l-0 /usr/share/doc/libv4l-dev
+usr/share/doc/libv4l-0t64 /usr/share/doc/libv4l-dev
diff -Nru v4l-utils-1.26.1/debian/patches/series v4l-utils-1.26.1/debian/patches/series
--- v4l-utils-1.26.1/debian/patches/series	2023-11-25 14:49:30.000000000 +0000
+++ v4l-utils-1.26.1/debian/patches/series	2024-03-01 16:48:12.000000000 +0000
@@ -1 +1,2 @@
 dont-gererate-treeview.diff
+time_t-wrapper-clash.diff
diff -Nru v4l-utils-1.26.1/debian/patches/time_t-wrapper-clash.diff v4l-utils-1.26.1/debian/patches/time_t-wrapper-clash.diff
--- v4l-utils-1.26.1/debian/patches/time_t-wrapper-clash.diff	1970-01-01 00:00:00.000000000 +0000
+++ v4l-utils-1.26.1/debian/patches/time_t-wrapper-clash.diff	2024-03-01 16:51:06.000000000 +0000
@@ -0,0 +1,15 @@
+Author: Gregor Jasny <gjasny@googlemail.com>
+Description: Avoid invalid file and time bits combination
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/1065153
+
+--- a/meson.build
++++ b/meson.build
+@@ -55,6 +55,7 @@
+     '-U_FILE_OFFSET_BITS',
+     '-D_FILE_OFFSET_BITS=32',
+     '-D_LARGEFILE64_SOURCE',
++    '-U_TIME_BITS',
+ ]
+ 
+ v4l2_utils_incdir_arr = [
diff -Nru v4l-utils-1.26.1/debian/qv4l2.links v4l-utils-1.26.1/debian/qv4l2.links
--- v4l-utils-1.26.1/debian/qv4l2.links	2023-11-25 14:49:30.000000000 +0000
+++ v4l-utils-1.26.1/debian/qv4l2.links	2024-03-01 16:52:19.000000000 +0000
@@ -1 +1 @@
-usr/share/doc/libv4l-0 /usr/share/doc/qv4l2
+usr/share/doc/libv4l-0t64 /usr/share/doc/qv4l2
diff -Nru v4l-utils-1.26.1/debian/v4l-utils.links v4l-utils-1.26.1/debian/v4l-utils.links
--- v4l-utils-1.26.1/debian/v4l-utils.links	2023-11-25 14:49:30.000000000 +0000
+++ v4l-utils-1.26.1/debian/v4l-utils.links	2024-03-01 16:52:19.000000000 +0000
@@ -1 +1 @@
-usr/share/doc/libv4l-0 /usr/share/doc/v4l-utils
+usr/share/doc/libv4l-0t64 /usr/share/doc/v4l-utils