diff --git a/libweston/backend-drm/modes.c b/libweston/backend-drm/modes.c index ec5a4f566..18bb63dc1 100644 --- a/libweston/backend-drm/modes.c +++ b/libweston/backend-drm/modes.c @@ -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, diff --git a/meson.build b/meson.build index be0de0553..884ef48ef 100644 --- a/meson.build +++ b/meson.build @@ -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')