mirror of
https://gitlab.freedesktop.org/wayland/weston.git
synced 2025-12-25 02:30:11 +01:00
build: make libdisplay-info mandatory
Frontend will be needing it, too, so move it up. In doing so, we make it a mandatory dependency of Weston. This should be fine, because it was required by DRM-backend which is the foremost. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
parent
c706e1f8c8
commit
76e659f45e
2 changed files with 13 additions and 14 deletions
|
|
@ -2,20 +2,6 @@ if not get_option('backend-drm')
|
||||||
subdir_done()
|
subdir_done()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
dep_libdisplay_info = dependency(
|
|
||||||
'libdisplay-info',
|
|
||||||
version: ['>= 0.1.1', '< 0.3.0'],
|
|
||||||
fallback: ['display-info', 'di_dep'],
|
|
||||||
default_options: [
|
|
||||||
'werror=false',
|
|
||||||
],
|
|
||||||
required: true,
|
|
||||||
not_found_message: 'Required by DRM-backend.',
|
|
||||||
)
|
|
||||||
if dep_libdisplay_info.version().version_compare('>= 0.2.0')
|
|
||||||
config_h.set('HAVE_LIBDISPLAY_INFO_HIGH_LEVEL_COLORIMETRY', '1')
|
|
||||||
endif
|
|
||||||
|
|
||||||
lib_backlight = static_library(
|
lib_backlight = static_library(
|
||||||
'backlight',
|
'backlight',
|
||||||
'libbacklight.c',
|
'libbacklight.c',
|
||||||
|
|
|
||||||
13
meson.build
13
meson.build
|
|
@ -172,6 +172,19 @@ if dep_lcms2.found()
|
||||||
config_h.set('HAVE_LCMS', '1')
|
config_h.set('HAVE_LCMS', '1')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
dep_libdisplay_info = dependency(
|
||||||
|
'libdisplay-info',
|
||||||
|
version: ['>= 0.1.1', '< 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')
|
prog_python = import('python').find_installation('python3')
|
||||||
files_xxd_py = files('tools/xxd.py')
|
files_xxd_py = files('tools/xxd.py')
|
||||||
cmd_xxd = [ prog_python, files_xxd_py, '@INPUT@', '@OUTPUT@' ]
|
cmd_xxd = [ prog_python, files_xxd_py, '@INPUT@', '@OUTPUT@' ]
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue