diff mbox series

[meta-oe,4/5] v4l-utils: upgrade 1.28.1 -> 1.32.0

Message ID 20260313121105.2180430-4-yi.zhao@windriver.com
State New
Headers show
Series [meta-oe,1/5] gnulib: upgrade 202401 -> 202601 | expand

Commit Message

Yi Zhao March 13, 2026, 12:11 p.m. UTC
ChangeLog:
https://git.linuxtv.org/v4l-utils.git/tree/ChangeLog?h=v4l-utils-1.32.0

License-Update: Remove FSF address[1].

[1] https://git.linuxtv.org/v4l-utils.git/commit/?id=dc81a361e22ce71a454ad63a6ede725b97cc26ce

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 ...on.build-fix-arm-_TIME_BITS-64-error.patch | 38 -------------------
 ...4l-utils_1.28.1.bb => v4l-utils_1.32.0.bb} | 10 ++---
 2 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-meson.build-fix-arm-_TIME_BITS-64-error.patch
 rename meta-oe/recipes-multimedia/v4l2apps/{v4l-utils_1.28.1.bb => v4l-utils_1.32.0.bb} (88%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-meson.build-fix-arm-_TIME_BITS-64-error.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-meson.build-fix-arm-_TIME_BITS-64-error.patch
deleted file mode 100644
index f41dde0e16..0000000000
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-meson.build-fix-arm-_TIME_BITS-64-error.patch
+++ /dev/null
@@ -1,38 +0,0 @@ 
-From 5aabd01e415374fc97eebe80d4635c3bae728f81 Mon Sep 17 00:00:00 2001
-From: Hans Verkuil <hverkuil@xs4all.nl>
-Date: Sat, 12 Apr 2025 12:30:13 +0200
-Subject: [PATCH] meson.build: fix arm _TIME_BITS=64 error
-
-Undefine _TIME_BITS to avoid this error on 32-bit arm:
-
-/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
-
-Upstream-Status: Backport [https://github.com/gjasny/v4l-utils/commit/d517cfdcdc16533ab7e06e97c07ca089cf261aef]
-
-Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
-Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com>
----
- meson.build | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 269a9da7..31927cda 100644
---- a/meson.build
-+++ b/meson.build
-@@ -53,8 +53,12 @@ v4l2_wrapper_args = [
-     # As the library needs to provide both 32-bit and 64-bit versions
-     # of file operations, disable transparent large file support (fixes
-     # 'Error: symbol `open64/mmap64' is already defined' compile failure
--    # otherwise)
-+    # otherwise).
-+    #
-+    # Also disable _TIME_BITS=64 since this is allowed only with
-+    # _FILE_OFFSET_BITS=64, which is now 32.
-     '-U_FILE_OFFSET_BITS',
-+    '-U_TIME_BITS',
-     '-D_FILE_OFFSET_BITS=32',
-     '-D_LARGEFILE64_SOURCE',
- ]
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.32.0.bb
similarity index 88%
rename from meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb
rename to meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.32.0.bb
index 14b8d12c45..d19d518b80 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.32.0.bb
@@ -1,8 +1,8 @@ 
 SUMMARY = "v4l2 and IR applications"
 HOMEPAGE = "https://git.linuxtv.org/v4l-utils.git"
 LICENSE = "GPL-2.0-only & LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \
-                    file://COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0ebceacbd7029b5e7051e9f529542b7c \
+                    file://COPYING.libv4l;md5=88b8889c2c4329d4cf18ce5895e64c16"
 PROVIDES = "libv4l media-ctl"
 
 DEPENDS = "jpeg \
@@ -23,14 +23,12 @@  PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled"
 PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c"
 
 SRC_URI = "\
-    git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.28 \
+    git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=master;tag=v4l-utils-${PV} \
     file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \
     file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \
-    file://0003-meson.build-fix-arm-_TIME_BITS-64-error.patch \
 "
 
-SRCREV = "fc15e229d9d337e46d730f00647821adbbd58548"
-
+SRCREV = "5a666c7ce89c00d66aa8e53c8f098a0c6c401f91"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v4l-utils-(?P<pver>\d+(\.\d+)+)"