* [ptxdist] [PATCH 1/2] v4l-utils: version bump 1.26.0 -> 1.28.1
@ 2024-07-26 12:00 Philipp Zabel
2024-07-26 12:00 ` [ptxdist] [PATCH 2/2] v4l-utils: allow (partial) build with Y2038 support Philipp Zabel
2024-08-05 6:50 ` [ptxdist] [APPLIED] v4l-utils: version bump 1.26.0 -> 1.28.1 Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Philipp Zabel @ 2024-07-26 12:00 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/v4l-utils.make | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
index f991e8cb1117..a532e6900f5d 100644
--- a/rules/v4l-utils.make
+++ b/rules/v4l-utils.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_V4L_UTILS) += v4l-utils
#
# Paths and names
#
-V4L_UTILS_VERSION := 1.26.0
-V4L_UTILS_MD5 := 0ccb2a18e1d3a3b2986591753a2b3a7f
+V4L_UTILS_VERSION := 1.28.1
+V4L_UTILS_MD5 := 6716de513a1fd2e1edb404a46a455855
V4L_UTILS := v4l-utils-$(V4L_UTILS_VERSION)
V4L_UTILS_SUFFIX := tar.xz
V4L_UTILS_URL := http://linuxtv.org/downloads/v4l-utils/$(V4L_UTILS).$(V4L_UTILS_SUFFIX)
@@ -35,6 +35,7 @@ V4L_UTILS_CONF_TOOL := meson
V4L_UTILS_CONF_OPT := \
$(CROSS_MESON_USR) \
-Dbpf=disabled \
+ -Ddocdir= \
-Ddoxygen-doc=disabled \
-Ddoxygen-html=false \
-Ddoxygen-man=false \
--
2.39.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] v4l-utils: allow (partial) build with Y2038 support
2024-07-26 12:00 [ptxdist] [PATCH 1/2] v4l-utils: version bump 1.26.0 -> 1.28.1 Philipp Zabel
@ 2024-07-26 12:00 ` Philipp Zabel
2024-08-05 6:50 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-08-05 6:50 ` [ptxdist] [APPLIED] v4l-utils: version bump 1.26.0 -> 1.28.1 Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Philipp Zabel @ 2024-07-26 12:00 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
The v4l-wrappers and v4l2-tracer options don't play nice with Y2038
support. Add a new option for v4l-wrappers and make both depend on
GLIBC_Y2038 being disabled.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/v4l-utils.in | 9 ++++++++-
rules/v4l-utils.make | 4 +++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in
index 8bbd12f47166..bb444213b7b0 100644
--- a/rules/v4l-utils.in
+++ b/rules/v4l-utils.in
@@ -25,9 +25,15 @@ config V4L_UTILS_LIBV4L1
config V4L_UTILS_LIBV4L2
bool
- select V4L_UTILS_LIBV4LCONVERT
prompt "install libv4l2"
+config V4L_UTILS_V4L2CONVERT
+ bool
+ select V4L_UTILS_LIBV4L2
+ select V4L_UTILS_LIBV4LCONVERT
+ depends on !GLIBC_Y2038
+ prompt "install v4l2convert"
+
config V4L_UTILS_LIBV4LCONVERT
bool
prompt "install libv4lconvert"
@@ -93,6 +99,7 @@ config V4L_UTILS_V4L2SYSFSPATH
config V4L_UTILS_TRACER
bool
+ depends on !GLIBC_Y2038
prompt "install v4l2-tracer"
endif
diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
index a532e6900f5d..8911fccc12ee 100644
--- a/rules/v4l-utils.make
+++ b/rules/v4l-utils.make
@@ -52,7 +52,7 @@ V4L_UTILS_CONF_OPT := \
-Dudevdir=/usr/lib/udev \
-Dv4l-plugins=true \
-Dv4l-utils=true \
- -Dv4l-wrappers=true \
+ -Dv4l-wrappers=$(call ptx/truefalse, PTXCONF_V4L_UTILS_V4L2CONVERT) \
-Dv4l2-compliance-32=false \
-Dv4l2-compliance-libv4l=true \
-Dv4l2-ctl-32=false \
@@ -84,8 +84,10 @@ ifdef PTXCONF_V4L_UTILS_LIBV4L1
endif
ifdef PTXCONF_V4L_UTILS_LIBV4L2
@$(call install_lib, v4l-utils, 0, 0, 0644, libv4l2)
+ifdef PTXCONF_V4L_UTILS_V4L2CONVERT
@$(call install_lib, v4l-utils, 0, 0, 0644, libv4l/v4l2convert)
endif
+endif
ifdef PTXCONF_V4L_UTILS_LIBV4LCONVERT
@$(call install_lib, v4l-utils, 0, 0, 0644, libv4lconvert)
endif
--
2.39.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] v4l-utils: version bump 1.26.0 -> 1.28.1
2024-07-26 12:00 [ptxdist] [PATCH 1/2] v4l-utils: version bump 1.26.0 -> 1.28.1 Philipp Zabel
2024-07-26 12:00 ` [ptxdist] [PATCH 2/2] v4l-utils: allow (partial) build with Y2038 support Philipp Zabel
@ 2024-08-05 6:50 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2024-08-05 6:50 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 659e9ad6ea9a48380a1e19a62b66d7d795960507.
Michael
[sent from post-receive hook]
On Mon, 05 Aug 2024 08:50:05 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240726120033.3557075-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
> index f991e8cb1117..a532e6900f5d 100644
> --- a/rules/v4l-utils.make
> +++ b/rules/v4l-utils.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_V4L_UTILS) += v4l-utils
> #
> # Paths and names
> #
> -V4L_UTILS_VERSION := 1.26.0
> -V4L_UTILS_MD5 := 0ccb2a18e1d3a3b2986591753a2b3a7f
> +V4L_UTILS_VERSION := 1.28.1
> +V4L_UTILS_MD5 := 6716de513a1fd2e1edb404a46a455855
> V4L_UTILS := v4l-utils-$(V4L_UTILS_VERSION)
> V4L_UTILS_SUFFIX := tar.xz
> V4L_UTILS_URL := http://linuxtv.org/downloads/v4l-utils/$(V4L_UTILS).$(V4L_UTILS_SUFFIX)
> @@ -35,6 +35,7 @@ V4L_UTILS_CONF_TOOL := meson
> V4L_UTILS_CONF_OPT := \
> $(CROSS_MESON_USR) \
> -Dbpf=disabled \
> + -Ddocdir= \
> -Ddoxygen-doc=disabled \
> -Ddoxygen-html=false \
> -Ddoxygen-man=false \
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] v4l-utils: allow (partial) build with Y2038 support
2024-07-26 12:00 ` [ptxdist] [PATCH 2/2] v4l-utils: allow (partial) build with Y2038 support Philipp Zabel
@ 2024-08-05 6:50 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2024-08-05 6:50 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 9b8be2197db8a762707256ba8f5ebcad7d6e38ca.
Michael
[sent from post-receive hook]
On Mon, 05 Aug 2024 08:50:06 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> The v4l-wrappers and v4l2-tracer options don't play nice with Y2038
> support. Add a new option for v4l-wrappers and make both depend on
> GLIBC_Y2038 being disabled.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240726120033.3557075-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in
> index 8bbd12f47166..bb444213b7b0 100644
> --- a/rules/v4l-utils.in
> +++ b/rules/v4l-utils.in
> @@ -25,9 +25,15 @@ config V4L_UTILS_LIBV4L1
>
> config V4L_UTILS_LIBV4L2
> bool
> - select V4L_UTILS_LIBV4LCONVERT
> prompt "install libv4l2"
>
> +config V4L_UTILS_V4L2CONVERT
> + bool
> + select V4L_UTILS_LIBV4L2
> + select V4L_UTILS_LIBV4LCONVERT
> + depends on !GLIBC_Y2038
> + prompt "install v4l2convert"
> +
> config V4L_UTILS_LIBV4LCONVERT
> bool
> prompt "install libv4lconvert"
> @@ -93,6 +99,7 @@ config V4L_UTILS_V4L2SYSFSPATH
>
> config V4L_UTILS_TRACER
> bool
> + depends on !GLIBC_Y2038
> prompt "install v4l2-tracer"
>
> endif
> diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
> index a532e6900f5d..8911fccc12ee 100644
> --- a/rules/v4l-utils.make
> +++ b/rules/v4l-utils.make
> @@ -52,7 +52,7 @@ V4L_UTILS_CONF_OPT := \
> -Dudevdir=/usr/lib/udev \
> -Dv4l-plugins=true \
> -Dv4l-utils=true \
> - -Dv4l-wrappers=true \
> + -Dv4l-wrappers=$(call ptx/truefalse, PTXCONF_V4L_UTILS_V4L2CONVERT) \
> -Dv4l2-compliance-32=false \
> -Dv4l2-compliance-libv4l=true \
> -Dv4l2-ctl-32=false \
> @@ -84,8 +84,10 @@ ifdef PTXCONF_V4L_UTILS_LIBV4L1
> endif
> ifdef PTXCONF_V4L_UTILS_LIBV4L2
> @$(call install_lib, v4l-utils, 0, 0, 0644, libv4l2)
> +ifdef PTXCONF_V4L_UTILS_V4L2CONVERT
> @$(call install_lib, v4l-utils, 0, 0, 0644, libv4l/v4l2convert)
> endif
> +endif
> ifdef PTXCONF_V4L_UTILS_LIBV4LCONVERT
> @$(call install_lib, v4l-utils, 0, 0, 0644, libv4lconvert)
> endif
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-05 6:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-26 12:00 [ptxdist] [PATCH 1/2] v4l-utils: version bump 1.26.0 -> 1.28.1 Philipp Zabel
2024-07-26 12:00 ` [ptxdist] [PATCH 2/2] v4l-utils: allow (partial) build with Y2038 support Philipp Zabel
2024-08-05 6:50 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-08-05 6:50 ` [ptxdist] [APPLIED] v4l-utils: version bump 1.26.0 -> 1.28.1 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox