.gitignore | 70 ++++++++++++++++++++-- COPYING | 67 +++++++++++++++++++-- ChangeLog | 155 -------------------------------------------------- Makefile.am | 12 +++ configure.ac | 47 +++++++-------- man/.cvsignore | 2 man/Makefile.am | 59 ++++++------------- man/trident.man | 1 src/.cvsignore | 6 - src/blade_accel_exa.c | 8 -- src/trident.h | 11 ++- src/trident_dac.c | 2 src/trident_dga.c | 6 - src/trident_driver.c | 106 +++++++++++++++++++++------------- src/trident_video.c | 31 +++++----- src/tvga_dac.c | 2 16 files changed, 276 insertions(+), 309 deletions(-)
New commits: commit 16816e99bacbd8dfc51a2deba541a72fb27f156a Author: Alan Coopersmith <[email protected]> Date: Fri Mar 23 20:02:50 2012 -0700 xf86-video-trident 1.3.5 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 0fc2066..cab1fb7 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-trident], - [1.3.4], + [1.3.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-trident]) AC_CONFIG_SRCDIR([Makefile.am]) commit 2267e83d794b916132db0411c642f7b212615f07 Author: Adam Jackson <[email protected]> Date: Mon Dec 19 17:36:57 2011 -0500 Fix for new vgaHW ABI Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/trident_driver.c b/src/trident_driver.c index 3088eb2..4cf7e24 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -1107,6 +1107,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; hwp = VGAHWPTR(pScrn); + vgaHWSetStdFuncs(hwp); vgaHWGetIOBase(hwp); vgaIOBase = hwp->IOBase; commit 2f87fa6ddebacb03bbd3a8ca3177ce16912d0f2c Author: Adam Jackson <[email protected]> Date: Mon Dec 19 17:36:36 2011 -0500 Fall back to shadowfb if XAA is unavailable Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/trident_driver.c b/src/trident_driver.c index 472c9b7..3088eb2 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -2370,24 +2370,14 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - /* Load shadow if needed */ - if (pTrident->ShadowFB) { - if (!xf86LoadSubModule(pScrn, "shadow")) { - TRIDENTFreeRec(pScrn); - return FALSE; - } - } - /* Load XAA if needed */ if (!pTrident->NoAccel) { if (!pTrident->useEXA) { if (!xf86LoadSubModule(pScrn, "xaa")) { - if (IsPciCard && UseMMIO) { - TRIDENTDisableMMIO(pScrn); - TRIDENTUnmapMem(pScrn); - } - TRIDENTFreeRec(pScrn); - return FALSE; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Falling back to shadowfb\n"); + pTrident->NoAccel = 1; + pTrident->ShadowFB = 1; } } @@ -2428,6 +2418,14 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) } } + /* Load shadow if needed */ + if (pTrident->ShadowFB) { + if (!xf86LoadSubModule(pScrn, "shadow")) { + TRIDENTFreeRec(pScrn); + return FALSE; + } + } + /* Load DDC if needed */ /* This gives us DDC1 - we should be able to get DDC2B using i2c */ commit 6afbfaf62a2d049fcf289b1dbf32018fd7fdea1c Author: Jeremy Huddleston <[email protected]> Date: Tue Nov 1 20:33:48 2011 -0700 Dead code removal Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/blade_accel_exa.c b/src/blade_accel_exa.c index 80e3f23..3129623 100644 --- a/src/blade_accel_exa.c +++ b/src/blade_accel_exa.c @@ -251,14 +251,6 @@ static void WaitMarker(ScreenPtr pScreen, int marker) } } -static Bool PrepareAccess(PixmapPtr pPix, int index) -{ -} - -static void FinishAccess(PixmapPtr pPix, int index) -{ -} - static void BladeInitializeAccelerator(ScrnInfoPtr pScrn) { TRIDENTPtr pTrident = TRIDENTPTR(pScrn); commit 343fc2a2b98ca9e93c031b7f7c3378563699b394 Author: Jeremy Huddleston <[email protected]> Date: Sat Oct 29 20:07:56 2011 -0700 Disable PC98 code on newer servers Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/trident_driver.c b/src/trident_driver.c index addf36e..472c9b7 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -2622,7 +2622,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) TRIDENTPtr pTrident = TRIDENTPTR(pScrn); TRIDENTRegPtr tridentReg; - if (!xf86IsPc98()) WAITFORVSYNC; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + if (!xf86IsPc98()) +#endif + WAITFORVSYNC; TridentFindClock(pScrn,mode->Clock); @@ -2714,8 +2717,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) vgaHWProtect(pScrn, FALSE); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (xf86IsPc98()) PC98TRIDENTEnable(pScrn); +#endif if (pTrident->TVChipset != 0) VIA_TVInit(pScrn); @@ -2787,7 +2792,10 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (!TRIDENTMapMem(pScrn)) return FALSE; - if (!xf86IsPc98()) { +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + if (!xf86IsPc98()) +#endif + { #ifdef VBE_INFO if (pTrident->vbeModes) { pTrident->pVbe = VBEInit(NULL,pTrident->pEnt->index); @@ -2801,7 +2809,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } } } - + hwp = VGAHWPTR(pScrn); if (IsPciCard && UseMMIO) { @@ -2818,9 +2826,12 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) * Some Trident chip on PC-9821 needs setup, * because VGA chip is not initialized by VGA BIOS. */ +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (IsPciCard && xf86IsPc98()) { PC98TRIDENTInit(pScrn); - } else tridentSetModeBIOS(pScrn,pScrn->currentMode); + } else +#endif + tridentSetModeBIOS(pScrn,pScrn->currentMode); /* Initialise the first mode */ if (!TRIDENTModeInit(pScrn, pScrn->currentMode)) @@ -3205,8 +3216,10 @@ TRIDENTLeaveVT(int scrnIndex, int flags) TRIDENTRestore(pScrn); vgaHWLock(hwp); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (xf86IsPc98()) PC98TRIDENTDisable(pScrn); +#endif if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn); } @@ -3230,15 +3243,18 @@ TRIDENTCloseScreen(int scrnIndex, ScreenPtr pScreen) pTrident->AccelInfoRec->Sync(pScrn); else if (!pTrident->NoAccel && pTrident->useEXA) pTrident->EXADriverPtr->WaitMarker(pScreen, 0); - + +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (xf86IsPc98()) PC98TRIDENTDisable(pScrn); +#endif TRIDENTRestore(pScrn); vgaHWLock(hwp); if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn); TRIDENTUnmapMem(pScrn); } + if (pTrident->AccelInfoRec) XAADestroyInfoRec(pTrident->AccelInfoRec); if (pTrident->EXADriverPtr) { @@ -3329,8 +3345,10 @@ TRIDENTEnableMMIO(ScrnInfoPtr pScrn) * Skip MMIO Enable in PC-9821 PCI Trident Card!! * Because of lack of non PCI VGA port */ +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (IsPciCard && xf86IsPc98()) return; +#endif /* Goto New Mode */ outb(pTrident->PIOBase + 0x3C4, 0x0B); @@ -3371,8 +3389,10 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn) * Skip MMIO Disable in PC-9821 PCI Trident Card!! * Because of lack of non PCI VGA port */ +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (IsPciCard && xf86IsPc98()) return; +#endif /* Goto New Mode */ OUTB(0x3C4, 0x0B); temp = INB(0x3C5); @@ -3400,6 +3420,7 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn) outb(pTrident->PIOBase + 0x3C5, temp); } +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 /* Initialize VGA Block for Trident Chip on PC-98x1 */ static void PC98TRIDENTInit(ScrnInfoPtr pScrn) @@ -3642,7 +3663,7 @@ PC98TRIDENT96xxDisable(ScrnInfoPtr pScrn) outb(0x6A, 0x06); outb(0x68, 0x0F); } - +#endif /* * This is a terrible hack! If we are on a notebook in a stretched diff --git a/src/trident_video.c b/src/trident_video.c index 1ed7db2..0ae1d14 100644 --- a/src/trident_video.c +++ b/src/trident_video.c @@ -1342,7 +1342,10 @@ WaitForVBlank(ScrnInfoPtr pScrn) * full vblank has passed. * - Alan. */ - if (!xf86IsPc98()) { +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + if (!xf86IsPc98()) +#endif + { WAITFORVSYNC; WAITFORVSYNC; } commit b20007d04b9198188fd214d3ed7d850dd613bc97 Author: Jeremy Huddleston <[email protected]> Date: Wed Oct 19 00:56:32 2011 -0700 Use uint32_t instead of deprecated PCITAG Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/trident.h b/src/trident.h index 332a2c2..a28c9fc 100644 --- a/src/trident.h +++ b/src/trident.h @@ -70,7 +70,7 @@ typedef struct { typedef struct { ScrnInfoPtr pScrn; pciVideoPtr PciInfo; - PCITAG PciTag; + uint32_t PciTag; EntityInfoPtr pEnt; ExaDriverPtr EXADriverPtr; int useEXA; commit da09f04b6d7da1ca10ce9d20a00d8ac9f2c0adb7 Author: Jeremy Huddleston <[email protected]> Date: Wed Oct 19 00:55:17 2011 -0700 Build fix for ABI Version 12 ABI Version 12 removes support for multiple PCI domains. If you need to use this driver on a system with more than one PCI domain, you should either port this driver to using libpciaccess directly or stick with an older server. Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/trident_driver.c b/src/trident_driver.c index 2d9d0de..addf36e 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -1109,7 +1109,12 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) hwp = VGAHWPTR(pScrn); vgaHWGetIOBase(hwp); vgaIOBase = hwp->IOBase; + +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 pTrident->PIOBase = hwp->PIOOffset; +#else + pTrident->PIOBase = 0; +#endif #ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVga, pTrident->pEnt->index, ResUnusedOpr); commit 0bd545e1301d55c5874484f2a4a7952b6eca48c0 Author: Jeremy Huddleston <[email protected]> Date: Wed Oct 19 00:52:09 2011 -0700 Use unsigned long rather than deprecated IOADDRESS Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/trident.h b/src/trident.h index c15d39c..332a2c2 100644 --- a/src/trident.h +++ b/src/trident.h @@ -85,7 +85,7 @@ typedef struct { unsigned char * IOBase; unsigned char * FbBase; long FbMapSize; - IOADDRESS PIOBase; + unsigned long PIOBase; Bool NoAccel; Bool HWCursor; Bool UsePCIRetry; diff --git a/src/trident_driver.c b/src/trident_driver.c index 4a03ac6..2d9d0de 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -3317,7 +3317,7 @@ static void TRIDENTEnableMMIO(ScrnInfoPtr pScrn) { TRIDENTPtr pTrident = TRIDENTPTR(pScrn); - IOADDRESS vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase; + unsigned long vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase; CARD8 temp = 0, protect = 0; /* commit de79bbea800f75b3c9ff13cd38450d32a24da5b7 Author: Trevor Woerner <[email protected]> Date: Fri Oct 22 21:05:08 2010 -0400 Update xf86dgastr.h include. Reviewed-by: Mikhail Gusarov <[email protected]> Signed-off-by: Trevor Woerner <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/src/trident_driver.c b/src/trident_driver.c index ecf99f0..4a03ac6 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -63,7 +63,7 @@ #ifdef XFreeXDGA #define _XF86DGA_SERVER_ -#include <X11/extensions/xf86dgastr.h> +#include <X11/extensions/xf86dgaproto.h> #endif #include "globals.h" commit ea4552f158f6f8f30045b934feffd303260f3197 Author: Trevor Woerner <[email protected]> Date: Fri Oct 22 21:04:53 2010 -0400 Convert x+m/calloc/free to m/calloc/free. Reviewed-by: Mikhail Gusarov <[email protected]> Signed-off-by: Trevor Woerner <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/src/trident_dga.c b/src/trident_dga.c index 78fa8f4..dd836a6 100644 --- a/src/trident_dga.c +++ b/src/trident_dga.c @@ -83,15 +83,15 @@ TRIDENTDGAInit(ScreenPtr pScreen) while(pMode) { 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/trident_driver.c b/src/trident_driver.c index 31cbb83..ecf99f0 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -560,7 +560,7 @@ TRIDENTFreeRec(ScrnInfoPtr pScrn) { if (pScrn->driverPrivate == NULL) return; - xfree(pScrn->driverPrivate); + free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; } @@ -900,7 +900,7 @@ TRIDENTProbe(DriverPtr drv, int flags) foundScreen = TRUE; } } - xfree(usedChips); + free(usedChips); } } @@ -933,11 +933,11 @@ TRIDENTProbe(DriverPtr drv, int flags) foundScreen = TRUE; } } - xfree(usedChips); + free(usedChips); } #endif - xfree(devSections); + free(devSections); return foundScreen; } @@ -1163,7 +1163,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) xf86CollectOptions(pScrn, NULL); /* Process the options */ - if (!(pTrident->Options = xalloc(sizeof(TRIDENTOptions)))) + if (!(pTrident->Options = malloc(sizeof(TRIDENTOptions)))) return FALSE; memcpy(pTrident->Options, TRIDENTOptions, sizeof(TRIDENTOptions)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTrident->Options); @@ -2868,7 +2868,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if(pTrident->ShadowFB) { pTrident->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); - pTrident->ShadowPtr = xalloc(pTrident->ShadowPitch * height); + pTrident->ShadowPtr = malloc(pTrident->ShadowPitch * height); displayWidth = pTrident->ShadowPitch / (pScrn->bitsPerPixel >> 3); FBStart = pTrident->ShadowPtr; } else { @@ -2958,7 +2958,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) (miBankProcPtr)TVGA8900SetReadWrite; if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY, pScrn->displayWidth, pBankInfo)) { - xfree(pBankInfo); + free(pBankInfo); pBankInfo = NULL; if (pTrident->pVbe) vbeFree(pTrident->pVbe); @@ -3238,15 +3238,15 @@ TRIDENTCloseScreen(int scrnIndex, ScreenPtr pScreen) XAADestroyInfoRec(pTrident->AccelInfoRec); if (pTrident->EXADriverPtr) { exaDriverFini(pScreen); - xfree(pTrident->EXADriverPtr); + free(pTrident->EXADriverPtr); pTrident->EXADriverPtr = NULL; } if (pTrident->CursorInfoRec) xf86DestroyCursorInfoRec(pTrident->CursorInfoRec); if (pTrident->ShadowPtr) - xfree(pTrident->ShadowPtr); + free(pTrident->ShadowPtr); if (pTrident->DGAModes) - xfree(pTrident->DGAModes); + free(pTrident->DGAModes); pScrn->vtSema = FALSE; if(pTrident->BlockHandler) diff --git a/src/trident_video.c b/src/trident_video.c index 0c5497b..1ed7db2 100644 --- a/src/trident_video.c +++ b/src/trident_video.c @@ -125,7 +125,7 @@ void TRIDENTInitVideo(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)); @@ -140,7 +140,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen) xf86XVScreenInit(pScreen, adaptors, num_adaptors); if(newAdaptors) - xfree(newAdaptors); + free(newAdaptors); if (pTrident->videoFlags) xf86DrvMsgVerb(pScrn->scrnIndex,X_INFO,3, @@ -321,7 +321,7 @@ TRIDENTSetupImageVideo(ScreenPtr pScreen) XF86VideoAdaptorPtr adapt; TRIDENTPortPrivPtr pPriv; - if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + + if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + sizeof(TRIDENTPortPrivRec) + sizeof(DevUnion)))) return NULL; @@ -978,18 +978,18 @@ TRIDENTAllocateSurface( surface->width = w; surface->height = h; - if(!(surface->pitches = xalloc(sizeof(int)))) { + if(!(surface->pitches = malloc(sizeof(int)))) { xf86FreeOffscreenLinear(linear); return BadAlloc; } - if(!(surface->offsets = xalloc(sizeof(int)))) { - xfree(surface->pitches); + if(!(surface->offsets = malloc(sizeof(int)))) { + free(surface->pitches); xf86FreeOffscreenLinear(linear); return BadAlloc; } - if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) { - xfree(surface->pitches); - xfree(surface->offsets); + if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) { + free(surface->pitches); + free(surface->offsets); xf86FreeOffscreenLinear(linear); return BadAlloc; } @@ -1034,9 +1034,9 @@ TRIDENTFreeSurface( if(pPriv->isOn) TRIDENTStopSurface(surface); xf86FreeOffscreenLinear(pPriv->linear); - xfree(surface->pitches); - xfree(surface->offsets); - xfree(surface->devPrivate.ptr); + free(surface->pitches); + free(surface->offsets); + free(surface->devPrivate.ptr); return Success; } @@ -1128,7 +1128,7 @@ TRIDENTInitOffscreenImages(ScreenPtr pScreen) XF86OffscreenImagePtr offscreenImages; /* need to free this someplace */ - if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec)))) + if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec)))) return; offscreenImages[0].image = &Images[0]; commit 4334153785449d4c0c1e7daca6030c9847f7343f Author: Jesse Adkins <[email protected]> Date: Tue Sep 28 13:29:52 2010 -0700 Purge cvs tags. Signed-off-by: Jesse Adkins <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/man/trident.man b/man/trident.man index 8d04ed0..f461e10 100644 --- a/man/trident.man +++ b/man/trident.man @@ -1,4 +1,3 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man,v 1.14 2003/05/29 21:48:09 herrb Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH TRIDENT __drivermansuffix__ __vendorversion__ commit 30a00b13dc0dd2f6f07269b0e9116b78b290c109 Author: Gaetan Nadon <[email protected]> Date: Wed Jul 21 16:49:04 2010 -0400 config: add comments for main statements diff --git a/configure.ac b/configure.ac index 0f08c4c..0fc2066 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-trident], [1.3.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-trident]) - 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,26 +40,27 @@ 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) XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) -# 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]), @@ -89,7 +90,6 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) # Checks for libraries. - AC_SUBST([moduledir]) DRIVER_NAME=trident commit 842b0be89bf466a7d8fb20aff3f72cb213ba7f7e Author: Gaetan Nadon <[email protected]> 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 <[email protected]> diff --git a/configure.ac b/configure.ac index 8101e1c..0f08c4c 100644 --- a/configure.ac +++ b/configure.ac @@ -95,8 +95,9 @@ AC_SUBST([moduledir]) DRIVER_NAME=trident AC_SUBST([DRIVER_NAME]) -AC_OUTPUT([ - Makefile - src/Makefile - man/Makefile +AC_CONFIG_FILES([ + Makefile + src/Makefile + man/Makefile ]) +AC_OUTPUT commit f782f14b2a8952e9b314662bd749237f96fcb677 Author: Gaetan Nadon <[email protected]> Date: Wed Jul 21 14:37:42 2010 -0400 config: replace deprecated AC_HELP_STRING with AS_HELP_STRING Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 5114491..8101e1c 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 9efe436169c158f8ba8bc81ba59edd9d17beedf8 Author: Gaetan Nadon <[email protected]> Date: Wed Jul 21 14:05:23 2010 -0400 config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index c34eaca..5114491 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_INIT([xf86-video-trident], [xf86-video-trident]) 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 644e1b0dd2e40f59125aab506cd07aa0cb1e5235 Author: Gaetan Nadon <[email protected]> Date: Wed Jul 21 09:27:42 2010 -0400 config: complete AC_INIT m4 quoting Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index e748ff8..c34eaca 100644 --- a/configure.ac +++ b/configure.ac @@ -22,9 +22,9 @@ AC_PREREQ([2.60]) AC_INIT([xf86-video-trident], - 1.3.4, + [1.3.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - xf86-video-trident) + [xf86-video-trident]) AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) commit e7b6fa53fc713d0966810afce530897b65456a4c Author: Gaetan Nadon <[email protected]> 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 <[email protected]> diff --git a/configure.ac b/configure.ac index 9c4571e..e748ff8 100644 --- a/configure.ac +++ b/configure.ac @@ -90,7 +90,6 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) # Checks for libraries. -AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) DRIVER_NAME=trident commit 8b8c3e5731b3347ebc7af6bf7016de884f6b21cb Author: Gaetan Nadon <[email protected]> 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 <[email protected]> diff --git a/configure.ac b/configure.ac index b733e13..9c4571e 100644 --- a/configure.ac +++ b/configure.ac @@ -89,8 +89,6 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) # Checks for libraries. -# Checks for header files. -AC_HEADER_STDC AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) commit 54d16a46f2381deb05c73a5356f5e77f008ad91e Author: Gaetan Nadon <[email protected]> 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 <[email protected]> diff --git a/configure.ac b/configure.ac index 8e6587d..b733e13 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 9a48f395cde9551ee231171436a6eda82575ae56 Author: Gaetan Nadon <[email protected]> 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 <[email protected]> diff --git a/configure.ac b/configure.ac index 81e746a..8e6587d 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-trident], 1.3.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], commit 13be9ab4c85dc2a8b2dc7c93df65d50413073041 Author: Gaetan Nadon <[email protected]> Date: Tue Jul 20 16:15:30 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 be54427..81e746a 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 = @[email protected] 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 b5d17329ae1746bc95ac211c1325df86982e0eb1 Author: Dave Airlie <[email protected]> Date: Mon Jul 5 14:32:39 2010 +1000 trident 1.3.4 diff --git a/configure.ac b/configure.ac index ebff147..be54427 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-trident], - 1.3.3, + 1.3.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-trident) commit ea2f02a84ad5a51a39c0ae55fa5aa785360d3830 Author: Gaetan Nadon <[email protected]> Date: Sun Jun 13 12:34:21 2010 -0400 COPYING: replace stub file with actual Copyright notices. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/COPYING b/COPYING index 7f33cbf..42cdf3b 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,63 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1992-2003 by Alan Hourihane, North Wales, UK. -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, distribute, and sell this software and its -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
