summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 21:48:45 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 21:48:45 +0000
commitab8f09a1fa93300e9634989a153b7d219ba767d6 (patch)
tree390be7dfdf7695fe59ac9d80d4d0c7857f0f05b6
parenta44c7ccb8af0d970cdc204393fb4701541375862 (diff)
Unlibcwrap. Bump server version requirement. Bump to 4.1.0.vga-4_1_0XORG-7_1
-rw-r--r--configure.ac4
-rw-r--r--src/generic.c7
2 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index ed253c3..39e2a3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vga],
- 4.0.0.5,
+ 4.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vga)
@@ -53,7 +53,7 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
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/generic.c b/src/generic.c
index a294f6c..4be7c39 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -40,9 +40,10 @@
#include "config.h"
#endif
+#include <string.h>
+
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "compiler.h"
#include "vgaHW.h"
#include "xf86PciInfo.h"
@@ -67,9 +68,9 @@
/* A few things all drivers should have */
#define VGA_NAME "VGA"
#define VGA_DRIVER_NAME "vga"
-#define VGA_VERSION_NAME "4.0"
+#define VGA_VERSION_NAME "4.1"
#define VGA_VERSION_MAJOR 4
-#define VGA_VERSION_MINOR 0
+#define VGA_VERSION_MINOR 1
#define VGA_PATCHLEVEL 0
#define VGA_VERSION_CURRENT ((VGA_VERSION_MAJOR << 24) | \
(VGA_VERSION_MINOR << 16) | VGA_PATCHLEVEL)