xserver-xorg-video-mach64: Changes to 'upstream-unstable'
.gitignore | 84 +++--
Makefile.am | 15
README | 830 ++++++++++++++++++++++++++++++++++++++++++++++++++-
README.ati | 828 --------------------------------------------------
README.ati.sgml | 648 ---------------------------------------
configure.ac | 60 +--
man/Makefile.am | 64 +--
src/aticonfig.c | 2
src/aticonsole.c | 27 -
src/atidga.c | 2
src/atidri.c | 54 +--
src/atii2c.c | 8
src/atimach64exa.c | 2
src/atimach64i2c.c | 2
src/atimach64probe.c | 4
src/atimach64xv.c | 11
src/atimode.c | 2
src/atipreinit.c | 2
src/atiscreen.c | 22 -
19 files changed, 1013 insertions(+), 1654 deletions(-)
New commits:
commit ef55d1f123972ccc001bf8b41db45d281be35a62
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 28 17:23:42 2011 +0200
Bump to 6.9.0
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index f5ba21d..e4ab861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-mach64],
- [6.8.2],
+ [6.9.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-mach64])
AC_CONFIG_SRCDIR([Makefile.am])
commit 39c6d1da8af563afa665d5bb149c9693e24c6eab
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 28 17:31:52 2011 +0200
Replace deprecated xalloc/xfree/xrealloc with malloc/free/realloc
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/aticonfig.c b/src/aticonfig.c
index 9102497..621e79e 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -502,5 +502,5 @@ ATIProcessOptions
#endif
}
- xfree(PublicOption);
+ free(PublicOption);
}
diff --git a/src/aticonsole.c b/src/aticonsole.c
index 6e742d9..50cc6e1 100644
--- a/src/aticonsole.c
+++ b/src/aticonsole.c
@@ -799,19 +799,19 @@ ATIFreeScreen
#ifndef AVOID_CPIO
- xfree(pATI->OldHW.frame_buffer);
- xfree(pATI->NewHW.frame_buffer);
+ free(pATI->OldHW.frame_buffer);
+ free(pATI->NewHW.frame_buffer);
#endif /* AVOID_CPIO */
- xfree(pATI->pShadow);
+ free(pATI->pShadow);
#ifndef AVOID_DGA
- xfree(pATI->pDGAMode);
+ free(pATI->pDGAMode);
#endif /* AVOID_DGA */
- xfree(pATI);
+ free(pATI);
pScreenInfo->driverPrivate = NULL;
}
diff --git a/src/atidga.c b/src/atidga.c
index fb6d1d7..c1cd163 100644
--- a/src/atidga.c
+++ b/src/atidga.c
@@ -324,7 +324,7 @@ ATIDGAAddModes
if ((modePitch * bitsPerPixel * pMode->VDisplay) <= videoBits)
{
/* Stop generating modes on out-of-memory conditions */
- pDGAMode = xrealloc(pATI->pDGAMode,
+ pDGAMode = realloc(pATI->pDGAMode,
(pATI->nDGAMode + 1) * SizeOf(DGAModeRec));
if (!pDGAMode)
break;
diff --git a/src/atidri.c b/src/atidri.c
index 15d0014..9c6719b 100644
--- a/src/atidri.c
+++ b/src/atidri.c
@@ -109,14 +109,14 @@ static Bool ATIInitVisualConfigs( ScreenPtr pScreen )
pATIConfigs = (ATIConfigPrivPtr)
xnfcalloc( sizeof(ATIConfigPrivRec), numConfigs );
if ( !pATIConfigs ) {
- xfree( pConfigs );
+ free( pConfigs );
return FALSE;
}
pATIConfigPtrs = (ATIConfigPrivPtr*)
xnfcalloc( sizeof(ATIConfigPrivPtr), numConfigs );
if ( !pATIConfigPtrs ) {
- xfree( pConfigs );
- xfree( pATIConfigs );
+ free( pConfigs );
+ free( pATIConfigs );
return FALSE;
}
@@ -190,14 +190,14 @@ static Bool ATIInitVisualConfigs( ScreenPtr pScreen )
pATIConfigs = (ATIConfigPrivPtr)
xnfcalloc( sizeof(ATIConfigPrivRec), numConfigs );
if ( !pATIConfigs ) {
- xfree( pConfigs );
+ free( pConfigs );
return FALSE;
}
pATIConfigPtrs = (ATIConfigPrivPtr*)
xnfcalloc( sizeof(ATIConfigPrivPtr), numConfigs );
if ( !pATIConfigPtrs ) {
- xfree( pConfigs );
- xfree( pATIConfigs );
+ free( pConfigs );
+ free( pATIConfigs );
return FALSE;
}
@@ -553,11 +553,11 @@ static void ATIDRIMoveBuffers( WindowPtr pWin, DDXPointRec ptOldOrg,
if (nbox > 1) {
/* Keep ordering in each band, reverse order of bands */
- pboxNew1 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox);
+ pboxNew1 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
if (!pboxNew1) return;
- pptNew1 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox);
+ pptNew1 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
if (!pptNew1) {
- xfree(pboxNew1);
+ free(pboxNew1);
return;
}
pboxBase = pboxNext = pbox+nbox-1;
@@ -588,13 +588,13 @@ static void ATIDRIMoveBuffers( WindowPtr pWin, DDXPointRec ptOldOrg,
if (nbox > 1) {
/* reverse order of rects in each band */
- pboxNew2 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox);
- pptNew2 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox);
+ pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
+ pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
if (!pboxNew2 || !pptNew2) {
- xfree(pptNew2);
- xfree(pboxNew2);
- xfree(pptNew1);
- xfree(pboxNew1);
+ free(pptNew2);
+ free(pboxNew2);
+ free(pptNew1);
+ free(pboxNew1);
return;
}
pboxBase = pboxNext = pbox;
@@ -665,10 +665,10 @@ static void ATIDRIMoveBuffers( WindowPtr pWin, DDXPointRec ptOldOrg,
outf(SRC_OFF_PITCH, pATI->NewHW.dst_off_pitch);
outf(DST_OFF_PITCH, pATI->NewHW.src_off_pitch);
- xfree(pptNew2);
- xfree(pboxNew2);
- xfree(pptNew1);
- xfree(pboxNew1);
+ free(pptNew2);
+ free(pboxNew2);
+ free(pptNew1);
+ free(pboxNew1);
ATIDRIMarkSyncInt(pScreenInfo);
#endif
@@ -1237,7 +1237,7 @@ Bool ATIDRIScreenInit( ScreenPtr pScreen )
if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
pDRIInfo->busIdString = DRICreatePCIBusID(pATI->PCIInfo);
} else {
- pDRIInfo->busIdString = xalloc( 64 );
+ pDRIInfo->busIdString = malloc( 64 );
sprintf( pDRIInfo->busIdString,
"PCI:%d:%d:%d",
PCI_DEV_BUS(pATI->PCIInfo),
@@ -1283,7 +1283,7 @@ Bool ATIDRIScreenInit( ScreenPtr pScreen )
pATIDRIServer = (ATIDRIServerInfoPtr)
xnfcalloc( sizeof(ATIDRIServerInfoRec), 1 );
if ( !pATIDRIServer ) {
- xfree( pATIDRI );
+ free( pATIDRI );
DRIDestroyInfoRec( pATI->pDRIInfo );
pATI->pDRIInfo = NULL;
xf86DrvMsg( pScreenInfo->scrnIndex, X_ERROR,
@@ -1322,9 +1322,9 @@ Bool ATIDRIScreenInit( ScreenPtr pScreen )
pATI->have3DWindows = FALSE;
if ( !DRIScreenInit( pScreen, pDRIInfo, &pATI->drmFD ) ) {
- xfree( pATIDRIServer );
+ free( pATIDRIServer );
pATI->pDRIServerInfo = NULL;
- xfree( pDRIInfo->devPrivate );
+ free( pDRIInfo->devPrivate );
pDRIInfo->devPrivate = NULL;
DRIDestroyInfoRec( pDRIInfo );
pDRIInfo = NULL;
@@ -1619,22 +1619,22 @@ void ATIDRICloseScreen( ScreenPtr pScreen )
/* De-allocate all DRI data structures */
if ( pATI->pDRIInfo ) {
if ( pATI->pDRIInfo->devPrivate ) {
- xfree( pATI->pDRIInfo->devPrivate );
+ free( pATI->pDRIInfo->devPrivate );
pATI->pDRIInfo->devPrivate = NULL;
}
DRIDestroyInfoRec( pATI->pDRIInfo );
pATI->pDRIInfo = NULL;
}
if ( pATI->pDRIServerInfo ) {
- xfree( pATI->pDRIServerInfo );
+ free( pATI->pDRIServerInfo );
pATI->pDRIServerInfo = NULL;
}
if ( pATI->pVisualConfigs ) {
- xfree( pATI->pVisualConfigs );
+ free( pATI->pVisualConfigs );
pATI->pVisualConfigs = NULL;
}
if ( pATI->pVisualConfigsPriv ) {
- xfree( pATI->pVisualConfigsPriv );
+ free( pATI->pVisualConfigsPriv );
pATI->pVisualConfigsPriv = NULL;
}
}
diff --git a/src/atii2c.c b/src/atii2c.c
index a13d647..6e3a7ef 100644
--- a/src/atii2c.c
+++ b/src/atii2c.c
@@ -324,7 +324,7 @@ ATICreateI2CBusRec
if (!(pI2CBus = xf86CreateI2CBusRec()))
{
xf86DrvMsg(iScreen, X_WARNING, "Unable to allocate I2C Bus record.\n");
- xfree(pATII2C);
+ free(pATII2C);
return NULL;
}
@@ -348,7 +348,7 @@ ATICreateI2CBusRec
xf86DrvMsg(iScreen, X_WARNING,
"I2C bus %s initialisation failure.\n", BusName);
xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE);
- xfree(pATII2C);
+ free(pATII2C);
return NULL;
}
@@ -392,8 +392,8 @@ ATII2CFreeScreen
pATII2C = pI2CBus->DriverPrivate.ptr;
xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE);
- xfree(pATII2C);
+ free(pATII2C);
}
- xfree(ppI2CBus);
+ free(ppI2CBus);
}
diff --git a/src/atimach64exa.c b/src/atimach64exa.c
index 67c5f22..a3e49bf 100644
--- a/src/atimach64exa.c
+++ b/src/atimach64exa.c
@@ -686,7 +686,7 @@ Bool ATIMach64ExaInit(ScreenPtr pScreen)
pATI->RenderAccelEnabled ? "enabled" : "disabled");
if (!exaDriverInit(pScreen, pATI->pExa)) {
- xfree(pATI->pExa);
+ free(pATI->pExa);
pATI->pExa = NULL;
return FALSE;
}
diff --git a/src/atimach64i2c.c b/src/atimach64i2c.c
index 0f7d797..2f243e5 100644
--- a/src/atimach64i2c.c
+++ b/src/atimach64i2c.c
@@ -347,7 +347,7 @@ ATITVAddOnProbe
return TRUE;
}
- xfree(pI2CDev);
+ free(pI2CDev);
return FALSE;
}
diff --git a/src/atimach64probe.c b/src/atimach64probe.c
index 2d554e1..0117920 100644
--- a/src/atimach64probe.c
+++ b/src/atimach64probe.c
@@ -234,7 +234,7 @@ Mach64Probe(DriverPtr pDriver, int flags)
Mach64Chipsets, Mach64PciChipsets,
devSections, numDevSections,
pDriver, &usedChips);
- xfree(devSections);
+ free(devSections);
if (numUsed <= 0)
return FALSE;
@@ -248,7 +248,7 @@ Mach64Probe(DriverPtr pDriver, int flags)
}
}
- xfree(usedChips);
+ free(usedChips);
return ProbeSuccess;
}
diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index 2c9b812..66bd953 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -1467,8 +1467,8 @@ ATIMach64XVInitialiseAdaptor
if (pppAdaptor)
*pppAdaptor = ppAdaptor;
else {
- xfree(ppAdaptor[0]);
- xfree(ppAdaptor);
+ free(ppAdaptor[0]);
+ free(ppAdaptor);
}
return 1;
@@ -1505,9 +1505,9 @@ ATIXVFreeAdaptorInfo
return;
while (nAdaptor > 0)
- xfree(ppAdaptor[--nAdaptor]);
+ free(ppAdaptor[--nAdaptor]);
- xfree(ppAdaptor);
+ free(ppAdaptor);
}
/*
diff --git a/src/atimode.c b/src/atimode.c
index d1b3198..00817f0 100644
--- a/src/atimode.c
+++ b/src/atimode.c
@@ -114,7 +114,7 @@ ATISwap
if (!pATIHW->frame_buffer)
{
pATIHW->frame_buffer =
- (pointer)xalloc(pATIHW->nBank * pATIHW->nPlane * 0x00010000U);
+ (pointer)malloc(pATIHW->nBank * pATIHW->nPlane * 0x00010000U);
if (!pATIHW->frame_buffer)
{
xf86DrvMsg(iScreen, X_WARNING,
diff --git a/src/atipreinit.c b/src/atipreinit.c
index 34b851c..2776a48 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -560,7 +560,7 @@ ATIPreInit
pATI->Chip = pEntity->chipset;
pVideo = xf86GetPciInfoForEntity(pATI->iEntity);
- xfree(pEntity);
+ free(pEntity);
#ifndef XSERVER_LIBPCIACCESS
if (!pResources)
diff --git a/src/atiscreen.c b/src/atiscreen.c
index cf79c37..f8e23c9 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -388,7 +388,7 @@ ATIScreenInit
{
pATI->FBBytesPerPixel = pATI->bitsPerPixel >> 3;
pATI->FBPitch = PixmapBytePad(pATI->displayWidth, pATI->depth);
- if ((pATI->pShadow = xalloc(pATI->FBPitch * pScreenInfo->virtualY)))
+ if ((pATI->pShadow = malloc(pATI->FBPitch * pScreenInfo->virtualY)))
{
pFB = pATI->pShadow;
}
@@ -646,7 +646,7 @@ ATICloseScreen
if (pATI->pExa)
{
exaDriverFini(pScreen);
- xfree(pATI->pExa);
+ free(pATI->pExa);
pATI->pExa = NULL;
}
#endif
@@ -669,13 +669,13 @@ ATICloseScreen
#ifdef USE_XAA
if (!pATI->useEXA)
{
- xfree(pATI->ExpansionBitmapScanlinePtr[1]);
+ free(pATI->ExpansionBitmapScanlinePtr[1]);
pATI->ExpansionBitmapScanlinePtr[0] = NULL;
pATI->ExpansionBitmapScanlinePtr[1] = NULL;
}
#endif
- xfree(pATI->pShadow);
+ free(pATI->pShadow);
pATI->pShadow = NULL;
pScreenInfo->pScreen = NULL;
commit d60087f0b6dd4d082230312580ae35e14acd0c6e
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Dec 2 19:11:05 2010 +1000
mach64: fix the pixmap private API change.
diff --git a/src/aticonsole.c b/src/aticonsole.c
index 1be147e..6e742d9 100644
--- a/src/aticonsole.c
+++ b/src/aticonsole.c
@@ -28,6 +28,7 @@
#include "config.h"
#endif
+#include "xorgVersion.h"
#include "ati.h"
#include "aticonsole.h"
#include "atii2c.h"
@@ -689,7 +690,9 @@ ATIEnterVT
ScreenPtr pScreen = pScreenInfo->pScreen;
ATIPtr pATI = ATIPTR(pScreenInfo);
PixmapPtr pScreenPixmap;
+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
DevUnion PixmapPrivate;
+#endif
Bool Entered;
if (!ATIEnterGraphics(NULL, pScreenInfo, pATI))
@@ -714,19 +717,24 @@ ATIEnterVT
}
pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen);
+
+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
PixmapPrivate = pScreenPixmap->devPrivate;
if (!PixmapPrivate.ptr)
pScreenPixmap->devPrivate = pScreenInfo->pixmapPrivate;
+#endif
/* Tell framebuffer about remapped aperture */
Entered = (*pScreen->ModifyPixmapHeader)(pScreenPixmap,
-1, -1, -1, -1, -1, pATI->pMemory);
+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
if (!PixmapPrivate.ptr)
{
pScreenInfo->pixmapPrivate = pScreenPixmap->devPrivate;
pScreenPixmap->devPrivate.ptr = NULL;
}
+#endif
#ifdef XF86DRI_DEVEL
commit e7bc106247d9ba10a922936e137a4f5ecc54ef9e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 30 09:37:17 2010 -0700
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 664920f..43a05e1 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,5 @@
-# $Id$
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -20,7 +19,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-#
+#
drivermandir = $(DRIVER_MAN_DIR)
commit 1732886624c7590a8084bb7d92e87ff341aa6d66
Author: Mark Kettenis <kettenis@openbsd.org>
Date: Sun Aug 29 18:07:01 2010 +0200
Don't play wrapping games
The driver calls the wrapped CloseScreen function in the middle of messing
with the hardware state. On multi-card setups this may cause the VGA
arbiter to switch to a different card while we're in the middle of things,
with obvious disastrous effects. This fixes things by making sure we
only call the wrapped CloseScreen function at the very end of the driver's
CloseScreen function.
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
diff --git a/src/aticonsole.c b/src/aticonsole.c
index 8efe897..1be147e 100644
--- a/src/aticonsole.c
+++ b/src/aticonsole.c
@@ -784,17 +784,10 @@ ATIFreeScreen
int flags
)
{
- ScreenPtr pScreen = screenInfo.screens[iScreen];
ScrnInfoPtr pScreenInfo = xf86Screens[iScreen];
ATIPtr pATI = ATIPTR(pScreenInfo);
- if (pATI->Closeable || (serverGeneration > 1))
- ATII2CFreeScreen(iScreen);
-
- if (pATI->Closeable)
- (void)(*pScreen->CloseScreen)(iScreen, pScreen);
-
- ATILeaveGraphics(pScreenInfo, pATI);
+ ATII2CFreeScreen(iScreen);
#ifndef AVOID_CPIO
diff --git a/src/atiscreen.c b/src/atiscreen.c
index bc57934..cf79c37 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -628,7 +628,6 @@ ATICloseScreen
{
ScrnInfoPtr pScreenInfo = xf86Screens[iScreen];
ATIPtr pATI = ATIPTR(pScreenInfo);
- Bool Closed = TRUE;
#ifdef XF86DRI_DEVEL
@@ -658,21 +657,13 @@ ATICloseScreen
pATI->pXAAInfo = NULL;
}
#endif
-
- if ((pScreen->CloseScreen = pATI->CloseScreen))
- {
- pATI->CloseScreen = NULL;
- Closed = (*pScreen->CloseScreen)(iScreen, pScreen);
- }
-
- pATI->Closeable = FALSE;
-
if (pATI->pCursorInfo)
{
xf86DestroyCursorInfoRec(pATI->pCursorInfo);
pATI->pCursorInfo = NULL;
}
+ pATI->Closeable = FALSE;
ATILeaveGraphics(pScreenInfo, pATI);
#ifdef USE_XAA
@@ -688,5 +679,6 @@ ATICloseScreen
pATI->pShadow = NULL;
pScreenInfo->pScreen = NULL;
- return Closed;
+ pScreen->CloseScreen = pATI->CloseScreen;
+ return (*pScreen->CloseScreen)(iScreen, pScreen);
}
commit 7a1549678a19c6e94e1ecb3223c74effbd5009d2
Author: Mark Kettenis <kettenis@openbsd.org>
Date: Sun Aug 29 17:54:19 2010 +0200
Don't attempt to stop video on Mach64's without hardware overlay support
Older Mach64 variants don't have hardware overlay support. This is handled
properly when the XVideo adapter is initialized (we bail out early), but
ATICloseXVideo() unconditionally tries to stop video during screen termination.
This causes the server to hang on certain multi-card setups. Fix the issue
by checking Block1Base before proceeding with stopping video.
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index 21cd890..2c9b812 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -1552,6 +1552,9 @@ ATICloseXVideo
ATIPtr pATI
)
{
+ if (!pATI->Block1Base)
+ return;
+
ATIMach64StopVideo(pScreenInfo, pATI, TRUE);
REGION_UNINIT(pScreen, &pATI->VideoClip);
commit 88a176df8df09812719eb179b293ce4dc851f2e5
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 7bf67e2..f5ba21d 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-mach64],
[6.8.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-mach64])
-
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,12 +40,13 @@ 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]]]),
@@ -63,13 +64,13 @@ AC_ARG_ENABLE(exa,
[EXA="$enableval"],
[EXA=yes])
-# 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.2 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]),
@@ -79,7 +80,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
# Checks for libraries.
-
if test "$DRI" != no; then
AC_CHECK_FILE([${sdkdir}/dri.h],
[have_dri_h="yes"], [have_dri_h="no"])
commit 18ee3aa1b7a4c9de9cc705cb10e05864d3ab6406
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 5940ec6..7bf67e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,8 +222,9 @@ AC_MSG_NOTICE(
[ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati]
)
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT
commit d061e00d4d09e8fbecc8bad95354551d36197dd4
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 cbaabd8..5940ec6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,18 +47,18 @@ 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"])
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
[Disable DRI support [[default=auto]]]),
[DRI="$enableval"],
[DRI=auto])
AC_ARG_ENABLE(exa,
- AC_HELP_STRING([--disable-exa],
+ AS_HELP_STRING([--disable-exa],
[Disable EXA support [[default=enabled]]]),
[EXA="$enableval"],
[EXA=yes])
commit 69da993c9bdb8982c650533ca44a34fa2d7589fa
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:22 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 ea162ed..cbaabd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-mach64],
[xf86-video-mach64])
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 37f35b579e9ea1a4b5b50f3ae570e3329664c38e
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 0cd2881..ea162ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-mach64],
- 6.8.2,
+ [6.8.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-mach64)
+ [xf86-video-mach64])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
commit 1cb6b6939e5d466797721a2e59afdd067e769fcc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:54:11 2010 -0400
config: remove unrequired AC_SUBST([DRI_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 79c7b79..0cd2881 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,7 +211,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-AC_SUBST([DRI_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=mach64
commit 590d1989f22c38d8db01146b2207d440bc59f285
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:44:57 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 415cdca..79c7b79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,7 +211,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([DRI_CFLAGS])
AC_SUBST([moduledir])
commit 7bf12fb07625bd5503c5de3e5e07bd69c6de54b3
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 8574263..415cdca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,8 +79,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
# Checks for libraries.
-# Checks for header files.
-AC_HEADER_STDC
if test "$DRI" != no; then
AC_CHECK_FILE([${sdkdir}/dri.h],
commit 3518273c2117c0d8e51efecb2f9184d5f8274ae0
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 f0075e1..8574263 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 03dd23597e64f440e5530bd8bfbd222b8f825d5a
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 abfe77a..f0075e1 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-mach64],
6.8.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit d5b5e2bb4139b723df35a422b945d514caf4db2d
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 d8b0d6a..abfe77a 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
-m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# 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.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 141abc8..664920f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -32,25 +32,11 @@ EXTRA_DIST =
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 6da9520fe6c482c1d4cb9dd6119c13789ed9715a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Jun 21 10:37:11 2010 -0400
config: remove optional check for xf86miscproto
This extension is obsolete and is not used by this driver.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index f76c715..d8b0d6a 100644
Reply to: