diff --git a/hw/xfree86/drivers/video/ark/meson.build b/hw/xfree86/drivers/video/ark/meson.build new file mode 100644 index 000000000..1bed6d62b --- /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/ark/src/ark.h b/hw/xfree86/drivers/video/ark/src/ark.h index 9797ead87..ce0d755c7 100644 --- a/hw/xfree86/drivers/video/ark/src/ark.h +++ b/hw/xfree86/drivers/video/ark/src/ark.h @@ -9,6 +9,12 @@ #include "xf86Pci.h" #include "vgaHW.h" +typedef void *pointer; + +#define PACKAGE_VERSION_MINOR 0 +#define PACKAGE_VERSION_MAJOR 7 +#define PACKAGE_VERSION_PATCHLEVEL 6 + #define PCI_VENDOR_ARK 0xEDD8 #define PCI_CHIP_1000PV 0xA091 #define PCI_CHIP_2000PV 0xA099 diff --git a/hw/xfree86/drivers/video/ark/src/ark_driver.c b/hw/xfree86/drivers/video/ark/src/ark_driver.c index 95fc8f596..12a1ce6a2 100644 --- a/hw/xfree86/drivers/video/ark/src/ark_driver.c +++ b/hw/xfree86/drivers/video/ark/src/ark_driver.c @@ -26,10 +26,7 @@ * Harm Hanemaayer * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "xf86.h" #include "xf86_OSproc.h" @@ -110,8 +107,6 @@ static const OptionInfoRec ARKOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -#ifdef XFree86LOADER - MODULESETUPPROTO(ARKSetup); static XF86ModuleVersionInfo ARKVersRec = { @@ -144,9 +139,6 @@ pointer ARKSetup(pointer module, pointer opts, int *errmaj, int *errmin) } } -#endif /* XFree86LOADER */ - - static Bool ARKGetRec(ScrnInfoPtr pScrn) { if (pScrn->driverPrivate) @@ -170,8 +162,7 @@ static const OptionInfoRec * ARKAvailableOptions(int chipid, int busid) static void ARKIdentify(int flags) { - xf86PrintChipsets("ARK", "driver (version " DRIVER_VERSION " for ARK Logic chipset", - ARKChipsets); + xf86PrintChipsets("ARK", "driver for ARK Logic chipset", ARKChipsets); } static Bool ARKProbe(DriverPtr drv, int flags) diff --git a/hw/xfree86/drivers/video/meson.build b/hw/xfree86/drivers/video/meson.build index 25f1a622b..590369839 100644 --- a/hw/xfree86/drivers/video/meson.build +++ b/hw/xfree86/drivers/video/meson.build @@ -5,3 +5,7 @@ endif if get_option('xf86-video-apm') subdir('apm') endif + +if get_option('xf86-video-ark') + subdir('ark') +endif diff --git a/meson_options.txt b/meson_options.txt index 40b751ce8..01e97df48 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')