Thanks, applied as 9b8be2197db8a762707256ba8f5ebcad7d6e38ca. Michael
[sent from post-receive hook] On Mon, 05 Aug 2024 08:50:06 +0200, Philipp Zabel <[email protected]> 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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
