Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wayland: Stable protocols can have a version 

Fixes: #12968
This commit is contained in:
Xavier Claessens 2024-03-13 08:12:54 -04:00 committed by Xavier Claessens
parent 4d3fb88753
commit 3afbe042af
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/markdown/snippets/wayland_stable_prot_version.md Normal file
View File

@ -0,0 +1,13 @@
## Wayland stable protocols can be versioned
The wayland module now accepts a version number for stable protocols.
```meson
wl_mod = import('unstable-wayland')
wl_mod.find_protocol(
'linux-dmabuf',
state: 'stable'
version: 1
)
```

16
mesonbuild/modules/wayland.py
View File

@ -8,7 +8,7 @@ import typing as T
from . import ExtensionModule, ModuleReturnValue, ModuleInfo from . import ExtensionModule, ModuleReturnValue, ModuleInfo
from ..build import CustomTarget from ..build import CustomTarget
from ..interpreter.type_checking import NoneType, in_set_validator from ..interpreter.type_checking import NoneType, in_set_validator
from ..interpreterbase import typed_pos_args, typed_kwargs, KwargInfo from ..interpreterbase import typed_pos_args, typed_kwargs, KwargInfo, FeatureNew
from ..mesonlib import File, MesonException from ..mesonlib import File, MesonException
if T.TYPE_CHECKING: if T.TYPE_CHECKING:
@ -122,7 +122,7 @@ class WaylandModule(ExtensionModule):
raise MesonException(f'{xml_state} protocols require a version number.') raise MesonException(f'{xml_state} protocols require a version number.')
if xml_state == 'stable' and version is not None: if xml_state == 'stable' and version is not None:
raise MesonException('stable protocols do not require a version number.') FeatureNew.single_use('Version number in stable wayland protocol', '1.5.0', state.subproject, location=state.current_node)
if self.protocols_dep is None: if self.protocols_dep is None:
self.protocols_dep = state.dependency('wayland-protocols') self.protocols_dep = state.dependency('wayland-protocols')
@ -130,12 +130,12 @@ class WaylandModule(ExtensionModule):
if self.pkgdatadir is None: if self.pkgdatadir is None:
self.pkgdatadir = self.protocols_dep.get_variable(pkgconfig='pkgdatadir', internal='pkgdatadir') self.pkgdatadir = self.protocols_dep.get_variable(pkgconfig='pkgdatadir', internal='pkgdatadir')
if xml_state == 'stable': xml_name = base_name
xml_name = f'{base_name}.xml' if xml_state == 'unstable':
elif xml_state == 'staging': xml_name += '-unstable'
xml_name = f'{base_name}-v{version}.xml' if version is not None:
else: xml_name += f'-v{version}'
xml_name = f'{base_name}-unstable-v{version}.xml' xml_name += '.xml'
path = os.path.join(self.pkgdatadir, xml_state, base_name, xml_name) path = os.path.join(self.pkgdatadir, xml_state, base_name, xml_name)