meson: Add missing dependencies on egl

A proper dependency on egl is missing for several backends as well as
for libshared. This dependency is necessary to pull in the correct
include directories from the egl.pc pkg-config file. 

Signed-off-by: Jordan Williams <jordan@jwillikers.com>
This commit is contained in:
Jordan Williams 2024-03-15 16:59:50 -05:00
parent f4c69abc57
commit 2e6c58fb37
No known key found for this signature in database
GPG Key ID: 9FB42B0E7F657D8C
6 changed files with 15 additions and 12 deletions

View File

@ -13,6 +13,7 @@ plugin_headless = shared_library(
srcs_headless,
include_directories: common_inc,
dependencies: [
dep_egl, # for gl-renderer.h
dep_libweston_private,
dep_libdrm_headers,
dep_lib_cairo_shared,

View File

@ -16,6 +16,7 @@ if not dep_libspa.found()
endif
deps_pipewire = [
dep_egl, # for gl-renderer.h
dep_libweston_private,
dep_libpipewire,
dep_libspa,

View File

@ -30,6 +30,7 @@ if get_option('renderer-gl')
error('wayland-backend + gl-renderer requires wayland-egl which was not found. Or, you can use \'-Dbackend-wayland=false\' or \'-Drenderer-gl=false\'.')
endif
deps_wlwl += d
deps_wlwl += dep_egl # for gl-renderer.h
endif
plugin_wlwl = shared_library(

View File

@ -5,7 +5,8 @@ deps_libweston = [
dep_libdl,
dep_libdrm,
dep_xkbcommon,
dep_matrix_c
dep_matrix_c,
dep_egl,
]
srcs_libweston = [
git_version_h,
@ -85,16 +86,6 @@ srcs_libweston = [
subdir('desktop')
subdir('shell-utils')
if get_option('renderer-gl')
dep_egl = dependency('egl', required: false)
if not dep_egl.found()
error('libweston + gl-renderer requires egl which was not found. Or, you can use \'-Drenderer-gl=false\'.')
endif
deps_libweston += dep_egl
else
dep_egl = dependency('', required: false)
endif
if get_option('backend-vnc')
dep_pam = dependency('pam', required: false)
if not dep_pam.found()

View File

@ -159,6 +159,15 @@ deps_for_libweston_users = [
dep_xkbcommon,
]
if get_option('renderer-gl')
dep_egl = dependency('egl', required: false)
if not dep_egl.found()
error('libweston + gl-renderer requires egl which was not found. Or, you can use \'-Drenderer-gl=false\'.')
endif
else
dep_egl = dependency('', required: false)
endif
subdir('include')
subdir('protocol')

View File

@ -6,7 +6,7 @@ srcs_libshared = [
'process-util.c',
'hash.c',
]
deps_libshared = [dep_wayland_client, dep_pixman, deps_for_libweston_users]
deps_libshared = [dep_wayland_client, dep_pixman, deps_for_libweston_users, dep_egl]
lib_libshared = static_library(
'shared',