From d6fb51826f081cb5175f467a0ba64f27f3abdc9c Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 4 Apr 2025 18:47:36 +0200 Subject: [PATCH] package/libcamera: improve reproducibility for optional dependencies libcamera has some optional dependencies that automatically detected at build time. To improve reproducibility, we should add a dependency on those optional dependencies if the symbols that build them are enabled so that the order in which packages are built does not influence the libcamera package. Note that the optional libyuv dependency isn't added as: 1) it is only used for the virtual pipeline and the android feature, both of which are disabled/not supported right now, 2) libcamera has it in a submodule if missing (though if that works with Buildroot is to be determined), 3) adding the dependency isn't enough as meson somehow doesn't find the dependency, Signed-off-by: Quentin Schulz Signed-off-by: Thomas Petazzoni (cherry picked from commit 028bdac7edf02820209c82f134744f0138f1da5b) Signed-off-by: Thomas Perale --- package/libcamera/libcamera.mk | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index ac5c12ff72..b5b17a5c94 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -82,6 +82,27 @@ LIBCAMERA_CONF_OPTS += -Dcam=enabled LIBCAMERA_DEPENDENCIES += libevent endif +ifeq ($(BR2_PACKAGE_ELFUTILS),y) +# Optional dependency on libdw +LIBCAMERA_DEPENDENCIES += elfutils +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +LIBCAMERA_DEPENDENCIES += jpeg +endif + +ifeq ($(BR2_PACKAGE_LIBDRM),y) +LIBCAMERA_DEPENDENCIES += libdrm +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +LIBCAMERA_DEPENDENCIES += libunwind +endif + +ifeq ($(BR2_PACKAGE_SDL2),y) +LIBCAMERA_DEPENDENCIES += sdl2 +endif + ifeq ($(BR2_PACKAGE_TIFF),y) LIBCAMERA_DEPENDENCIES += tiff endif