From 4a9e70ccde1263d628be2d960dab511377cfbc6c Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 8 Feb 2021 13:47:47 +0100 Subject: [PATCH] examples: remove wlroots dep from client examples There is one exception: layer-shell still uses wlr_log. Would need to convert to fprintf to drop the wlroots dep there. Fixes: 34e7f69d6942 ("examples: remove dependency on wlr_egl from clients") --- examples/meson.build | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/examples/meson.build b/examples/meson.build index 0300e035..4d169d87 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -2,6 +2,8 @@ threads = dependency('threads') wayland_egl = dependency('wayland-egl') wayland_cursor = dependency('wayland-cursor') libpng = dependency('libpng', required: false, disabler: true) +egl = dependency('egl', required: false, disabler: true) +glesv2 = dependency('glesv2', required: false, disabler: true) # These versions correspond to ffmpeg 4.0 libavutil = dependency('libavutil', version: '>=56.14.100', required: false, disabler: true) libavcodec = dependency('libavcodec', version: '>=58.18.100', required: false, disabler: true) @@ -55,7 +57,7 @@ clients = { }, 'idle-inhibit': { 'src': ['idle-inhibit.c', 'egl_common.c'], - 'dep': [wayland_egl, wlroots], + 'dep': [wayland_egl, egl, glesv2], 'proto': [ 'idle-inhibit-unstable-v1', 'xdg-shell', @@ -63,7 +65,7 @@ clients = { }, 'keyboard-shortcuts-inhibit': { 'src': ['keyboard-shortcuts-inhibit.c', 'egl_common.c'], - 'dep': [wayland_egl, wayland_cursor, wlroots], + 'dep': [wayland_egl, wayland_cursor, egl, glesv2], 'proto': [ 'keyboard-shortcuts-inhibit-unstable-v1', 'xdg-shell', @@ -71,7 +73,7 @@ clients = { }, 'layer-shell': { 'src': ['layer-shell.c', 'egl_common.c'], - 'dep': [wayland_egl, wayland_cursor, wlroots], + 'dep': [wayland_egl, wayland_cursor, wlroots, egl, glesv2], 'proto': [ 'wlr-layer-shell-unstable-v1', 'xdg-shell', @@ -79,7 +81,7 @@ clients = { }, 'input-inhibitor': { 'src': ['input-inhibitor.c', 'egl_common.c'], - 'dep': [wayland_egl, wayland_cursor, wlroots], + 'dep': [wayland_egl, wayland_cursor, egl, glesv2], 'proto': [ 'wlr-input-inhibitor-unstable-v1', 'xdg-shell', @@ -97,7 +99,7 @@ clients = { }, 'pointer-constraints': { 'src': ['pointer-constraints.c', 'egl_common.c'], - 'dep': [wayland_egl, wlroots], + 'dep': [wayland_egl, egl, glesv2], 'proto': [ 'pointer-constraints-unstable-v1', 'xdg-shell', @@ -105,7 +107,7 @@ clients = { }, 'relative-pointer': { 'src': ['relative-pointer-unstable-v1.c', 'egl_common.c'], - 'dep': [wayland_egl, wlroots], + 'dep': [wayland_egl, egl, glesv2], 'proto': [ 'pointer-constraints-unstable-v1', 'relative-pointer-unstable-v1', @@ -138,7 +140,7 @@ clients = { }, 'toplevel-decoration': { 'src': ['toplevel-decoration.c', 'egl_common.c'], - 'dep': [wayland_egl, wlroots], + 'dep': [wayland_egl, egl, glesv2], 'proto': [ 'xdg-decoration-unstable-v1', 'xdg-shell', @@ -155,7 +157,7 @@ clients = { }, 'text-input': { 'src': ['text-input.c', 'egl_common.c'], - 'dep': [wayland_egl, wayland_cursor, wlroots], + 'dep': [wayland_egl, wayland_cursor, egl, glesv2], 'proto': [ 'text-input-unstable-v3', 'xdg-shell',