aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2020-11-26 13:23:34 +0100
committerSimon Ser <contact@emersion.fr>2020-12-13 12:16:28 +0100
commit858a1940b59e48624b35369541b5ea09e3121606 (patch)
tree1b8b5d04b9b6579301dd67475dbb6dacad822ca5
parent441bac139fdfbbe576d3d87a91adeb906f9bd2a7 (diff)
build: move wayland-egl dependency to examples/
Now that the Wayland backend has moved to wlr_swapchain, only client examples use the dependency. Stop linking against wayland-egl in the wlroots library.
-rw-r--r--examples/meson.build19
-rw-r--r--meson.build2
2 files changed, 10 insertions, 11 deletions
diff --git a/examples/meson.build b/examples/meson.build
index c8016d3a..ede85832 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -1,4 +1,5 @@
threads = dependency('threads')
+wayland_egl = dependency('wayland-egl')
wayland_cursor = dependency('wayland-cursor')
libpng = dependency('libpng', required: false, disabler: true)
# These versions correspond to ffmpeg 4.0
@@ -54,7 +55,7 @@ clients = {
},
'idle-inhibit': {
'src': 'idle-inhibit.c',
- 'dep': wlroots,
+ 'dep': [wayland_egl, wlroots],
'proto': [
'idle-inhibit-unstable-v1',
'xdg-shell',
@@ -62,7 +63,7 @@ clients = {
},
'keyboard-shortcuts-inhibit': {
'src': 'keyboard-shortcuts-inhibit.c',
- 'dep': [wayland_cursor, wlroots],
+ 'dep': [wayland_egl, wayland_cursor, wlroots],
'proto': [
'keyboard-shortcuts-inhibit-unstable-v1',
'xdg-shell',
@@ -70,7 +71,7 @@ clients = {
},
'layer-shell': {
'src': 'layer-shell.c',
- 'dep': [wayland_cursor, wlroots],
+ 'dep': [wayland_egl, wayland_cursor, wlroots],
'proto': [
'wlr-layer-shell-unstable-v1',
'xdg-shell',
@@ -78,7 +79,7 @@ clients = {
},
'input-inhibitor': {
'src': 'input-inhibitor.c',
- 'dep': [wayland_cursor, wlroots],
+ 'dep': [wayland_egl, wayland_cursor, wlroots],
'proto': [
'wlr-input-inhibitor-unstable-v1',
'xdg-shell',
@@ -96,7 +97,7 @@ clients = {
},
'pointer-constraints': {
'src': 'pointer-constraints.c',
- 'dep': wlroots,
+ 'dep': [wayland_egl, wlroots],
'proto': [
'pointer-constraints-unstable-v1',
'xdg-shell',
@@ -104,7 +105,7 @@ clients = {
},
'relative-pointer': {
'src': 'relative-pointer-unstable-v1.c',
- 'dep': wlroots,
+ 'dep': [wayland_egl, wlroots],
'proto': [
'pointer-constraints-unstable-v1',
'relative-pointer-unstable-v1',
@@ -137,7 +138,7 @@ clients = {
},
'toplevel-decoration': {
'src': 'toplevel-decoration.c',
- 'dep': wlroots,
+ 'dep': [wayland_egl, wlroots],
'proto': [
'xdg-decoration-unstable-v1',
'xdg-shell',
@@ -145,7 +146,7 @@ clients = {
},
'input-method': {
'src': 'input-method.c',
- 'dep': libepoll,
+ 'dep': [wayland_egl, libepoll],
'proto': [
'input-method-unstable-v2',
'text-input-unstable-v3',
@@ -154,7 +155,7 @@ clients = {
},
'text-input': {
'src': 'text-input.c',
- 'dep': [wayland_cursor, wlroots],
+ 'dep': [wayland_egl, wayland_cursor, wlroots],
'proto': [
'text-input-unstable-v3',
'xdg-shell',
diff --git a/meson.build b/meson.build
index 95fdff65..aa6598bf 100644
--- a/meson.build
+++ b/meson.build
@@ -97,7 +97,6 @@ endif
wayland_server = dependency('wayland-server', version: '>=1.18')
wayland_client = dependency('wayland-client')
-wayland_egl = dependency('wayland-egl')
wayland_protos = dependency('wayland-protocols', version: '>=1.17')
egl = dependency('egl')
glesv2 = dependency('glesv2')
@@ -114,7 +113,6 @@ wlr_files = []
wlr_deps = [
wayland_server,
wayland_client,
- wayland_egl,
wayland_protos,
egl,
glesv2,