summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 19:47:58 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 19:47:58 +0000
commitc59c3f4f0854b0bb27a5378d58ebaa3fb0814494 (patch)
tree11d26950b69ee17bda7a952a1691453012c06dff
parent0723e761f846fa55e850eba14406a106c784dd52 (diff)
Unlibcwrap. Bump server version requirement. Bump to 4.1.0.rendition-4_1_0XORG-7_1
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac4
-rw-r--r--src/rendition.c6
-rw-r--r--src/rendition.h6
-rw-r--r--src/vloaduc.c3
5 files changed, 20 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e3705e7..1edcfd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/rendition.c:
+ * src/rendition.h:
+ * src/vloaduc.c:
+ Unlibcwrap. Bump server version requirement. Bump to 4.1.0.
+
2006-02-08 Luc Verhaegen <libv@skynet.be>
* src/rendition.c: (renditionPreInit):
diff --git a/configure.ac b/configure.ac
index 3456d1b..caee4e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-rendition],
- 4.0.1.3,
+ 4.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-rendition)
@@ -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/rendition.c b/src/rendition.c
index 5309834..fd91b47 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -72,10 +72,10 @@
#define RENDITION_NAME "RENDITION"
#define RENDITION_DRIVER_NAME "rendition"
-#define RENDITION_VERSION_NAME "4.0.1"
+#define RENDITION_VERSION_NAME "4.1.0"
#define RENDITION_VERSION_MAJOR 4
-#define RENDITION_VERSION_MINOR 0
-#define RENDITION_PATCHLEVEL 1
+#define RENDITION_VERSION_MINOR 1
+#define RENDITION_PATCHLEVEL 0
#define RENDITION_VERSION_CURRENT ((RENDITION_VERSION_MAJOR << 24) | \
(RENDITION_VERSION_MINOR << 16) | RENDITION_PATCHLEVEL)
diff --git a/src/rendition.h b/src/rendition.h
index 3ec6726..035ddb6 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -1,14 +1,16 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h,v 1.7 2001/05/16 06:48:10 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h,v 1.5 2000/02/25 21:03:02 dawes Exp $ */
#ifndef __RENDITION_H__
#define __RENDITION_H__
+#include <string.h>
+#include <math.h>
+
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
/* All drivers need this */
-#include "xf86_ansic.h"
/* Everything using inb/outb, etc needs "compiler.h" */
#include "compiler.h"
diff --git a/src/vloaduc.c b/src/vloaduc.c
index 4888573..d758f86 100644
--- a/src/vloaduc.c
+++ b/src/vloaduc.c
@@ -14,6 +14,9 @@
#include "vos.h"
#include "elf.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
/*
* defines