diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2026-03-13 20:11:04 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-03-18 14:33:22 -0700 |
| commit | 6ed795e4fd3f1ad109ad507bff33ffe53dc046d3 (patch) | |
| tree | df14a9b1911d594fa4d40009028fd6e16e5133fb /meta-oe | |
| parent | 67a35406cb0dcbb38623eb1c31edc476c0dad6c5 (diff) | |
| download | meta-openembedded-6ed795e4fd3f1ad109ad507bff33ffe53dc046d3.tar.gz | |
v4l-utils: upgrade 1.28.1 -> 1.32.0
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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-meson.build-fix-arm-_TIME_BITS-64-error.patch | 38 | ||||
| -rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.32.0.bb (renamed from meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb) | 10 |
2 files changed, 4 insertions, 44 deletions
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 @@ | |||
| 1 | From 5aabd01e415374fc97eebe80d4635c3bae728f81 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hans Verkuil <hverkuil@xs4all.nl> | ||
| 3 | Date: Sat, 12 Apr 2025 12:30:13 +0200 | ||
| 4 | Subject: [PATCH] meson.build: fix arm _TIME_BITS=64 error | ||
| 5 | |||
| 6 | Undefine _TIME_BITS to avoid this error on 32-bit arm: | ||
| 7 | |||
| 8 | /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ||
| 9 | |||
| 10 | Upstream-Status: Backport [https://github.com/gjasny/v4l-utils/commit/d517cfdcdc16533ab7e06e97c07ca089cf261aef] | ||
| 11 | |||
| 12 | Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> | ||
| 13 | Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> | ||
| 14 | --- | ||
| 15 | meson.build | 6 +++++- | ||
| 16 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/meson.build b/meson.build | ||
| 19 | index 269a9da7..31927cda 100644 | ||
| 20 | --- a/meson.build | ||
| 21 | +++ b/meson.build | ||
| 22 | @@ -53,8 +53,12 @@ v4l2_wrapper_args = [ | ||
| 23 | # As the library needs to provide both 32-bit and 64-bit versions | ||
| 24 | # of file operations, disable transparent large file support (fixes | ||
| 25 | # 'Error: symbol `open64/mmap64' is already defined' compile failure | ||
| 26 | - # otherwise) | ||
| 27 | + # otherwise). | ||
| 28 | + # | ||
| 29 | + # Also disable _TIME_BITS=64 since this is allowed only with | ||
| 30 | + # _FILE_OFFSET_BITS=64, which is now 32. | ||
| 31 | '-U_FILE_OFFSET_BITS', | ||
| 32 | + '-U_TIME_BITS', | ||
| 33 | '-D_FILE_OFFSET_BITS=32', | ||
| 34 | '-D_LARGEFILE64_SOURCE', | ||
| 35 | ] | ||
| 36 | -- | ||
| 37 | 2.34.1 | ||
| 38 | |||
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 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 @@ | |||
| 1 | SUMMARY = "v4l2 and IR applications" | 1 | SUMMARY = "v4l2 and IR applications" |
| 2 | HOMEPAGE = "https://git.linuxtv.org/v4l-utils.git" | 2 | HOMEPAGE = "https://git.linuxtv.org/v4l-utils.git" |
| 3 | LICENSE = "GPL-2.0-only & LGPL-2.1-only" | 3 | LICENSE = "GPL-2.0-only & LGPL-2.1-only" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0ebceacbd7029b5e7051e9f529542b7c \ |
| 5 | file://COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0" | 5 | file://COPYING.libv4l;md5=88b8889c2c4329d4cf18ce5895e64c16" |
| 6 | PROVIDES = "libv4l media-ctl" | 6 | PROVIDES = "libv4l media-ctl" |
| 7 | 7 | ||
| 8 | DEPENDS = "jpeg \ | 8 | DEPENDS = "jpeg \ |
| @@ -23,14 +23,12 @@ PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled" | |||
| 23 | PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" | 23 | PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" |
| 24 | 24 | ||
| 25 | SRC_URI = "\ | 25 | SRC_URI = "\ |
| 26 | git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.28 \ | 26 | git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=master;tag=v4l-utils-${PV} \ |
| 27 | file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \ | 27 | file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \ |
| 28 | file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \ | 28 | file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \ |
| 29 | file://0003-meson.build-fix-arm-_TIME_BITS-64-error.patch \ | ||
| 30 | " | 29 | " |
| 31 | 30 | ||
| 32 | SRCREV = "fc15e229d9d337e46d730f00647821adbbd58548" | 31 | SRCREV = "5a666c7ce89c00d66aa8e53c8f098a0c6c401f91" |
| 33 | |||
| 34 | 32 | ||
| 35 | UPSTREAM_CHECK_GITTAGREGEX = "v4l-utils-(?P<pver>\d+(\.\d+)+)" | 33 | UPSTREAM_CHECK_GITTAGREGEX = "v4l-utils-(?P<pver>\d+(\.\d+)+)" |
| 36 | 34 | ||
