[v2,4/7] meson: Remove `gles_headless_enabled`
diff mbox series

Message ID 20260323082000.1324115-5-barnabas.pocze@ideasonboard.com
State Accepted
Headers show
Series
  • meson: Add `softisp-gpu` option
Related show

Commit Message

Barnabás Pőcze March 23, 2026, 8:19 a.m. UTC 
Use the `mesa_works` variable instead to simplify, the two variables
have the same value.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/meson.build              | 6 ------
 src/libcamera/software_isp/meson.build | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

Comments

Bryan O'Donoghue March 24, 2026, 3:50 p.m. UTC | #1 
On 23/03/2026 08:19, Barnabás Pőcze wrote:
> Use the `mesa_works` variable instead to simplify, the two variables
> have the same value.
> 
> Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>   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',
> --
> 2.53.0
> 
Reviewed-by: Bryan O'Donoghue <bod.linux@nxsw.ie>

Patch
diff mbox series 

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',