From patchwork Thu Jan 29 16:40:26 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 26042 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 4361BC3226 for ; Thu, 29 Jan 2026 16:40:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7030261FD2; Thu, 29 Jan 2026 17:40:38 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="kz9DRDKy"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D287E61FC6 for ; Thu, 29 Jan 2026 17:40:35 +0100 (CET) Received: from pb-laptop.local (185.221.142.123.nat.pool.zt.hu [185.221.142.123]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B5FA51661 for ; Thu, 29 Jan 2026 17:39:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1769704797; bh=3Tis7UDAaqMTdy9zumMy8iidYVC9BQ86xccFu5v8SpQ=; h=From:To:Subject:Date:From; b=kz9DRDKyuPhEhH4Qn0RXkx+Qss4k0v2CELEEGHy5voC1KfAFfPRt/1242diNfD3fo MRw9PZEi2KGZZ4cMO8Mgo20s4ECseHvTuCp/6SRegGodRKlKXmzyaNUgElY8naez60 eqzMMsGdF+UlblZpBdB1rCcNu+0BiaJRIalksIQI= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 1/7] meson: Drop unnecessary egl, gles feature defines Date: Thu, 29 Jan 2026 17:40:26 +0100 Message-ID: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" `HAVE_LIBEGL` and `HAVE_GLESV2` are not used, so drop them. Signed-off-by: Barnabás Pőcze --- src/libcamera/meson.build | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index d15943586..c6c109a30 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -74,14 +74,6 @@ mesa_works = cc.check_header('EGL/egl.h', required: false) libegl = dependency('egl', required : false) libglesv2 = dependency('glesv2', required : false) -if libegl.found() - config_h.set('HAVE_LIBEGL', 1) -endif - -if libglesv2.found() - config_h.set('HAVE_GLESV2', 1) -endif - if mesa_works libcamera_internal_sources += files([ 'egl.cpp', From patchwork Thu Jan 29 16:40:27 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 26041 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id EB4E3C3226 for ; Thu, 29 Jan 2026 16:40:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C010961FD5; Thu, 29 Jan 2026 17:40:37 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="vGaa53IV"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BD50A615B2 for ; Thu, 29 Jan 2026 17:40:35 +0100 (CET) Received: from pb-laptop.local (185.221.142.123.nat.pool.zt.hu [185.221.142.123]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id F14B41934 for ; Thu, 29 Jan 2026 17:39:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1769704798; bh=JPDh0aNwLwm4rXaWQnhlsuV7vh7J3mZY8tpyjxA4k14=; h=From:To:Subject:Date:In-Reply-To:References:From; b=vGaa53IV3l0bEhTNyuZqm7jVA5qCb+sI0DfUnGND1/XENC02DtLsGqCR8dH+caHD6 kWlfRW87wIIpE7bPhfjuJeg4z6dVTPrXiQF0w3g4fxLk1mj50E3RlSdt0VcITGo1e5 IP5zeFKzGqCXNkUqGYmARjH4PGUIj56cKqIbb6fI= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 2/7] meson: Add `egl.cpp` to sources alongside `debayer_egl.cpp` Date: Thu, 29 Jan 2026 17:40:27 +0100 Message-ID: <20260129164032.1380169-2-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> References: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" There are no other users of `egl.cpp`, so simplify by adding it the sources array at the same time. Signed-off-by: Barnabás Pőcze --- src/libcamera/meson.build | 3 --- src/libcamera/software_isp/meson.build | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index c6c109a30..28ce93de6 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -75,9 +75,6 @@ libegl = dependency('egl', required : false) libglesv2 = dependency('glesv2', required : false) if mesa_works - libcamera_internal_sources += files([ - 'egl.cpp', - ]) gles_headless_enabled = true else gles_headless_enabled = false diff --git a/src/libcamera/software_isp/meson.build b/src/libcamera/software_isp/meson.build index c61ac7d59..a55b76b58 100644 --- a/src/libcamera/software_isp/meson.build +++ b/src/libcamera/software_isp/meson.build @@ -19,6 +19,7 @@ libcamera_internal_sources += files([ if softisp_enabled and gles_headless_enabled config_h.set('HAVE_DEBAYER_EGL', 1) libcamera_internal_sources += files([ + '../egl.cpp', 'debayer_egl.cpp', ]) endif From patchwork Thu Jan 29 16:40:28 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 26043 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 881CCC328F for ; Thu, 29 Jan 2026 16:40:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B4F2661FDB; Thu, 29 Jan 2026 17:40:39 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="qX6W4mU7"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 05C3A61FC7 for ; Thu, 29 Jan 2026 17:40:36 +0100 (CET) Received: from pb-laptop.local (185.221.142.123.nat.pool.zt.hu [185.221.142.123]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 317A91AED for ; Thu, 29 Jan 2026 17:39:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1769704798; bh=JQtNR4HAlo4mwwqSDKyHmbr0a1fuMY47OmIildySRXw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=qX6W4mU7MEJNzKu2k5UpqwDUdHCpYLwgTx3RmOfj9fntOIM7fi2+k8FczHW2eze0R 5ura7C5QjqkLsKNfGLKV0tjK6skezkr1nP90UPT/y8l0M0l9cRQd2NV24PnLMApzdD 0HCAuGhFz+ar546eZPzxcTu3uCj34yyzBBmH+boU= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 3/7] meson: Simplify condition Date: Thu, 29 Jan 2026 17:40:28 +0100 Message-ID: <20260129164032.1380169-3-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> References: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" If `softisp_enabled` is false, then `subdir_done()` is called above. Signed-off-by: Barnabás Pőcze --- src/libcamera/software_isp/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcamera/software_isp/meson.build b/src/libcamera/software_isp/meson.build index a55b76b58..4c61909fd 100644 --- a/src/libcamera/software_isp/meson.build +++ b/src/libcamera/software_isp/meson.build @@ -16,7 +16,7 @@ libcamera_internal_sources += files([ 'swstats_cpu.cpp', ]) -if softisp_enabled and gles_headless_enabled +if gles_headless_enabled config_h.set('HAVE_DEBAYER_EGL', 1) libcamera_internal_sources += files([ '../egl.cpp', From patchwork Thu Jan 29 16:40:29 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 26044 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 7A967C3226 for ; Thu, 29 Jan 2026 16:40:43 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 04CDB61FD9; Thu, 29 Jan 2026 17:40:43 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="bwi3IJZV"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2FEA061FC9 for ; Thu, 29 Jan 2026 17:40:36 +0100 (CET) Received: from pb-laptop.local (185.221.142.123.nat.pool.zt.hu [185.221.142.123]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6C5FB1934 for ; Thu, 29 Jan 2026 17:39:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1769704798; bh=x+90y/6kN/Ln39zb4OnQBOgysdmjRXcOO8X5pkwIQB4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=bwi3IJZVkF/aCd2Sx1OkRTRHu6dzJDEMEocYdXsbVFhrvCBPeCSkzA1Vm6smZwbtW EphOhFsSYX3RAGaQLv/7+vniGoMzRQZIj9X6/HGvJOQnBH3wkYeHSGcCwYmMLLwxIC bBqAm4V73HPNmulvMZdUmJeS5Gh6d6d+JlF9npu8= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 4/7] meson: Remove `gles_headless_enabled` Date: Thu, 29 Jan 2026 17:40:29 +0100 Message-ID: <20260129164032.1380169-4-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> References: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Use the `mesa_works` variable instead to simplify, the two variables have the same value. Signed-off-by: Barnabás Pőcze --- src/libcamera/meson.build | 6 ------ src/libcamera/software_isp/meson.build | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 28ce93de6..06ed34101 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -74,12 +74,6 @@ mesa_works = cc.check_header('EGL/egl.h', required: false) libegl = dependency('egl', required : false) libglesv2 = dependency('glesv2', required : false) -if mesa_works - gles_headless_enabled = true -else - gles_headless_enabled = false -endif - subdir('base') subdir('converter') subdir('ipa') diff --git a/src/libcamera/software_isp/meson.build b/src/libcamera/software_isp/meson.build index 4c61909fd..118d3f92f 100644 --- a/src/libcamera/software_isp/meson.build +++ b/src/libcamera/software_isp/meson.build @@ -2,7 +2,7 @@ softisp_enabled = pipelines.contains('simple') summary({'SoftISP support' : softisp_enabled}, section : 'Configuration') -summary({'SoftISP GPU acceleration' : gles_headless_enabled}, section : 'Configuration') +summary({'SoftISP GPU acceleration' : mesa_works}, section : 'Configuration') if not softisp_enabled subdir_done() @@ -16,7 +16,7 @@ libcamera_internal_sources += files([ 'swstats_cpu.cpp', ]) -if gles_headless_enabled +if mesa_works config_h.set('HAVE_DEBAYER_EGL', 1) libcamera_internal_sources += files([ '../egl.cpp', From patchwork Thu Jan 29 16:40:30 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 26045 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 89412C328F for ; Thu, 29 Jan 2026 16:40:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 23AE861FD4; Thu, 29 Jan 2026 17:40:44 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="VK/4kzHU"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6842A61FCE for ; Thu, 29 Jan 2026 17:40:36 +0100 (CET) Received: from pb-laptop.local (185.221.142.123.nat.pool.zt.hu [185.221.142.123]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id ABEAB1661 for ; Thu, 29 Jan 2026 17:39:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1769704798; bh=Z/kkyL1gHKcVRs/ud3DzycaQpEIv1EhhckeZ+mSXzXY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=VK/4kzHU2Tzt/I9Z2RFUnqtkZO04xIMJQTy5kSbUUzEOvur+s7QrXZn+YlT4GwL8R M1VDUKHQ5rwm4gPBNc0sYPTZdpIzZsEjMbVErTFSNMohBIrCi25MIbvp4fS7vNQ9jE Mid9cDzlB1fUKjNVutTKCN/DWUfucn9zSc9nworw= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 5/7] meson: Use dependency object when checking for headers Date: Thu, 29 Jan 2026 17:40:30 +0100 Message-ID: <20260129164032.1380169-5-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> References: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" A dependency might very well have custom include directories, so use it when checking for the header file. Signed-off-by: Barnabás Pőcze --- src/libcamera/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 06ed34101..72b7bf02d 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -70,9 +70,9 @@ libcamera_deps = [] libatomic = cc.find_library('atomic', required : false) libthreads = dependency('threads') -mesa_works = cc.check_header('EGL/egl.h', required: false) 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') From patchwork Thu Jan 29 16:40:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 26046 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 8E08FC3226 for ; Thu, 29 Jan 2026 16:40:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 28CA161FE4; Thu, 29 Jan 2026 17:40:46 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="dTtQvIgY"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9D64D615B2 for ; Thu, 29 Jan 2026 17:40:36 +0100 (CET) Received: from pb-laptop.local (185.221.142.123.nat.pool.zt.hu [185.221.142.123]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DE0311934 for ; Thu, 29 Jan 2026 17:39:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1769704799; bh=IS4WU8T/IHHSI9NEgZMNomCjhhiu64xvjOgzMR4R460=; h=From:To:Subject:Date:In-Reply-To:References:From; b=dTtQvIgYZaCAWZBlj/koQH3c0RK87Z9ds6L0P7vpcDBYpjeVfQbH6dtFsTlVX4CYz hXHYqkPYItlykn53jEu7MoiyKl0S2ficwfQ6Uf1CqoZRIuML61OHwlFWAH2S8pCWpk Veqb/IGdfdzExX0WAY1ngUTmBQx86UeeAzCqskUg= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 6/7] meson: Move egl related dependencies to `software_isp` subdir Date: Thu, 29 Jan 2026 17:40:31 +0100 Message-ID: <20260129164032.1380169-6-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> References: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This way the dependencies are only added if they are actually used. Signed-off-by: Barnabás Pőcze --- 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 72b7bf02d..575408b2c 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 118d3f92f..cbcd3c1b3 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 From patchwork Thu Jan 29 16:40:32 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 26047 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 76D8CC3226 for ; Thu, 29 Jan 2026 16:40:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1D1AB61FE7; Thu, 29 Jan 2026 17:40:47 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="gy+Tfq66"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D6B7361FD1 for ; Thu, 29 Jan 2026 17:40:36 +0100 (CET) Received: from pb-laptop.local (185.221.142.123.nat.pool.zt.hu [185.221.142.123]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 207161661 for ; Thu, 29 Jan 2026 17:39:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1769704799; bh=kSdxd5gZwMIC4zTyRu6gX/7WXwJ2Kpb2KMP3W7K6Yps=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gy+Tfq663Dn3kiQDcnA+TfjNxFi27vOzsbG7cXeMLHUVedPW/3poFTs2f0jowiJhm tsRvfavo0OBo+mStjVc2D8jp6Yb8UuEl+dtZ2vv7l6Eywe8sWPPm/gC0hK8GwvsCfy Ze2soy5M7QIjzmjdwxB9fr4HSb35Voy3Z436f+A0= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 7/7] meson: Guard egl debayering with feature option: softisp-debayer-egl Date: Thu, 29 Jan 2026 17:40:32 +0100 Message-ID: <20260129164032.1380169-7-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> References: <20260129164032.1380169-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Previously it was not possible to disable egl debayering if every dependency was discovered by meson. Fix that by adding a new option. Signed-off-by: Barnabás Pőcze --- meson_options.txt | 5 +++++ src/libcamera/software_isp/meson.build | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 078472940..d600cd1be 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -81,6 +81,11 @@ option('rpi-awb-nn', value : 'auto', description : 'Enable the Raspberry Pi Neural Network AWB algorithm') +option('softisp-debayer-egl', + type : 'feature', + value : 'auto', + description : 'Enable OpenGL ES based debayering in the software ISP') + option('test', type : 'boolean', value : false, diff --git a/src/libcamera/software_isp/meson.build b/src/libcamera/software_isp/meson.build index cbcd3c1b3..754a0d2d9 100644 --- a/src/libcamera/software_isp/meson.build +++ b/src/libcamera/software_isp/meson.build @@ -7,9 +7,11 @@ 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) +libegl = dependency('egl', required : get_option('softisp-debayer-egl')) +libglesv2 = dependency('glesv2', required : get_option('softisp-debayer-egl')) +mesa_works = cc.check_header('EGL/egl.h', + required : get_option('softisp-debayer-egl'), + dependencies : libegl) summary({'SoftISP GPU acceleration' : mesa_works}, section : 'Configuration')