+
Skip to content

Make xkbcommon required in meson. #1099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2024
Merged

Make xkbcommon required in meson. #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dev-docs/INSTALL.md
View file
Open in desktop
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
14 changes: 6 additions & 8 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,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 +360,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 +571,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
View file
Open in desktop
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
Loading
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载