hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-28 02:21:08 +00:00
Code Issues Projects Releases Wiki Activity

Generalize glamor dependencies

Browse source 
These are not tightly coupled to Glamor and are of use to any component
that wants to deal with DMA-BUF buffers. Let's expose them in a more
global way.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2301>
This commit is contained in:
Pierre Ossman 2026-08-31 09:20:27 +02:00 • committed by Alan Coopersmith
commit 5b22bb635b
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/meson.build
View file

@ -99,6 +99,8 @@ conf_data.set('CONFIG_WSCONS', host_machine.system() in ['openbsd', 'netbsd'] ?
conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found() ? '1' : false)
conf_data.set('WITH_LIBDRM', libdrm_required ? '1' : false)
conf_data.set('HAVE_GBM', gbm_dep.found() ? '1' : false)
conf_data.set('HAVE_EPOXY', epoxy_dep.found() ? '1' : false)
conf_data.set('GLAMOR_HAS_EGL_QUERY_DMABUF',
epoxy_dep.found() and epoxy_dep.version().version_compare('>= 1.4.4') ? '1' : false)
conf_data.set('GLAMOR_HAS_EGL_QUERY_DRIVER',

10
meson.build
View file

@ -109,6 +109,9 @@ xkbcomp_dep = dependency('xkbcomp', required: false)
xkbfile_dep = dependency('xkbfile')
xfont2_dep = dependency('xfont2', version: '>= 2.0')
gbm_dep = dependency('gbm', version: gbm_req, required: false)
epoxy_dep = dependency('epoxy', required: false)
dbus_required = get_option('systemd_logind') == 'true'
dbus_dep = dependency('dbus-1', version: '>= 1.0', required: dbus_required)
@ -368,13 +371,6 @@ else
build_glamor = glamor_option == 'true'
endif
gbm_dep = dependency('', required: false)
epoxy_dep = dependency('', required: false)
if build_glamor
gbm_dep = dependency('gbm', version: gbm_req, required: false)
epoxy_dep = dependency('epoxy', required: false)
endif
if build_xwayland
libdecor_dep = dependency('libdecor-0', required: false)
libdecor_option = get_option('libdecor')