From b83794d7ebd76d97821fad525ddeffb473f851ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Thu, 29 Jan 2026 17:29:43 +0100 Subject: [PATCH] meson: Move egl related dependencies to `software_isp` subdir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way the dependencies are only added if they are actually used. Signed-off-by: Barnabás Pőcze Reviewed-by: Milan Zamazal Reviewed-by: Laurent Pinchart --- src/libcamera/meson.build | 6 ------ src/libcamera/software_isp/meson.build | 11 ++++++++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 72b7bf02..575408b2 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -70,10 +70,6 @@ libcamera_deps = [] libatomic = cc.find_library('atomic', required : false) libthreads = dependency('threads') -libegl = dependency('egl', required : false) -libglesv2 = dependency('glesv2', required : false) -mesa_works = cc.check_header('EGL/egl.h', required : false, dependencies : libegl) - subdir('base') subdir('converter') subdir('ipa') @@ -182,8 +178,6 @@ libcamera_deps += [ libcamera_base_private, libcrypto, libdl, - libegl, - libglesv2, liblttng, libudev, libyaml, diff --git a/src/libcamera/software_isp/meson.build b/src/libcamera/software_isp/meson.build index 118d3f92..cbcd3c1b 100644 --- a/src/libcamera/software_isp/meson.build +++ b/src/libcamera/software_isp/meson.build @@ -2,12 +2,17 @@ softisp_enabled = pipelines.contains('simple') summary({'SoftISP support' : softisp_enabled}, section : 'Configuration') -summary({'SoftISP GPU acceleration' : mesa_works}, section : 'Configuration') if not softisp_enabled subdir_done() endif +libegl = dependency('egl', required : false) +libglesv2 = dependency('glesv2', required : false) +mesa_works = cc.check_header('EGL/egl.h', required : false, dependencies : libegl) + +summary({'SoftISP GPU acceleration' : mesa_works}, section : 'Configuration') + libcamera_internal_sources += files([ 'benchmark.cpp', 'debayer.cpp', @@ -22,4 +27,8 @@ if mesa_works '../egl.cpp', 'debayer_egl.cpp', ]) + libcamera_deps += [ + libegl, + libglesv2, + ] endif