From 393910427256c366abf00d549662439e8edae2c8 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 21 Jul 2025 16:10:54 +0200 Subject: [PATCH] xfree86: drivers: ast: add the driver to the build Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/drivers/video/ast/meson.build | 37 ++++++++++++++++++++++++ hw/xfree86/drivers/video/meson.build | 4 +++ meson_options.txt | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 hw/xfree86/drivers/video/ast/meson.build diff --git a/hw/xfree86/drivers/video/ast/meson.build b/hw/xfree86/drivers/video/ast/meson.build new file mode 100644 index 0000000000..c10c8bc114 --- /dev/null +++ b/hw/xfree86/drivers/video/ast/meson.build @@ -0,0 +1,37 @@ +driver_video_ast_srcs = [ + 'src/ast_2dtool.c', + 'src/ast_accel.c', + 'src/ast_cursor.c', + 'src/ast_driver.c', + 'src/ast_mode.c', + 'src/ast_tool.c', + 'src/ast_vgatool.c' +] + +shared_module( + 'ast_drv', + driver_video_ast_srcs, + name_prefix: '', + + include_directories: [inc, xorg_inc], + c_args: xorg_c_args, + dependencies: [ + common_dep, + ], + + install: true, + install_dir: join_paths(module_abi_dir, 'drivers'), +) + +# Test that we don't have any unresolved symbols from our module to Xorg. +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, 'dixmods', 'libglx.so') +symbol_test_args += join_paths(xorg_build_root, 'drivers', 'video-ast', 'ast_drv.so') + +test('video-ast symbol test', + xorg_symbol_test, + args: symbol_test_args, +) diff --git a/hw/xfree86/drivers/video/meson.build b/hw/xfree86/drivers/video/meson.build index 1ec514cae0..d307e55f34 100644 --- a/hw/xfree86/drivers/video/meson.build +++ b/hw/xfree86/drivers/video/meson.build @@ -9,3 +9,7 @@ endif if build_modesetting subdir('modesetting') endif + +if get_option('xf86-video-ast') + subdir('ast') +endif diff --git a/meson_options.txt b/meson_options.txt index 01e97df48b..fc0640a33c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -127,6 +127,8 @@ option('xf86-video-apm', type: 'boolean', value: true, description: 'xf86 video driver for APM graphics chips') option('xf86-video-ark', type: 'boolean', value: true, description: 'xf86 video driver for ARK graphics chips') +option('xf86-video-ast', type: 'boolean', value: true, + description: 'xf86 video driver for AST graphics chips') option('tests', type: 'boolean', value: true, description: 'Build tests for the X server on platforms that support it')