mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-04 04:06:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: allow building with wayland-protocols as a subproject

Browse source
This commit is contained in:
Daniel Eklöf 2023-08-08 19:32:45 +02:00
parent 1faad5add7
commit 34520aa16e
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -48,6 +48,10 @@
## Unreleased ## Unreleased
### Added ### Added
* Support for building with _wayland-protocols_ as a subproject.
### Changed ### Changed
* Minimum required version of _wayland-protocols_ is now 1.32 * Minimum required version of _wayland-protocols_ is now 1.32

26
meson.build
View file

@ -123,7 +123,9 @@ math = cc.find_library('m')
threads = [dependency('threads'), cc.find_library('stdthreads', required: false)] threads = [dependency('threads'), cc.find_library('stdthreads', required: false)]
libepoll = dependency('epoll-shim', required: false) libepoll = dependency('epoll-shim', required: false)
pixman = dependency('pixman-1') pixman = dependency('pixman-1')
wayland_protocols = dependency('wayland-protocols', version: '>=1.32') wayland_protocols = dependency('wayland-protocols', version: '>=1.32',
fallback: 'wayland-protocols',
default_options: ['tests=false'])
wayland_client = dependency('wayland-client') wayland_client = dependency('wayland-client')
wayland_cursor = dependency('wayland-cursor') wayland_cursor = dependency('wayland-cursor')
xkb = dependency('xkbcommon', version: '>=1.0.0') xkb = dependency('xkbcommon', version: '>=1.0.0')
@ -146,17 +148,17 @@ wscanner_prog = find_program(
wl_proto_headers = [] wl_proto_headers = []
wl_proto_src = [] wl_proto_src = []
wl_proto_xml = [ wl_proto_xml = [
wayland_protocols_datadir + '/stable/xdg-shell/xdg-shell.xml', wayland_protocols_datadir / 'stable/xdg-shell/xdg-shell.xml',
wayland_protocols_datadir + '/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml', wayland_protocols_datadir / 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml',
wayland_protocols_datadir + '/unstable/xdg-output/xdg-output-unstable-v1.xml', wayland_protocols_datadir / 'unstable/xdg-output/xdg-output-unstable-v1.xml',
wayland_protocols_datadir + '/unstable/primary-selection/primary-selection-unstable-v1.xml', wayland_protocols_datadir / 'unstable/primary-selection/primary-selection-unstable-v1.xml',
wayland_protocols_datadir + '/stable/presentation-time/presentation-time.xml', wayland_protocols_datadir / 'stable/presentation-time/presentation-time.xml',
wayland_protocols_datadir + '/unstable/text-input/text-input-unstable-v3.xml', wayland_protocols_datadir / 'unstable/text-input/text-input-unstable-v3.xml',
wayland_protocols_datadir + '/staging/xdg-activation/xdg-activation-v1.xml', wayland_protocols_datadir / 'staging/xdg-activation/xdg-activation-v1.xml',
wayland_protocols_datadir + '/stable/viewporter/viewporter.xml', wayland_protocols_datadir / 'stable/viewporter/viewporter.xml',
wayland_protocols_datadir + '/staging/fractional-scale/fractional-scale-v1.xml', wayland_protocols_datadir / 'staging/fractional-scale/fractional-scale-v1.xml',
wayland_protocols_datadir + '/unstable/tablet/tablet-unstable-v2.xml', # required by cursor-shape-v1 wayland_protocols_datadir / 'unstable/tablet/tablet-unstable-v2.xml', # required by cursor-shape-v1
wayland_protocols_datadir + '/staging/cursor-shape/cursor-shape-v1.xml', wayland_protocols_datadir / 'staging/cursor-shape/cursor-shape-v1.xml',
] ]
foreach prot : wl_proto_xml foreach prot : wl_proto_xml

3
subprojects/wayland-protocols.wrap Normal file
View file

@ -0,0 +1,3 @@
[wrap-git]
url = https://gitlab.freedesktop.org/wayland/wayland-protocols.git
revision = main