From 7cf1fd6aaab8cbbf489d4a815ebfaae849364dbe Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 16 Dec 2025 20:24:24 +0100 Subject: [PATCH] xfree86: video: vesa: add meson.build for the driver Adding the VESA driver to our build system. It's enabled by default, but can be disabled at build time by setting -Dxf86-video-vesa=false. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/drivers/video/meson.build | 4 +++ hw/xfree86/drivers/video/vesa/meson.build | 37 +++++++++++++++++++++++ meson_options.txt | 6 ++++ 3 files changed, 47 insertions(+) create mode 100644 hw/xfree86/drivers/video/vesa/meson.build diff --git a/hw/xfree86/drivers/video/meson.build b/hw/xfree86/drivers/video/meson.build index 08ce60b6c0..cc9a4f7c6e 100644 --- a/hw/xfree86/drivers/video/meson.build +++ b/hw/xfree86/drivers/video/meson.build @@ -1,3 +1,7 @@ if build_modesetting subdir('modesetting') endif + +if get_option('xf86-video-vesa') + subdir('vesa') +endif diff --git a/hw/xfree86/drivers/video/vesa/meson.build b/hw/xfree86/drivers/video/vesa/meson.build new file mode 100644 index 0000000000..9d81f8b87b --- /dev/null +++ b/hw/xfree86/drivers/video/vesa/meson.build @@ -0,0 +1,37 @@ +modesetting_srcs = [ + 'src/vesa.c', +] + +shared_module( + 'vesa_drv', + modesetting_srcs, + name_prefix: '', + + include_directories: [inc, xorg_inc, 'src'], + c_args: xorg_c_args, + dependencies: [ + common_dep, + ], + + install: true, + install_dir: join_paths(module_abi_dir, 'video'), +) + +install_man(configure_file( + input: 'man/vesa.man', + output: 'vesa.4', + configuration: manpage_config, +)) + +# Test that we don't have any unresolved symbols from our module to XLibre. +xorg_build_root = join_paths(meson.project_build_root(), 'hw', 'xfree86') +symbol_test_args = [] +symbol_test_args += join_paths(xorg_build_root, 'libxorgserver.so') +symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libshadow.so') +symbol_test_args += join_paths(xorg_build_root, 'int10', 'libint10.so') +symbol_test_args += join_paths(xorg_build_root, 'drivers', 'video', 'vesa', 'vesa_drv.so') + +test('vesa driver symbol test', + xorg_symbol_test, + args: symbol_test_args, +) diff --git a/meson_options.txt b/meson_options.txt index 36511fc80e..efba411cf9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -169,3 +169,9 @@ option('test_rendercheck_triangles', type: 'boolean', value: false, description: 'testsuite: run rendercheck triangles tests (might fail on Xephyr)') option('test_xephyr_gles', type: 'boolean', value: true, description: 'testsuite: run gles2/gles3 tests on Xephyr (might fail w/o DRI)') + +# xfree86 drivers +option('xf86-input-inputtest', type: 'boolean', value: true, + description: 'Test input driver support on Xorg') +option('xf86-video-vesa', type: 'boolean', value: true, + description: 'VESA driver for xfree86 DDX')