summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 20:58:57 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 20:58:57 +0000
commit9a316eaea700e3a356f922506bf2c79e00fd9d83 (patch)
tree6b993e58024fa728a3d9281b23abe920b728d4af
parentc394f38c9a998eebec134a9a77ced46b9c005b9d (diff)
Unlibcwrap. Bump server version requirement. Bump to 1.4.0.siliconmotion-1_4_0
-rw-r--r--ChangeLog10
-rw-r--r--configure.ac4
-rw-r--r--src/smi.h4
-rw-r--r--src/smi_dga.c1
-rw-r--r--src/smi_driver.c6
-rw-r--r--src/smi_i2c.c1
-rw-r--r--src/smi_shadow.c1
7 files changed, 18 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 57b7c97..9e732b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/smi.h:
+ * src/smi_dga.c:
+ * src/smi_driver.c:
+ * src/smi_i2c.c:
+ * src/smi_shadow.c:
+ Unlibcwrap. Bump server version requirement. Bump to 1.4.0.
+
2006-02-08 Luc Verhaegen <libv@skynet.be>
* src/smi.h:
diff --git a/configure.ac b/configure.ac
index 4889073..563383a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-siliconmotion],
- 1.3.1.5,
+ 1.4.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-siliconmotion)
@@ -54,7 +54,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/smi.h b/src/smi.h
index 8779309..2b550d8 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -31,9 +31,11 @@ authorization from the XFree86 Project and Silicon Motion.
#ifndef _SMI_H
#define _SMI_H
+#include <string.h>
+#include <stdio.h>
+
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "xf86Cursor.h"
diff --git a/src/smi_dga.c b/src/smi_dga.c
index 4b7a2fa..3fd0864 100644
--- a/src/smi_dga.c
+++ b/src/smi_dga.c
@@ -34,7 +34,6 @@ authorization from the XFree86 Project and Silicon Motion.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
#include "xaa.h"
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 8284207..a39e7d0 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -88,10 +88,10 @@ static void SMI_ProbeDDC(ScrnInfoPtr pScrn, int index);
#define SILICONMOTION_NAME "Silicon Motion"
#define SILICONMOTION_DRIVER_NAME "siliconmotion"
-#define SILICONMOTION_VERSION_NAME "1.3.1"
+#define SILICONMOTION_VERSION_NAME "1.4.0"
#define SILICONMOTION_VERSION_MAJOR 1
-#define SILICONMOTION_VERSION_MINOR 3
-#define SILICONMOTION_PATCHLEVEL 1
+#define SILICONMOTION_VERSION_MINOR 4
+#define SILICONMOTION_PATCHLEVEL 0
#define SILICONMOTION_DRIVER_VERSION ((SILICONMOTION_VERSION_MAJOR << 24) | \
(SILICONMOTION_VERSION_MINOR << 16) | \
(SILICONMOTION_PATCHLEVEL))
diff --git a/src/smi_i2c.c b/src/smi_i2c.c
index 9b7bf30..f4aa19d 100644
--- a/src/smi_i2c.c
+++ b/src/smi_i2c.c
@@ -34,7 +34,6 @@ authorization from the XFree86 Project and Silicon Motion.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "compiler.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
diff --git a/src/smi_shadow.c b/src/smi_shadow.c
index ffc488f..10cfe4d 100644
--- a/src/smi_shadow.c
+++ b/src/smi_shadow.c
@@ -35,7 +35,6 @@ authorization from the XFree86 Project and Silicon Motion.
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
-#include "xf86_ansic.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"