fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 04:40:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: require libdisplay-info >= 0.2.0

Browse source 
We get rid of a little bit of fallback code, but the real reason is that
in the future the frontend will start using libdisplay-info as well, and
this lets us avoid adding fallback code there too.

Signed-off-by: Robert Mader <robert.mader@collabora.com>
This commit is contained in:
Robert Mader 2025-01-20 16:17:18 +01:00 • committed by Robert Mader
parent 9f21128d78
commit 82c5b386d8
2 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libweston/backend-drm/modes.c
View file

@ -227,8 +227,6 @@ parse_modeline(const char *s, drmModeModeInfo *mode)
return 0;
}
#ifdef HAVE_LIBDISPLAY_INFO_HIGH_LEVEL_COLORIMETRY
static uint32_t
get_eotf_mask(const struct di_info *info)
{
@ -284,22 +282,6 @@ get_colorimetry_mask(const struct di_info *info)
return mask;
}
#else /* HAVE_LIBDISPLAY_INFO_HIGH_LEVEL_COLORIMETRY */
static uint32_t
get_eotf_mask(const struct di_info *info)
{
return WESTON_EOTF_MODE_SDR;
}
static uint32_t
get_colorimetry_mask(const struct di_info *info)
{
return WESTON_COLORIMETRY_MODE_DEFAULT;
}
#endif /* HAVE_LIBDISPLAY_INFO_HIGH_LEVEL_COLORIMETRY */
static struct di_info *
drm_head_info_from_edid(struct drm_head_info *dhi,
const uint8_t *data,

5
meson.build
View file

@ -174,16 +174,13 @@ endif
dep_libdisplay_info = dependency(
'libdisplay-info',
version: ['>= 0.1.1', '< 0.3.0'],
version: ['>= 0.2.0', '< 0.3.0'],
fallback: ['display-info', 'di_dep'],
default_options: [
'werror=false',
],
required: true,
)
if dep_libdisplay_info.version().version_compare('>= 0.2.0')
config_h.set('HAVE_LIBDISPLAY_INFO_HIGH_LEVEL_COLORIMETRY', '1')
endif
prog_python = import('python').find_installation('python3')
files_xxd_py = files('tools/xxd.py')