nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-21 22:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: move wayland-egl dependency to examples/

Browse Source 
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.
This commit is contained in:
Simon Ser 2020-11-26 13:23:34 +01:00
parent 441bac139f
commit 858a1940b5
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
examples/meson.build
View File

@ -1,4 +1,5 @@
threads = dependency('threads') threads = dependency('threads')
wayland_egl = dependency('wayland-egl')
wayland_cursor = dependency('wayland-cursor') wayland_cursor = dependency('wayland-cursor')
libpng = dependency('libpng', required: false, disabler: true) libpng = dependency('libpng', required: false, disabler: true)
# These versions correspond to ffmpeg 4.0 # These versions correspond to ffmpeg 4.0
@ -54,7 +55,7 @@ clients = {
}, },
'idle-inhibit': { 'idle-inhibit': {
'src': 'idle-inhibit.c', 'src': 'idle-inhibit.c',
'dep': wlroots, 'dep': [wayland_egl, wlroots],
'proto': [ 'proto': [
'idle-inhibit-unstable-v1', 'idle-inhibit-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -62,7 +63,7 @@ clients = {
}, },
'keyboard-shortcuts-inhibit': { 'keyboard-shortcuts-inhibit': {
'src': 'keyboard-shortcuts-inhibit.c', 'src': 'keyboard-shortcuts-inhibit.c',
'dep': [wayland_cursor, wlroots], 'dep': [wayland_egl, wayland_cursor, wlroots],
'proto': [ 'proto': [
'keyboard-shortcuts-inhibit-unstable-v1', 'keyboard-shortcuts-inhibit-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -70,7 +71,7 @@ clients = {
}, },
'layer-shell': { 'layer-shell': {
'src': 'layer-shell.c', 'src': 'layer-shell.c',
'dep': [wayland_cursor, wlroots], 'dep': [wayland_egl, wayland_cursor, wlroots],
'proto': [ 'proto': [
'wlr-layer-shell-unstable-v1', 'wlr-layer-shell-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -78,7 +79,7 @@ clients = {
}, },
'input-inhibitor': { 'input-inhibitor': {
'src': 'input-inhibitor.c', 'src': 'input-inhibitor.c',
'dep': [wayland_cursor, wlroots], 'dep': [wayland_egl, wayland_cursor, wlroots],
'proto': [ 'proto': [
'wlr-input-inhibitor-unstable-v1', 'wlr-input-inhibitor-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -96,7 +97,7 @@ clients = {
}, },
'pointer-constraints': { 'pointer-constraints': {
'src': 'pointer-constraints.c', 'src': 'pointer-constraints.c',
'dep': wlroots, 'dep': [wayland_egl, wlroots],
'proto': [ 'proto': [
'pointer-constraints-unstable-v1', 'pointer-constraints-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -104,7 +105,7 @@ clients = {
}, },
'relative-pointer': { 'relative-pointer': {
'src': 'relative-pointer-unstable-v1.c', 'src': 'relative-pointer-unstable-v1.c',
'dep': wlroots, 'dep': [wayland_egl, wlroots],
'proto': [ 'proto': [
'pointer-constraints-unstable-v1', 'pointer-constraints-unstable-v1',
'relative-pointer-unstable-v1', 'relative-pointer-unstable-v1',
@ -137,7 +138,7 @@ clients = {
}, },
'toplevel-decoration': { 'toplevel-decoration': {
'src': 'toplevel-decoration.c', 'src': 'toplevel-decoration.c',
'dep': wlroots, 'dep': [wayland_egl, wlroots],
'proto': [ 'proto': [
'xdg-decoration-unstable-v1', 'xdg-decoration-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -145,7 +146,7 @@ clients = {
}, },
'input-method': { 'input-method': {
'src': 'input-method.c', 'src': 'input-method.c',
'dep': libepoll, 'dep': [wayland_egl, libepoll],
'proto': [ 'proto': [
'input-method-unstable-v2', 'input-method-unstable-v2',
'text-input-unstable-v3', 'text-input-unstable-v3',
@ -154,7 +155,7 @@ clients = {
}, },
'text-input': { 'text-input': {
'src': 'text-input.c', 'src': 'text-input.c',
'dep': [wayland_cursor, wlroots], 'dep': [wayland_egl, wayland_cursor, wlroots],
'proto': [ 'proto': [
'text-input-unstable-v3', 'text-input-unstable-v3',
'xdg-shell', 'xdg-shell',

2
meson.build
View File

@ -97,7 +97,6 @@ endif
wayland_server = dependency('wayland-server', version: '>=1.18') wayland_server = dependency('wayland-server', version: '>=1.18')
wayland_client = dependency('wayland-client') wayland_client = dependency('wayland-client')
wayland_egl = dependency('wayland-egl')
wayland_protos = dependency('wayland-protocols', version: '>=1.17') wayland_protos = dependency('wayland-protocols', version: '>=1.17')
egl = dependency('egl') egl = dependency('egl')
glesv2 = dependency('glesv2') glesv2 = dependency('glesv2')
@ -114,7 +113,6 @@ wlr_files = []
wlr_deps = [ wlr_deps = [
wayland_server, wayland_server,
wayland_client, wayland_client,
wayland_egl,
wayland_protos, wayland_protos,
egl, egl,
glesv2, glesv2,