Skip to content

Commit

Permalink
meson: make Xext a mandatory dep
Browse files Browse the repository at this point in the history
As XSHM is mandatory we can no longer build without
Xext, so tidy up the build code.

Signed-off-by: Matt Jolly <kangie@gentoo.org>
  • Loading branch information
Kangie committed Oct 28, 2024
1 parent 62a64fa commit 4068e39
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
10 changes: 4 additions & 6 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ foreach rd : all_req_deps
all_found_deps += this_dep
endforeach

xext = dependency('xext', required: true)
all_found_deps += xext
conf.set10('SHAPE', 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 @@ -335,12 +339,6 @@ if xcursor.found()
conf.set10('HAVE_XCURSOR', true)
endif

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

xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'))
if xkbcommon.found()
all_found_deps += xkbcommon
Expand Down
6 changes: 0 additions & 6 deletions meson.options
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@ option(
value: 'auto',
description: 'Enable Xcursor support',
)
option(
'xext',
type: 'feature',
value: 'auto',
description: 'Enable shaped window support via Xext',
)
option(
'xkbcommon',
type: 'feature',
Expand Down

0 comments on commit 4068e39

Please sign in to comment.