Module: Mesa Branch: master Commit: 37eb56d239986e2e7ca1c87d08fd357378a3a06e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=37eb56d239986e2e7ca1c87d08fd357378a3a06e
Author: Eric Engestrom <eric.engest...@intel.com> Date: Thu Jun 7 15:45:01 2018 +0100 autotools/meson: compile against wayland-egl-*backend* Bug: https://bugs.freedesktop.org/show_bug.cgi?id=106861 Fixes: 1db4ec05462914096b1f "egl: rewire the build systems to use libwayland-egl" Suggested-by: Emil Velikov <emil.l.veli...@gmail.com> Tested-by: Andreas Hartmetz <ahartm...@gmail.com> Signed-off-by: Eric Engestrom <eric.engest...@intel.com> --- configure.ac | 4 ++-- meson.build | 4 +++- src/egl/meson.build | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 875c47fcd4..75ee1a7c01 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 636d0f913a..160bbfa30b 100644 --- a/meson.build +++ b/meson.build @@ -1220,7 +1220,9 @@ 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') + dep_wayland_egl_headers = declare_dependency( + compile_args : run_command(prog_pkgconfig, ['wayland-egl-backend', '--cflags']).stdout().split()) endif wayland_dmabuf_xml = join_paths( dep_wl_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable', diff --git a/src/egl/meson.build b/src/egl/meson.build index dc67b7b153..8d888d35af 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -116,7 +116,7 @@ if with_platform_surfaceless files_egl += files('drivers/dri2/platform_surfaceless.c') endif if with_platform_wayland - deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl] + deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl_headers] link_for_egl += libwayland_drm files_egl += files('drivers/dri2/platform_wayland.c') files_egl += [ _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
