XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Update meson.builds for the changes in the modesetting driver

Browse Source 
Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111
2026-02-06 22:57:05 +02:00
committed by Enrico Weigelt
parent 0ac903f4b9
commit 0a2568ab3a
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/drivers/video/modesetting/meson.build
View File

@@ -34,7 +34,7 @@ symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libshadow.so')
if build_glx if build_glx
symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libglx.so') symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libglx.so')
endif endif
if gbm_dep.found() if build_glamor
symbol_test_args += join_paths(xorg_build_root, 'glamor_egl', 'libglamoregl.so') symbol_test_args += join_paths(xorg_build_root, 'glamor_egl', 'libglamoregl.so')
endif endif
symbol_test_args += join_paths(xorg_build_root, 'drivers', 'video', 'modesetting', 'modesetting_drv.so') symbol_test_args += join_paths(xorg_build_root, 'drivers', 'video', 'modesetting', 'modesetting_drv.so')

2
hw/xfree86/meson.build
View File

@@ -118,7 +118,7 @@ xserver_exec = executable(
subdir('dixmods') subdir('dixmods')
subdir('exa') subdir('exa')
subdir('fbdevhw') subdir('fbdevhw')
if gbm_dep.found() if build_glamor and gbm_dep.found()
subdir('glamor_egl') subdir('glamor_egl')
endif endif
if int10 != 'false' if int10 != 'false'

5
meson.build
View File

@@ -365,10 +365,9 @@ else
build_glamor = glamor_option == 'true' build_glamor = glamor_option == 'true'
endif endif
gbm_dep = dependency('', required: false) gbm_dep = dependency('gbm', version: gbm_req, required: false)
epoxy_dep = dependency('', required: false) epoxy_dep = dependency('', required: false)
if build_glamor if build_glamor
gbm_dep = dependency('gbm', version: gbm_req, required: false)
epoxy_dep = dependency('epoxy', required: false) epoxy_dep = dependency('epoxy', required: false)
endif endif
@@ -532,7 +531,7 @@ if not libdrm_dep.found() and libdrm_required
error('DRI requested, but LIBDRM not found') error('DRI requested, but LIBDRM not found')
endif endif
build_modesetting = libdrm_dep.found() and dri2proto_dep.found() build_modesetting = libdrm_dep.found() and dri2proto_dep.found() and gbm_dep.found()
build_vgahw = false build_vgahw = false
if get_option('vgahw') == 'auto' if get_option('vgahw') == 'auto'