Skip to content

Commit

Permalink
Make xkbcommon required in meson.
Browse files Browse the repository at this point in the history
Make xkbcommon a required dependency in meson. Move xext output into
the dependencies block (missed when it was made required). Update
INSTALL.md with this change and include some missing dependencies.
  • Loading branch information
somiaj committed Nov 2, 2024
1 parent 1f02250 commit 86a5ab9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
3 changes: 3 additions & 0 deletions dev-docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ system in use.
* libx11-dev
* libxext-dev
* libxft-dev
* libxkbcommon-dev
* libxrandr-dev (>= 1.5)
* libxrender-dev
* libxt-dev
Expand All @@ -37,13 +38,15 @@ system in use.
## Optional dependencies

* asciidoctor
* golang
* libfribidi-dev
* libncurses5-dev
* libpng-dev
* libreadline-dev
* librsvg-dev
* libsm-dev
* libxcursor-dev
* libxfixes-dev
* libxi-dev
* libxpm-dev
* sharutils
Expand Down
15 changes: 7 additions & 8 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ endif
all_found_deps = []

# Required dependencies, we can easily iterate over these.

summary_depvals = {}
all_req_deps = ['fontconfig', 'ice', 'libevent', 'x11', 'xft', 'xrandr', 'xt']
foreach rd : all_req_deps
Expand All @@ -199,8 +200,14 @@ endforeach

xext = dependency('xext', required: true)
all_found_deps += xext
summary_depvals += {'xext': xext}
conf.set10('SHAPE', true)

xkbcommon = dependency('xkbcommon', required: true)
all_found_deps += xkbcommon
summary_depvals += {'xkbcommon': xkbcommon}
conf.set10('HAVE_X11_XKBLIB_H', true)

# Python is a required dependency, we generate shebangs at buildtime
# This will error by default if there is no python interpreter found
py_mod = import('python')
Expand Down Expand Up @@ -354,12 +361,6 @@ if xfixes.found()
conf.set10('HAVE_XFIXES', true)
endif

xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'))
if xkbcommon.found()
all_found_deps += xkbcommon
conf.set10('HAVE_X11_XKBLIB_H', true)
endif

xpm = dependency('xpm', required: get_option('xpm'))
if xpm.found()
all_found_deps += xpm
Expand Down Expand Up @@ -571,11 +572,9 @@ featurevals = {
'NLS': libintl.found(),
'PNG support': libpng.found() ? libpng : false,
'Session Management': sm.found() ? sm : false,
'Shaped Windows': xext.found() ? xext : false,
'SVG support': librsvg.found() ? librsvg : false,
'Xcursor': xcursor.found() ? xcursor : false,
'XFixes': xfixes.found() ? xfixes : false,
'xkbcommon': xkbcommon.found() ? xkbcommon : false,
'XPM support': xpm.found() ? xpm : false,
'XRender': xrender.found() ? xrender : false,
}
Expand Down
6 changes: 0 additions & 6 deletions meson.options
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,6 @@ option(
value: 'auto',
description: 'Enable XFixes support',
)
option(
'xkbcommon',
type: 'feature',
value: 'auto',
description: 'Enable xkbcommon support',
)
option(
'xrender',
type: 'feature',
Expand Down

0 comments on commit 86a5ab9

Please sign in to comment.