mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 08:30:47 -09:00
package/libcamera: force-disable qcam for now
Fixes:
http://autobuild.buildroot.net/results/5b0dc8acd491f1d7b20f5b5f065b28212b9d4912/
http://autobuild.buildroot.net/results/61e4bce00a2aff3f531de6c1896d4dc1f92ba5e3/
qcam is based on Qt6 since commit 71aa3ceec30b ("apps: qcam: Port to Qt
6") which is part of the v0.3.1 release.
qcam being enabled when BR2_PACKAGE_QT5BASE_WIDGETS symbol is defined
breaks the build as it's missing the qt6 dependencies.
The migration to Qt 6 for the Buildroot package isn't straightforward
though as we're hitting a meson bug[1].
For now, let's just always disable qcam until we can get everything
fixed and migrated properly.
[1] https://github.com/mesonbuild/meson/issues/13018
Fixes: 72757d111a ("package/libcamera: bump to version 0.3.2")
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
committed by
Peter Korsgaard
parent
ebcd82198f
commit
1c653dd19f
@@ -18,6 +18,7 @@ LIBCAMERA_DEPENDENCIES = \
|
||||
LIBCAMERA_CONF_OPTS = \
|
||||
-Dandroid=disabled \
|
||||
-Ddocumentation=disabled \
|
||||
-Dqcam=disabled \
|
||||
-Dtest=false \
|
||||
-Dwerror=false
|
||||
LIBCAMERA_INSTALL_STAGING = YES
|
||||
@@ -83,16 +84,6 @@ LIBCAMERA_CONF_OPTS += -Dgstreamer=enabled
|
||||
LIBCAMERA_DEPENDENCIES += gstreamer1 gst1-plugins-base
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
|
||||
LIBCAMERA_CONF_OPTS += -Dqcam=enabled
|
||||
LIBCAMERA_DEPENDENCIES += qt5base
|
||||
ifeq ($(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS),y)
|
||||
LIBCAMERA_DEPENDENCIES += qt5tools
|
||||
endif
|
||||
else
|
||||
LIBCAMERA_CONF_OPTS += -Dqcam=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEVENT),y)
|
||||
LIBCAMERA_CONF_OPTS += -Dcam=enabled
|
||||
LIBCAMERA_DEPENDENCIES += libevent
|
||||
|
||||
Reference in New Issue
Block a user