summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 19:13:05 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 19:13:05 +0000
commit164274aa66ca490aaf04c54a23fc4e97547c1061 (patch)
treecbd8e04df0d7e5e7bc78a468b46be6aaa9d17f1b
parent0c37cdb702bbaa7e1bce7c0be77ea8f15e7f39ca (diff)
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.imstt-1_1_0XORG-7_1
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac4
-rw-r--r--src/imstt.h3
-rw-r--r--src/imstt_accel.c1
-rw-r--r--src/imstt_driver.c6
5 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 7585dc9..405d40b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/imstt.h:
+ * src/imstt_accel.c:
+ * src/imstt_driver.c:
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+
2006-02-08 Luc Verhaegen <libv@skynet.be>
* src/imstt_driver.c: (IMSTTPreInit):
diff --git a/configure.ac b/configure.ac
index bca8fd3..f33643b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-imstt],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-imstt)
@@ -52,7 +52,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
# 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/imstt.h b/src/imstt.h
index b714aaf..483002f 100644
--- a/src/imstt.h
+++ b/src/imstt.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.5 2001/05/16 06:48:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.4 2001/04/05 21:29:14 dawes Exp $ */
#ifndef _IMSTT_H
#define _IMSTT_H
@@ -7,7 +7,6 @@
#include "xf86Pci.h"
#include "xf86PciInfo.h"
#include "xaa.h"
-#include "xf86_ansic.h"
typedef struct _IMSTTRec {
diff --git a/src/imstt_accel.c b/src/imstt_accel.c
index e62868a..9c756f1 100644
--- a/src/imstt_accel.c
+++ b/src/imstt_accel.c
@@ -30,7 +30,6 @@
#include <X11/Xarch.h>
#include "xf86.h"
-#include "xf86_ansic.h"
#include "compiler.h"
#include "xf86_OSproc.h"
#include "xaa.h"
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index 5990137..186b97f 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -34,9 +34,9 @@
#include "config.h"
#endif
+#include <string.h>
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "xf86Version.h"
@@ -99,9 +99,9 @@ static void IMSTTSetClock(ScrnInfoPtr pScrn, unsigned long mhz);
static void IMSTTWriteMode(ScrnInfoPtr pScrn);
#define DRIVER_NAME "imstt"
-#define DRIVER_VERSION "1.0.0"
+#define DRIVER_VERSION "1.1.0"
#define VERSION_MAJOR 1
-#define VERSION_MINOR 0
+#define VERSION_MINOR 1
#define PATCHLEVEL 0
#define IMSTT_VERSION ((VERSION_MAJOR << 24) | \
(VERSION_MINOR << 16) | \