diff options
author | 2018-05-20 09:37:49 -0400 | |
---|---|---|
committer | 2018-05-20 09:37:49 -0400 | |
commit | aacde78dafb52f2c33ced64cb7b9bf17d1d8bcbe (patch) | |
tree | 561bce67d6264278683ec481ba9c9979d0754735 /protocols/meson.build | |
parent | Pre-multiply alpha for non-textures (diff) | |
parent | Merge pull request #1821 from RyanDwyer/swaylock-multiple-images (diff) | |
download | sway-aacde78dafb52f2c33ced64cb7b9bf17d1d8bcbe.tar.gz sway-aacde78dafb52f2c33ced64cb7b9bf17d1d8bcbe.tar.zst sway-aacde78dafb52f2c33ced64cb7b9bf17d1d8bcbe.zip |
Merge branch 'master' into premultiply-alpha
Diffstat (limited to 'protocols/meson.build')
-rw-r--r-- | protocols/meson.build | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/protocols/meson.build b/protocols/meson.build index 9966c02f..a031245c 100644 --- a/protocols/meson.build +++ b/protocols/meson.build | |||
@@ -29,16 +29,18 @@ wayland_scanner_server = generator( | |||
29 | 29 | ||
30 | client_protocols = [ | 30 | client_protocols = [ |
31 | [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], | 31 | [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], |
32 | [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'], | ||
32 | ['wlr-layer-shell-unstable-v1.xml'], | 33 | ['wlr-layer-shell-unstable-v1.xml'], |
33 | ['idle.xml'], | 34 | ['idle.xml'], |
34 | ['wlr-input-inhibitor-unstable-v1.xml'] | 35 | ['wlr-input-inhibitor-unstable-v1.xml'], |
35 | ] | 36 | ] |
36 | 37 | ||
37 | server_protocols = [ | 38 | server_protocols = [ |
38 | [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], | 39 | [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], |
39 | [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], | 40 | [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], |
41 | [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'], | ||
40 | ['wlr-layer-shell-unstable-v1.xml'], | 42 | ['wlr-layer-shell-unstable-v1.xml'], |
41 | ['wlr-input-inhibitor-unstable-v1.xml'] | 43 | ['wlr-input-inhibitor-unstable-v1.xml'], |
42 | ] | 44 | ] |
43 | 45 | ||
44 | client_protos_src = [] | 46 | client_protos_src = [] |