xserver-xorg-video-s3virge: Changes to 'upstream-unstable'
.gitignore | 70 ++++++++++-
COPYING | 64 +++++++++-
ChangeLog | 69 -----------
Makefile.am | 17 +-
README | 200 ++++++++++++++-------------------
README.sgml | 61 ----------
TODO | 326 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
TODO_NOTES | 326 -------------------------------------------------------
configure.ac | 49 +++-----
man/.cvsignore | 2
man/Makefile.am | 59 +++------
src/.cvsignore | 6 -
src/s3v.h | 3
src/s3v_accel.c | 2
src/s3v_dga.c | 7 -
src/s3v_driver.c | 57 +++++----
src/s3v_hwcurs.c | 1
src/s3v_i2c.c | 1
src/s3v_pciids.h | 18 +++
src/s3v_shadow.c | 1
src/s3v_xv.c | 13 +-
21 files changed, 654 insertions(+), 698 deletions(-)
New commits:
commit 1a17d10a4130e7ccff1d9ae07c44200d0520445c
Author: Tormod Volden <debian.tormod@gmail.com>
Date: Sun Jan 8 11:34:35 2012 +0100
Do not use deprecated xf86PciInfo.h
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
diff --git a/src/s3v.h b/src/s3v.h
index 42b1f83..f4976ca 100644
--- a/src/s3v.h
+++ b/src/s3v.h
@@ -40,9 +40,6 @@ in this Software without prior written authorization from the XFree86 Project.
/* Everything using inb/outb, etc needs "compiler.h" */
#include "compiler.h"
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
/* Drivers that need to access the PCI config space directly need this */
#include "xf86Pci.h"
diff --git a/src/s3v_accel.c b/src/s3v_accel.c
index 2e6d798..7837e4a 100644
--- a/src/s3v_accel.c
+++ b/src/s3v_accel.c
@@ -30,6 +30,7 @@ in this Software without prior written authorization from the XFree86 Project.
#include <unistd.h>
#include "s3v.h"
+#include "s3v_pciids.h"
#include "miline.h"
/* fb includes are in s3v.h */
diff --git a/src/s3v_dga.c b/src/s3v_dga.c
index 57d05ef..ecf8571 100644
--- a/src/s3v_dga.c
+++ b/src/s3v_dga.c
@@ -62,7 +62,6 @@ in this Software without prior written authorization from the XFree86 Project.
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Pci.h"
-#include "xf86PciInfo.h"
#include "xaa.h"
#include "xaalocal.h"
#include "s3v.h"
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 5f64be1..7064b1e 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -57,8 +57,9 @@ in this Software without prior written authorization from the XFree86 Project.
*/
- /* Most xf86 commons are already in s3v.h */
-#include "s3v.h"
+/* Most xf86 commons are already in s3v.h */
+#include "s3v.h"
+#include "s3v_pciids.h"
#include "globals.h"
diff --git a/src/s3v_hwcurs.c b/src/s3v_hwcurs.c
index 53c539f..58e8fd9 100644
--- a/src/s3v_hwcurs.c
+++ b/src/s3v_hwcurs.c
@@ -39,6 +39,7 @@ in this Software without prior written authorization from the XFree86 Project.
#include "s3v.h"
+#include "s3v_pciids.h"
/* protos */
diff --git a/src/s3v_i2c.c b/src/s3v_i2c.c
index cbac21f..6bbfd1e 100644
--- a/src/s3v_i2c.c
+++ b/src/s3v_i2c.c
@@ -58,7 +58,6 @@ in this Software without prior written authorization from the XFree86 Project.
#include "compiler.h"
#include "xf86Pci.h"
-#include "xf86PciInfo.h"
#include "vgaHW.h"
diff --git a/src/s3v_pciids.h b/src/s3v_pciids.h
new file mode 100644
index 0000000..5d11333
--- /dev/null
+++ b/src/s3v_pciids.h
@@ -0,0 +1,18 @@
+#ifndef S3V_PCIIDS_H
+#define S3V_PCIIDS_H
+
+#define PCI_VENDOR_S3 0x5333
+#define PCI_CHIP_VIRGE 0x5631
+#define PCI_CHIP_TRIO 0x8811
+#define PCI_CHIP_TRIO64UVP 0x8814
+#define PCI_CHIP_VIRGE_VX 0x883D
+#define PCI_CHIP_TRIO64V2_DXGX 0x8901
+#define PCI_CHIP_Trio3D 0x8904
+#define PCI_CHIP_VIRGE_DXGX 0x8A01
+#define PCI_CHIP_VIRGE_GX2 0x8A10
+#define PCI_CHIP_Trio3D_2X 0x8A13
+#define PCI_CHIP_VIRGE_MX 0x8C01
+#define PCI_CHIP_VIRGE_MXPLUS 0x8C02
+#define PCI_CHIP_VIRGE_MXP 0x8C03
+
+#endif /* S3V_PCIIDS_H */
diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c
index e2e1269..82b763f 100644
--- a/src/s3v_shadow.c
+++ b/src/s3v_shadow.c
@@ -60,7 +60,6 @@ in this Software without prior written authorization from the XFree86 Project.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"
#include "servermd.h"
diff --git a/src/s3v_xv.c b/src/s3v_xv.c
index cc836d4..2466789 100644
--- a/src/s3v_xv.c
+++ b/src/s3v_xv.c
@@ -40,8 +40,9 @@ in this Software without prior written authorization from the XFree86 Project.
#include "config.h"
#endif
- /* Most xf86 commons are already in s3v.h */
-#include "s3v.h"
+/* Most xf86 commons are already in s3v.h */
+#include "s3v.h"
+#include "s3v_pciids.h"
#if 0
#define OFF_DELAY 250 /* milliseconds */
commit 5f0d2a32a81895ba0bf565de096cbdc8bca46c9e
Author: Tormod Volden <debian.tormod@gmail.com>
Date: Mon Dec 26 18:04:11 2011 +0100
Replace deprecated x(c/re)alloc/xfree with m/c/realloc/free
sed -i 's/xalloc/malloc/g; s/xcalloc/calloc/g; s/xrealloc/realloc/g;
s/xfree(/free(/g'
Also added a missing unistd.h include for usleep().
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/s3v_accel.c b/src/s3v_accel.c
index 528ab8a..2e6d798 100644
--- a/src/s3v_accel.c
+++ b/src/s3v_accel.c
@@ -28,6 +28,7 @@ in this Software without prior written authorization from the XFree86 Project.
#include "config.h"
#endif
+#include <unistd.h>
#include "s3v.h"
#include "miline.h"
diff --git a/src/s3v_dga.c b/src/s3v_dga.c
index 7ad42db..57d05ef 100644
--- a/src/s3v_dga.c
+++ b/src/s3v_dga.c
@@ -116,15 +116,15 @@ S3VDGAInit(ScreenPtr pScreen)
to be rewritten to accommodate depth changes in DGA mode */
if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
oneMore = TRUE;
} else {
- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
oneMore = FALSE;
}
if(!newmodes) {
- xfree(modes);
+ free(modes);
return FALSE;
}
modes = newmodes;
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 0440014..5f64be1 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -383,7 +383,7 @@ S3VFreeRec(ScrnInfoPtr pScrn)
PVERB5(" S3VFreeRec\n");
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -435,7 +435,7 @@ S3VProbe(DriverPtr drv, int flags)
numDevSections, drv, &usedChips);
/* Free it since we don't need that list after this */
- xfree(devSections);
+ free(devSections);
if (numUsed <= 0)
return FALSE;
@@ -463,7 +463,7 @@ S3VProbe(DriverPtr drv, int flags)
foundScreen = TRUE;
}
}
- xfree(usedChips);
+ free(usedChips);
PVERB5(" S3VProbe end\n");
return foundScreen;
}
@@ -601,7 +601,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
}
/* Process the options */
- if (!(ps3v->Options = xalloc(sizeof(S3VOptions))))
+ if (!(ps3v->Options = malloc(sizeof(S3VOptions))))
return FALSE;
memcpy(ps3v->Options, S3VOptions, sizeof(S3VOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, ps3v->Options);
@@ -797,7 +797,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
#ifndef XSERVER_LIBPCIACCESS
if (pEnt->resources) {
- xfree(pEnt);
+ free(pEnt);
S3VFreeRec(pScrn);
return FALSE;
}
@@ -851,7 +851,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
} else {
ps3v->ChipRev = PCI_DEV_REVISION(ps3v->PciInfo);
}
- xfree(pEnt);
+ free(pEnt);
/*
* This shouldn't happen because such problems should be caught in
@@ -2526,7 +2526,7 @@ S3VInternalScreenInit( int scrnIndex, ScreenPtr pScreen)
if(ps3v->shadowFB) {
ps3v->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
- ps3v->ShadowPtr = xalloc(ps3v->ShadowPitch * height);
+ ps3v->ShadowPtr = malloc(ps3v->ShadowPitch * height);
displayWidth = ps3v->ShadowPitch / (pScrn->bitsPerPixel >> 3);
FBStart = ps3v->ShadowPtr;
} else {
@@ -3310,7 +3310,7 @@ S3VCloseScreen(int scrnIndex, ScreenPtr pScreen)
if (ps3v->AccelInfoRec)
XAADestroyInfoRec(ps3v->AccelInfoRec);
if (ps3v->DGAModes)
- xfree(ps3v->DGAModes);
+ free(ps3v->DGAModes);
pScrn->vtSema = FALSE;
diff --git a/src/s3v_xv.c b/src/s3v_xv.c
index 7e7c243..cc836d4 100644
--- a/src/s3v_xv.c
+++ b/src/s3v_xv.c
@@ -137,7 +137,7 @@ void S3VInitVideo(ScreenPtr pScreen)
adaptors = &newAdaptor;
} else {
newAdaptors = /* need to free this someplace */
- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
if(newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
sizeof(XF86VideoAdaptorPtr));
@@ -152,7 +152,7 @@ void S3VInitVideo(ScreenPtr pScreen)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
if(newAdaptors)
- xfree(newAdaptors);
+ free(newAdaptors);
}
/* client libraries expect an encoding */
@@ -301,10 +301,10 @@ S3VAllocAdaptor(ScrnInfoPtr pScrn)
if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
return NULL;
- if(!(pPriv = xcalloc(1, sizeof(S3VPortPrivRec) +
+ if(!(pPriv = calloc(1, sizeof(S3VPortPrivRec) +
(sizeof(DevUnion) * S3V_MAX_PORTS))))
{
- xfree(adapt);
+ free(adapt);
return NULL;
}
commit c6282487c4fc0f1180845292b425a241920af332
Author: Tormod Volden <debian.tormod@gmail.com>
Date: Thu Dec 29 18:06:25 2011 +0000
Add missing VERBLEV argument to xf86DrvMsgVerb()
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 2cc04ce..0440014 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -1328,7 +1328,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
/* Load XAA if needed */
if (!ps3v->NoAccel || ps3v->hwcursor ) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, VERBLEV,
"Falling back to shadowfb\n");
ps3v->NoAccel = 1;
ps3v->hwcursor = 0;
commit 6085552878aaeeb4aede096b88aeb153ef73cd5d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 17:20:00 2011 -0500
Fix for new vgahw ABI
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index bd10258..2cc04ce 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -519,7 +519,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
*/
if (!vgaHWGetHWRec(pScrn))
return FALSE;
-
+ vgaHWSetStdFuncs(VGAHWPTR(pScrn));
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
commit 6a26a16af1495cb13969ae7596bdf2bce16eec28
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 17:19:07 2011 -0500
Fall back to shadowfb if XAA is unavailable
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 1631b25..bd10258 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -1328,8 +1328,11 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
/* Load XAA if needed */
if (!ps3v->NoAccel || ps3v->hwcursor ) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
- S3VFreeRec(pScrn);
- return FALSE;
+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO,
+ "Falling back to shadowfb\n");
+ ps3v->NoAccel = 1;
+ ps3v->hwcursor = 0;
+ ps3v->shadowFB = 1;
}
}
commit 729e379f277ae94d4b1ae2d6bab46dceec9b30b1
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 17 15:53:28 2011 -0500
Check ABI major not encoded ABI
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 0f754dd..1631b25 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -3523,7 +3523,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
hwp = VGAHWPTR(pScrn);
ps3v = S3VPTR(pScrn);
-#if ABI_VIDEODRV_VERSION < 12
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
PIOOffset = hwp->PIOOffset;
#endif
@@ -3591,7 +3591,7 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
ps3v = S3VPTR(pScrn);
vgaCRIndex = hwp->IOBase + 4;
-#if ABI_VIDEODRV_VERSION < 12
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
vgaCRIndex += hwp->PIOOffset;
#endif
vgaCRReg = vgaCRIndex + 1;
commit 92b4671ca75022a56ad9e85b347f81c12157c98f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Nov 16 14:58:29 2011 -0500
Adapt to missing PIOOffset in videoabi 12
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 2ced9ac..0f754dd 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -3516,11 +3516,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
S3VPtr ps3v;
IOADDRESS vgaCRIndex, vgaCRReg;
unsigned char val;
-
+ unsigned int PIOOffset = 0;
+
PVERB5(" S3VEnableMmio\n");
hwp = VGAHWPTR(pScrn);
ps3v = S3VPTR(pScrn);
+
+#if ABI_VIDEODRV_VERSION < 12
+ PIOOffset = hwp->PIOOffset;
+#endif
+
/*
* enable chipset (seen on uninitialized secondary cards)
* might not be needed once we use the VGA softbooter
@@ -3533,17 +3539,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
* to be set correctly already and MMIO _has_ to be
* enabled.
*/
- val = inb(hwp->PIOOffset + 0x3C3); /*@@@EE*/
- outb(hwp->PIOOffset + 0x3C3, val | 0x01);
+ val = inb(PIOOffset + 0x3C3); /*@@@EE*/
+ outb(PIOOffset + 0x3C3, val | 0x01);
/*
* set CR registers to color mode
* in mono mode extended CR registers
* are not accessible. (EE 05/04/99)
*/
- val = inb(hwp->PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/
- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01);
+ val = inb(PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/
+ outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01);
vgaHWGetIOBase(hwp); /* Get VGA I/O base */
- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
+ vgaCRIndex = PIOOffset + hwp->IOBase + 4;
vgaCRReg = vgaCRIndex + 1;
#if 1
/*
@@ -3562,7 +3568,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
/* Enable new MMIO, if TRIO mmio is already */
/* enabled, then it stays enabled. */
outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08);
- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val);
+ outb(PIOOffset + VGA_MISC_OUT_W, val);
if (S3_TRIO_3D_SERIES(ps3v->Chipset)) {
outb(vgaCRIndex, 0x40);
val = inb(vgaCRReg);
@@ -3584,7 +3590,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
hwp = VGAHWPTR(pScrn);
ps3v = S3VPTR(pScrn);
- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
+ vgaCRIndex = hwp->IOBase + 4;
+#if ABI_VIDEODRV_VERSION < 12
+ vgaCRIndex += hwp->PIOOffset;
+#endif
vgaCRReg = vgaCRIndex + 1;
outb(vgaCRIndex, 0x53);
/* Restore register's original state */
commit a568407e74082cd2304b95e0abee083a03ad62b8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
diff --git a/configure.ac b/configure.ac
index 8bdafd1..1c7e9f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
#
# Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-s3virge],
[1.10.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-s3virge])
-
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -40,25 +40,26 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
+# Define a configure option for an alternate module directory
AC_ARG_WITH(xorg-module-dir,
AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
@@ -80,7 +81,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-
AC_SUBST([moduledir])
DRIVER_NAME=s3virge
commit be262ccedd5910043be246efecc8a7a8157fce21
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:07:00 2010 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 7a8a726..8bdafd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,8 +86,9 @@ AC_SUBST([moduledir])
DRIVER_NAME=s3virge
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT
commit e34f4157ba908b88f4f5054bfc77bbf42af1da10
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:37:41 2010 -0400
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index b578fcd..7a8a726 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
commit ae2a791deceebaaf7a9ae47dc000f020491db2db
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:23 2010 -0400
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 2ab11b6..b578fcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-s3virge],
[xf86-video-s3virge])
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 1f0ca885cf47ecda982bffbdf25c43fe26aaac12
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 09:27:42 2010 -0400
config: complete AC_INIT m4 quoting
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index e8d4a81..2ab11b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-s3virge],
- 1.10.4,
+ [1.10.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-s3virge)
+ [xf86-video-s3virge])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
commit 1ddfe984facffac47101ff6d9c2d337ee911ab1e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:44:58 2010 -0400
config: remove unrequired AC_SUBST([XORG_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 080a990..e8d4a81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,6 @@ fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=s3virge
commit 920f72d71a2d01e101ec06d28c4ec11d647f38b6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 20:24:42 2010 -0400
config: remove unrequired AC_HEADER_STDC
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 2728f2a..080a990 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,8 +73,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
[#include "xorg-server.h"])
CPPFLAGS="$SAVE_CPPFLAGS"
-# Checks for header files.
-AC_HEADER_STDC
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
commit d409944a7265872abd3520c4486ec172d80b43c2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 19:41:31 2010 -0400
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c233d31..2728f2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
commit 900ba15ae2ef047d4e8f515ce166a11e44ce4de4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 18:45:19 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 3917c1e..c233d31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
AC_INIT([xf86-video-s3virge],
1.10.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit a72398e11a357055042332bb411f96f97c4155c2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 16:15:29 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
diff --git a/configure.ac b/configure.ac
index 3f28df1..3917c1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for programs.
diff --git a/man/Makefile.am b/man/Makefile.am
index 8f2454b..b3688ce 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit f0ae83f0ae2a719f3da189b33c3a99c1d4249866
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Jun 14 07:46:40 2010 -0400
README: keep the text version of README, discard the sgml version
The linuxdoc doc tool is deprecated.
README files are exclusively text files.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 2fdcc7a..8467821 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,12 +21,7 @@
SUBDIRS = src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
-if BUILD_LINUXDOC
-README: README.sgml
- $(MAKE_TEXT) README.sgml && mv README.txt README
-endif
-
-EXTRA_DIST = CALLMAP README.sgml
+EXTRA_DIST = CALLMAP
.PHONY: ChangeLog INSTALL
diff --git a/README.sgml b/README.sgml
deleted file mode 100644
index fe1f385..0000000
--- a/README.sgml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
-<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
-]>
-
-<article>
-<title> Information for S3 ViRGE Users
-<author>The XFree86 Project Inc.
-<date>19 Dec 2001
-
-<toc>
-
-<sect> Supported hardware
-<p>
-The s3virge driver in X11R&relvers; supports the S3 ViRGE, ViRGE DX, GX, GX2, MX, MX+, and VX chipsets. It also supports Trio3D and Trio3D/2x chips. A majority of testing is done on ViRGE DX chips, making them the most stable to date. This release has added support for doublescan modes on DX.
-
-This driver is moderately stable, however please use caution with any new install. Please report any problems to bugzilla.freedesktop.org, using the xorg component.
-
-<sect>Features:
-<p>
-
-<itemize>
-<item>Fully accelerated support for S3 ViRGE family video adapters
-<item>uses linear frame buffer
-<item>supports resolutions up to 2048x2048
-<item>supports color depths of 8, 15, 16 and 24
-<item>full use of video card memory for acceleration caching when visible framebuffer leaves extra memory
-<item>XVideo on DX, GX, GX2, MX, MX+ and Trio3D/2X at depth 16 and 24
-<item>Doublescan modes on DX, possibly others (untested)
-</itemize>
-
-<sect>Configuration:
-<p>
-
-The driver auto-detects RAM size, RAMDAC and ClockChip. Do not bother putting
-these in your "Device" section.
-
-<sect>Documentation:
-<p>
-
-The driver has several supported options which are documented in the s3virge man
-page. Please refer to it for additional details about configuration options.
-
-<sect>Support:
-<p>
-For support with X11R&relvers video drivers please refer to our web site at <url name="wiki.x.org" url="http://wiki.x.org";>.
-
-<sect>Authors
-<p>
-
-<itemize>
-<item>Mark Vojkovich <url url="mailto:mvojkovich@nvidia.com";>
-<item>Sebastien Marineau
-<item>Harald Koenig <url url="mailto:koenig@tat.physik.uni-tuebingen.de";>
-<item>Matt Grossman <url url="mailto:mattg@oz.net";>
-<item>Kevin Brosius <url url="mailto:cobra@compuserve.com";>
-</itemize>
-
-</article>
diff --git a/configure.ac b/configure.ac
index 93c8387..3f28df1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,8 +90,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=s3virge
AC_SUBST([DRIVER_NAME])
-XORG_CHECK_LINUXDOC
-
AC_OUTPUT([
Makefile
src/Makefile
commit 65630d633d695bee9ba7da57b7e3e9e66b87b1f3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Jun 14 07:45:32 2010 -0400
README: fix linuxdoc content
defs.ent are located under X11 directory
ident tag is not a Linuxdoc tag
replace docbook email tag with linuxdoc email tag
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/README b/README
index 72b75b2..036eec8 100644
--- a/README
+++ b/README
@@ -1,112 +1,88 @@
-xf86-video-s3virge - S3 ViRGE video driver for the Xorg X server
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-s3virge
-
- http://cgit.freedesktop.org/xorg/driver/xf86-video-s3virge
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
-------------------------------------------------------------------------
-What works:
-- Supports 8bpp, 15/16bpp, 24bpp and 32bpp. Heavy testing on ViRGE DX.
-- There is some known instability in ViRGE GX2, please report problems.
-- Silken Mouse is enabled by default, use the generic server option of
- -nosilk to disable it.
-
-XCONFIG options:
-
-The driver supports quite a few different XConfig options, which can
-be used to tune the driver and improve performance. Without any options,
-the driver will use conservative settings which should work on most
-hardware. Large improvements in performance are possible by selecting
-the proper options, which will probably work on most systems.
-
-Cursor:
-
-- "hwcursor" "off" behaves exactly like "swcursor". Default: "on"
-- "swcursor" will disable the HW Cursor. HW Cursor is used by default and
- no option is needed to enable it.
Reply to: