xfree86: drivers: cirrus: add the driver to the build

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

hw/xfree86/drivers/video/cirrus/man/cirrus.man

@@ -1,8 +1,8 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH CIRRUS __drivermansuffix__ 2009-05-07 __vendorversion__
+.TH CIRRUS @drivermansuffix@ 2009-05-07 @vendorversion@
 .SH NAME
-cirrus \- Cirrus Logic video driver for Xorg
+cirrus \- Cirrus Logic video driver for Xlibre
 .SH SYNOPSIS
 .nf
 .B "Section \*qDevice\*q"
@@ -13,7 +13,7 @@ cirrus \- Cirrus Logic video driver for Xorg
 .fi
 .SH DESCRIPTION
 .B cirrus
-is an Xorg driver for Cirrus Logic video chips.
+is an Xlibre driver for Cirrus Logic video chips.
 THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 The
@@ -21,14 +21,14 @@ The
 driver supports...
 .SH CONFIGURATION DETAILS
 Please refer to
-.BR xorg.conf (__filemansuffix__)
+.BR xorg.conf (@filemansuffix@)
 for general configuration details.
 This section only covers configuration details specific to this driver.
 .SH "SEE ALSO"
 .BR Xorg (1),
-.BR xorg.conf (__filemansuffix__),
+.BR xorg.conf (@filemansuffix@),
 .BR Xserver (1),
-.BR X (__miscmansuffix__)
+.BR X (@miscmansuffix@)
 .SH AUTHORS
 Authors include: Corin Anderson, Egbert Eich, Derek Fawcus, Koen Gadeyne,
 Harm Hanemaayer, David Monniaux, Itai Nahshon

hw/xfree86/drivers/video/cirrus/meson.build

@@ -0,0 +1,46 @@
+driver_video_cirrus_srcs = [
+    'src/alp_driver.c',
+    'src/alp_hwcurs.c',
+    'src/alp_i2c.c',
+    'src/cir_dga.c',
+    'src/cir_driver.c',
+    'src/CirrusClk.c',
+    'src/cir_shadow.c',
+    'src/lg_driver.c',
+    'src/lg_hwcurs.c',
+    'src/lg_i2c.c',
+]
+
+shared_module(
+    'cirrus_drv',
+    driver_video_cirrus_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-cirrus', 'cirrus_drv.so')
+
+test('video-cirrus symbol test',
+    xorg_symbol_test,
+    args: symbol_test_args,
+)
+
+install_man(configure_file(
+    input: 'man/cirrus.man',
+    output: 'cirrus.4',
+    configuration: manpage_config,
+))

hw/xfree86/drivers/video/cirrus/src/CirrusClk.c

@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <dix-config.h>
 
 /*
  * Programming of the built-in Cirrus clock generator.

hw/xfree86/drivers/video/cirrus/src/alp_driver.c

@@ -10,10 +10,7 @@
  *    David Dawes, Andrew E. Mileski, Leonard N. Zubkoff,
  *    Guy DESBIEF
  */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <dix-config.h>
 
 /* All drivers should typically include these */
 #include "xf86.h"

hw/xfree86/drivers/video/cirrus/src/alp_hwcurs.c

@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <dix-config.h>
 
 /* (c) Itai Nahshon */
 

hw/xfree86/drivers/video/cirrus/src/alp_i2c.c

@@ -1,8 +1,6 @@
 /* (c) Itai Nahshon */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <dix-config.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"

hw/xfree86/drivers/video/cirrus/src/cir_dga.c

@@ -22,10 +22,7 @@
  * Authors:  Adapted from: Alan Hourihane, <alanh@fairlite.demon.co.uk>
  *           by: Egbert Eich
  */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <dix-config.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"

hw/xfree86/drivers/video/cirrus/src/cir_driver.c

@@ -10,10 +10,7 @@
  *	David Dawes, Andrew E. Mileski, Leonard N. Zubkoff,
  *	Guy DESBIEF
  */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <dix-config.h>
 
 /* All drivers should typically include these */
 #include "xf86.h"
@@ -28,6 +25,8 @@
 
 #include "vbe.h"
 
+typedef void *pointer;
+
 /*
  * Forward definitions for the functions that make up the driver.
  */

hw/xfree86/drivers/video/cirrus/src/cir_shadow.c

@@ -2,10 +2,7 @@
    Copyright (c) 1999,2000  The XFree86 Project Inc. 
    based on code written by Mark Vojkovich <markv@valinux.com>
 */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <dix-config.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"

hw/xfree86/drivers/video/cirrus/src/lg_driver.c

@@ -13,10 +13,7 @@
  *      David Dawes, Andrew E. Mileski, Leonard N. Zubkoff,
  *      Guy DESBIEF, Itai Nahshon.
  */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <dix-config.h>
 
 #define EXPERIMENTAL
 

hw/xfree86/drivers/video/cirrus/src/lg_hwcurs.c

@@ -10,10 +10,7 @@
  * Much of this code is inspired by the HW cursor code from XFree86
  * 3.3.3.
  */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <dix-config.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"

hw/xfree86/drivers/video/cirrus/src/lg_i2c.c

@@ -1,8 +1,6 @@
 /* (c) Itai Nahshon */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <dix-config.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"

hw/xfree86/drivers/video/meson.build

@@ -17,3 +17,7 @@ endif
 if get_option('xf86-video-chips')
     subdir('chips')
 endif
+
+if get_option('xf86-video-cirrus')
+    subdir('cirrus')
+endif

meson_options.txt

@@ -131,6 +131,8 @@ option('xf86-video-ast', type: 'boolean', value: true,
        description: 'xf86 video driver for AST graphics chips')
 option('xf86-video-chips', type: 'boolean', value: true,
        description: 'xf86 video driver for CHIPS graphics chips')
+option('xf86-video-cirrus', type: 'boolean', value: true,
+       description: 'xf86 video driver for CIRRUS graphics chips')
 
 option('tests', type: 'boolean', value: true,
        description: 'Build tests for the X server on platforms that support it')