diff options
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/durango.c | 1 | ||||
| -rw-r--r-- | src/nsc.h | 3 | ||||
| -rw-r--r-- | src/nsc_driver.c | 7 | ||||
| -rw-r--r-- | src/nsc_galstub.c | 1 | ||||
| -rw-r--r-- | src/nsc_gx1_accel.c | 4 | ||||
| -rw-r--r-- | src/nsc_gx1_cursor.c | 1 | ||||
| -rw-r--r-- | src/nsc_gx1_dga.c | 1 | ||||
| -rw-r--r-- | src/nsc_gx1_driver.c | 1 | ||||
| -rw-r--r-- | src/nsc_gx1_shadow.c | 1 | ||||
| -rw-r--r-- | src/nsc_gx1_video.c | 1 | ||||
| -rw-r--r-- | src/nsc_gx2_accel.c | 2 | ||||
| -rw-r--r-- | src/nsc_gx2_cursor.c | 1 | ||||
| -rw-r--r-- | src/nsc_gx2_dga.c | 1 | ||||
| -rw-r--r-- | src/nsc_gx2_driver.c | 1 | ||||
| -rw-r--r-- | src/nsc_gx2_shadow.c | 1 | ||||
| -rw-r--r-- | src/nsc_gx2_video.c | 1 |
18 files changed, 30 insertions, 23 deletions
@@ -1,3 +1,24 @@ +2006-04-07 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/durango.c: + * src/nsc.h: + * src/nsc_driver.c: + * src/nsc_galstub.c: + * src/nsc_gx1_accel.c: + * src/nsc_gx1_cursor.c: + * src/nsc_gx1_dga.c: + * src/nsc_gx1_driver.c: + * src/nsc_gx1_shadow.c: + * src/nsc_gx1_video.c: + * src/nsc_gx2_accel.c: + * src/nsc_gx2_cursor.c: + * src/nsc_gx2_dga.c: + * src/nsc_gx2_driver.c: + * src/nsc_gx2_shadow.c: + * src/nsc_gx2_video.c: + Unlibcwrap. Bump server version requirement. Bump to 2.8.0. + 2006-02-27 Alan Coopersmith <alan.coopersmith@sun.com> * man/nsc.man: diff --git a/configure.ac b/configure.ac index e7e51bb..d581dcb 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-nsc], - 2.7.6.5, + 2.8.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-nsc) @@ -56,7 +56,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) # 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/durango.c b/src/durango.c index 84ab413..690824f 100644 --- a/src/durango.c +++ b/src/durango.c @@ -526,7 +526,6 @@ gfx_outd(unsigned short port, unsigned long data) #elif defined(XFree86Server) -#include <xf86_ansic.h> #include <compiler.h> #define INB(port) inb(port) #define INW(port) inw(port) @@ -142,6 +142,9 @@ #ifndef _NSC_GEODE_H_ #define _NSC_GEODE_H_ +#include <string.h> +#include <stdio.h> + #include "xaa.h" #include "xf86Cursor.h" #if !defined(STB_X) diff --git a/src/nsc_driver.c b/src/nsc_driver.c index 5684564..4904b8b 100644 --- a/src/nsc_driver.c +++ b/src/nsc_driver.c @@ -154,7 +154,6 @@ /* Includes that are used by all drivers */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Resources.h" /* We may want inb() and outb() */ @@ -212,10 +211,10 @@ /* This should match the durango code version. * The patchlevel may be used to indicate changes in geode.c */ -#define NSC_VERSION_NAME "2.7.6" +#define NSC_VERSION_NAME "2.8.0" #define NSC_VERSION_MAJOR 2 -#define NSC_VERSION_MINOR 7 -#define NSC_PATCHLEVEL 6 +#define NSC_VERSION_MINOR 8 +#define NSC_PATCHLEVEL 0 #define NSC_VERSION_CURRENT ((NSC_VERSION_MAJOR << 24) | \ (NSC_VERSION_MINOR << 16) | NSC_PATCHLEVEL) diff --git a/src/nsc_galstub.c b/src/nsc_galstub.c index 4ec44d9..d99da09 100644 --- a/src/nsc_galstub.c +++ b/src/nsc_galstub.c @@ -147,7 +147,6 @@ /* all driver need this */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" /* pci stuff */ #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/nsc_gx1_accel.c b/src/nsc_gx1_accel.c index fb1a2fb..970f400 100644 --- a/src/nsc_gx1_accel.c +++ b/src/nsc_gx1_accel.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.3 2004/07/30 20:30:53 ajax Exp $ */ +/* $XdotOrg: driver/xf86-video-nsc/src/nsc_gx1_accel.c,v 1.5 2005/07/11 02:29:55 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.7 2003/12/07 22:40:38 alanh Exp $ */ /* * $Workfile: nsc_gx1_accel.c $ @@ -154,11 +154,9 @@ /* Xfree86 header files */ #include "vgaHW.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xaalocal.h" #include "xf86fbman.h" #include "miline.h" -#include "xf86_libc.h" #include "xaarop.h" #include "nsc.h" diff --git a/src/nsc_gx1_cursor.c b/src/nsc_gx1_cursor.c index d0c403d..158b647 100644 --- a/src/nsc_gx1_cursor.c +++ b/src/nsc_gx1_cursor.c @@ -146,7 +146,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Pci.h" #include "xf86PciInfo.h" #include "nsc.h" diff --git a/src/nsc_gx1_dga.c b/src/nsc_gx1_dga.c index b5461ff..0a39e91 100644 --- a/src/nsc_gx1_dga.c +++ b/src/nsc_gx1_dga.c @@ -149,7 +149,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Pci.h" #include "xf86PciInfo.h" #include "xaa.h" diff --git a/src/nsc_gx1_driver.c b/src/nsc_gx1_driver.c index 54a1e0a..ee98dbb 100644 --- a/src/nsc_gx1_driver.c +++ b/src/nsc_gx1_driver.c @@ -159,7 +159,6 @@ /* Includes that are used by all drivers */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Resources.h" /* We may want inb() and outb() */ diff --git a/src/nsc_gx1_shadow.c b/src/nsc_gx1_shadow.c index c4e3a89..000befa 100644 --- a/src/nsc_gx1_shadow.c +++ b/src/nsc_gx1_shadow.c @@ -148,7 +148,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" -#include "xf86_ansic.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "nsc.h" diff --git a/src/nsc_gx1_video.c b/src/nsc_gx1_video.c index a4beaa7..ec54416 100644 --- a/src/nsc_gx1_video.c +++ b/src/nsc_gx1_video.c @@ -151,7 +151,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/nsc_gx2_accel.c b/src/nsc_gx2_accel.c index a0274dc..90daf2c 100644 --- a/src/nsc_gx2_accel.c +++ b/src/nsc_gx2_accel.c @@ -148,11 +148,9 @@ /* Xfree86 header files */ #include "vgaHW.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xaalocal.h" #include "xf86fbman.h" #include "miline.h" -#include "xf86_libc.h" #include "xaarop.h" #include "nsc.h" diff --git a/src/nsc_gx2_cursor.c b/src/nsc_gx2_cursor.c index 92a4d71..6a3a828 100644 --- a/src/nsc_gx2_cursor.c +++ b/src/nsc_gx2_cursor.c @@ -146,7 +146,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Pci.h" #include "xf86PciInfo.h" #include "nsc.h" diff --git a/src/nsc_gx2_dga.c b/src/nsc_gx2_dga.c index d356120..71f5245 100644 --- a/src/nsc_gx2_dga.c +++ b/src/nsc_gx2_dga.c @@ -149,7 +149,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Pci.h" #include "xf86PciInfo.h" #include "xaa.h" diff --git a/src/nsc_gx2_driver.c b/src/nsc_gx2_driver.c index 3cfadbe..3f67233 100644 --- a/src/nsc_gx2_driver.c +++ b/src/nsc_gx2_driver.c @@ -153,7 +153,6 @@ /* Includes that are used by all drivers */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Resources.h" /* We may want inb() and outb() */ diff --git a/src/nsc_gx2_shadow.c b/src/nsc_gx2_shadow.c index 2de4c95..a1e9871 100644 --- a/src/nsc_gx2_shadow.c +++ b/src/nsc_gx2_shadow.c @@ -148,7 +148,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" -#include "xf86_ansic.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "nsc.h" diff --git a/src/nsc_gx2_video.c b/src/nsc_gx2_video.c index 437d0bc..79b58a1 100644 --- a/src/nsc_gx2_video.c +++ b/src/nsc_gx2_video.c @@ -151,7 +151,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" |