From bfb842de7e6945379aa98a307816aef9357cbbc7 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 21 Jul 2025 12:23:25 +0200 Subject: [PATCH] xfree86: drivers: ark: add the driver to the build Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/drivers/video/ark/meson.build | 31 ++++++++++++++++++++++++ hw/xfree86/drivers/video/meson.build | 4 +++ meson_options.txt | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 hw/xfree86/drivers/video/ark/meson.build diff --git a/hw/xfree86/drivers/video/ark/meson.build b/hw/xfree86/drivers/video/ark/meson.build new file mode 100644 index 0000000000..1bed6d62bd --- /dev/null +++ b/hw/xfree86/drivers/video/ark/meson.build @@ -0,0 +1,31 @@ +driver_video_ark_srcs = [ + 'src/ark_driver.c', +] + +shared_module( + 'ark_drv', + driver_video_ark_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-ark', 'ark_drv.so') + +test('video-ark 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 4e25ffd90f..1ec514cae0 100644 --- a/hw/xfree86/drivers/video/meson.build +++ b/hw/xfree86/drivers/video/meson.build @@ -1,3 +1,7 @@ +if get_option('xf86-video-ark') + subdir('ark') +endif + if get_option('xf86-video-apm') subdir('apm') endif diff --git a/meson_options.txt b/meson_options.txt index 40b751ce8a..01e97df48b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -125,6 +125,8 @@ option('xf86-input-inputtest', type: 'boolean', value: true, description: 'Test input driver support on Xorg') 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('tests', type: 'boolean', value: true, description: 'Build tests for the X server on platforms that support it')