Suggested-by: Emil Velikov <emil.l.veli...@gmail.com>
Signed-off-by: Eric Engestrom <eric.engest...@intel.com>
---
configure.ac | 4 ++--
meson.build | 2 +-
src/egl/Makefile.am | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 875c47fcd43a29e6c5d5..75ee1a7c01c9663250e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ LIBOMXIL_TIZONIA_REQUIRED=0.10.0
LIBVA_REQUIRED=0.39.0
VDPAU_REQUIRED=1.1
WAYLAND_REQUIRED=1.11
-WAYLAND_EGL_REQUIRED=1.15
+WAYLAND_EGL_BACKEND_REQUIRED=3
WAYLAND_PROTOCOLS_REQUIRED=1.8
XCB_REQUIRED=1.9.3
XCBDRI2_REQUIRED=1.8
@@ -1810,7 +1810,7 @@ for plat in $platforms; do
PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >=
$WAYLAND_REQUIRED])
PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >=
$WAYLAND_PROTOCOLS_REQUIRED])
if test "x$enable_egl" = xyes; then
- PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl >=
$WAYLAND_EGL_REQUIRED])
+ PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl-backend >=
$WAYLAND_EGL_BACKEND_REQUIRED])
fi
WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir
wayland-protocols`
diff --git a/meson.build b/meson.build
index 4d4ca5d55787717e1381..a64b93ef108f99de02f7 100644
--- a/meson.build
+++ b/meson.build
@@ -1202,7 +1202,7 @@ if with_platform_wayland
dep_wayland_client = dependency('wayland-client', version : '>=1.11')
dep_wayland_server = dependency('wayland-server', version : '>=1.11')
if with_egl
- dep_wayland_egl = dependency('wayland-egl', version : '>=1.15')
+ dep_wayland_egl = dependency('wayland-egl-backend', version : '>= 3')
endif
wayland_dmabuf_xml = join_paths(
dep_wl_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable',
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index be3547d968fb0304414c..e3b042f1b7b824105687 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -85,7 +85,6 @@ AM_CFLAGS += $(WAYLAND_CLIENT_CFLAGS)
libEGL_common_la_LIBADD += $(WAYLAND_CLIENT_LIBS)
libEGL_common_la_LIBADD += $(LIBDRM_LIBS)
AM_CFLAGS += $(WAYLAND_EGL_CFLAGS)
-libEGL_common_la_LIBADD += $(WAYLAND_EGL_LIBS)
AM_CFLAGS += $(WAYLAND_SERVER_CFLAGS)
libEGL_common_la_LIBADD +=
$(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la
libEGL_common_la_LIBADD += $(WAYLAND_SERVER_LIBS)
--
Cheers,
Eric
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
