From 96a52e0e6b4e53f614c3b8bc5a25fb8dcc3749a9 Mon Sep 17 00:00:00 2001 From: Andy Hu Date: Thu, 29 Jun 2023 15:53:38 +0800 Subject: [PATCH] package/libv4l: fix the libv4l v1.24.1 compile issue Follow the latest buildroot configuration disable new v4l2-tracer option when json-c enable For details see [1]. [1] https://git.linuxtv.org/v4l-utils.git/tree/ChangeLog?h=stable-1.24 if enable the v4l2-tracer, see the patch: https://patchwork.kernel.org/project/linux-media/patch/20230330150606.20483-1-ps.report@gmx.net/ Signed-off-by: Andy Hu --- package/libv4l/libv4l.mk | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index a5acff98..1142a744 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -9,7 +9,7 @@ LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES LIBV4L_DEPENDENCIES = host-pkgconf -LIBV4L_CONF_OPTS = --disable-doxygen-doc --disable-qvidcap +LIBV4L_CONF_OPTS = --disable-doxygen-doc --disable-qvidcap --disable-v4l2-tracer # needed to get utils/qv4l link flags right LIBV4L_AUTORECONF = YES # add host-gettext for AM_ICONV macro @@ -27,8 +27,8 @@ LIBV4L_DEPENDENCIES += alsa-lib endif ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -LIBV4L_DEPENDENCIES += argp-standalone -LIBV4L_LIBS += -largp +LIBV4L_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) +LIBV4L_CONF_ENV += LIBS=$(TARGET_NLS_LIBS) endif LIBV4L_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) @@ -45,8 +45,10 @@ LIBV4L_DEPENDENCIES += libgl endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBV4L_CONF_OPTS += --with-udevdir=/usr/lib/udev +LIBV4L_CONF_OPTS += --with-libudev --with-udevdir=/usr/lib/udev LIBV4L_DEPENDENCIES += udev +else +LIBV4L_CONF_OPTS += --without-libudev endif ifeq ($(BR2_PACKAGE_LIBGLU),y) @@ -57,6 +59,9 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) LIBV4L_CONF_OPTS += --enable-v4l-utils LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) +# v4l2-ctl needs c++11, use gnu++11 for typeof support +LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" + # IR BPF decoder support needs toolchain with linux-headers >= 3.18 # libelf and clang support LIBV4L_CONF_OPTS += --disable-bpf @@ -69,8 +74,6 @@ LIBV4L_CONF_ENV += \ ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \ ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \ ac_cv_prog_UIC=$(HOST_DIR)/bin/uic -# qt5 needs c++11 (since qt-5.7) -LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" else LIBV4L_CONF_OPTS += --disable-qv4l2 endif @@ -82,6 +85,4 @@ ifeq ($(BR2_PACKAGE_SDL2_IMAGE),y) LIBV4L_DEPENDENCIES += sdl2_image endif -LIBV4L_CONF_ENV += LIBS="$(LIBV4L_LIBS)" - $(eval $(autotools-package))