Commit 4510d26d authored by Dylan Baker's avatar Dylan Baker
Browse files

meson: allow wayland-protocols to be used as wrap

We need to get the "internal" variable if we've built wayland-protocols
as a subproject. Wayland-protocols already has al of the infrastructure
in place for this, we just need to make use of it.

This requires a bump to Meson 0.54, which we had discussed in the past
but had no reason to move to.

I have installed the .wrap file and checked it in. Due to upstream API
changes in the wrapdb meson >= 0.59.0 is required to run `meson wrap
install wayland-protocols`, which defeats much the value of being used
as a wrap.
parent 6d3b5b81
Pipeline #478489 waiting for manual action with stages
......@@ -26,7 +26,7 @@ project(
check : true
).stdout(),
license : 'MIT',
meson_version : '>= 0.53',
meson_version : '>= 0.54',
default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c11', 'cpp_std=c++14']
)
......@@ -1972,7 +1972,7 @@ if with_platform_wayland
dep_wayland_egl_headers = dep_wayland_egl.partial_dependency(compile_args : true)
endif
wayland_dmabuf_xml = join_paths(
dep_wl_protocols.get_variable(pkgconfig : 'pkgdatadir'), 'unstable',
dep_wl_protocols.get_variable(pkgconfig : 'pkgdatadir', internal : 'pkgdatadir'), 'unstable',
'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
)
pre_args += '-DWL_HIDE_DEPRECATED'
......
[wrap-file]
directory = wayland-protocols-1.24
source_url = https://wayland.freedesktop.org/releases/wayland-protocols-1.24.tar.xz
source_filename = wayland-protocols-1.24.tar.xz
source_hash = bff0d8cffeeceb35159d6f4aa6bab18c807b80642c9d50f66cba52ecf7338bc2
[provide]
wayland-protocols = wayland_protocols
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment