blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: 34e7f69d69 ("examples: remove dependency on wlr_egl from clients")
This commit is contained in:
Simon Ser 2021-02-08 13:47:47 +01:00
parent b60c5fa450
commit 4a9e70ccde
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/meson.build
View File

@ -2,6 +2,8 @@ threads = dependency('threads')
wayland_egl = dependency('wayland-egl') 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)
egl = dependency('egl', required: false, disabler: true)
glesv2 = dependency('glesv2', required: false, disabler: true)
# These versions correspond to ffmpeg 4.0 # These versions correspond to ffmpeg 4.0
libavutil = dependency('libavutil', version: '>=56.14.100', required: false, disabler: true) libavutil = dependency('libavutil', version: '>=56.14.100', required: false, disabler: true)
libavcodec = dependency('libavcodec', version: '>=58.18.100', required: false, disabler: true) libavcodec = dependency('libavcodec', version: '>=58.18.100', required: false, disabler: true)
@ -55,7 +57,7 @@ clients = {
}, },
'idle-inhibit': { 'idle-inhibit': {
'src': ['idle-inhibit.c', 'egl_common.c'], 'src': ['idle-inhibit.c', 'egl_common.c'],
'dep': [wayland_egl, wlroots], 'dep': [wayland_egl, egl, glesv2],
'proto': [ 'proto': [
'idle-inhibit-unstable-v1', 'idle-inhibit-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -63,7 +65,7 @@ clients = {
}, },
'keyboard-shortcuts-inhibit': { 'keyboard-shortcuts-inhibit': {
'src': ['keyboard-shortcuts-inhibit.c', 'egl_common.c'], 'src': ['keyboard-shortcuts-inhibit.c', 'egl_common.c'],
'dep': [wayland_egl, wayland_cursor, wlroots], 'dep': [wayland_egl, wayland_cursor, egl, glesv2],
'proto': [ 'proto': [
'keyboard-shortcuts-inhibit-unstable-v1', 'keyboard-shortcuts-inhibit-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -71,7 +73,7 @@ clients = {
}, },
'layer-shell': { 'layer-shell': {
'src': ['layer-shell.c', 'egl_common.c'], 'src': ['layer-shell.c', 'egl_common.c'],
'dep': [wayland_egl, wayland_cursor, wlroots], 'dep': [wayland_egl, wayland_cursor, wlroots, egl, glesv2],
'proto': [ 'proto': [
'wlr-layer-shell-unstable-v1', 'wlr-layer-shell-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -79,7 +81,7 @@ clients = {
}, },
'input-inhibitor': { 'input-inhibitor': {
'src': ['input-inhibitor.c', 'egl_common.c'], 'src': ['input-inhibitor.c', 'egl_common.c'],
'dep': [wayland_egl, wayland_cursor, wlroots], 'dep': [wayland_egl, wayland_cursor, egl, glesv2],
'proto': [ 'proto': [
'wlr-input-inhibitor-unstable-v1', 'wlr-input-inhibitor-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -97,7 +99,7 @@ clients = {
}, },
'pointer-constraints': { 'pointer-constraints': {
'src': ['pointer-constraints.c', 'egl_common.c'], 'src': ['pointer-constraints.c', 'egl_common.c'],
'dep': [wayland_egl, wlroots], 'dep': [wayland_egl, egl, glesv2],
'proto': [ 'proto': [
'pointer-constraints-unstable-v1', 'pointer-constraints-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -105,7 +107,7 @@ clients = {
}, },
'relative-pointer': { 'relative-pointer': {
'src': ['relative-pointer-unstable-v1.c', 'egl_common.c'], 'src': ['relative-pointer-unstable-v1.c', 'egl_common.c'],
'dep': [wayland_egl, wlroots], 'dep': [wayland_egl, egl, glesv2],
'proto': [ 'proto': [
'pointer-constraints-unstable-v1', 'pointer-constraints-unstable-v1',
'relative-pointer-unstable-v1', 'relative-pointer-unstable-v1',
@ -138,7 +140,7 @@ clients = {
}, },
'toplevel-decoration': { 'toplevel-decoration': {
'src': ['toplevel-decoration.c', 'egl_common.c'], 'src': ['toplevel-decoration.c', 'egl_common.c'],
'dep': [wayland_egl, wlroots], 'dep': [wayland_egl, egl, glesv2],
'proto': [ 'proto': [
'xdg-decoration-unstable-v1', 'xdg-decoration-unstable-v1',
'xdg-shell', 'xdg-shell',
@ -155,7 +157,7 @@ clients = {
}, },
'text-input': { 'text-input': {
'src': ['text-input.c', 'egl_common.c'], 'src': ['text-input.c', 'egl_common.c'],
'dep': [wayland_egl, wayland_cursor, wlroots], 'dep': [wayland_egl, wayland_cursor, egl, glesv2],
'proto': [ 'proto': [
'text-input-unstable-v3', 'text-input-unstable-v3',
'xdg-shell', 'xdg-shell',