Commit 9d9c5718 authored by Ian Romanick's avatar Ian Romanick
Browse files

Bump version to 1.5.0.

parent 8966e206
......@@ -22,9 +22,10 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-xgi],
1.4.9,
1.5.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-xgi)
RELEASE_DATE="27 August 2007"
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
......@@ -108,7 +109,7 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
AC_SUBST([DRI_CFLAGS])
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_DEFINE_UNQUOTED(XGI_RELEASE_DATE, ["$RELEASE_DATE"], [Driver release])
DRIVER_NAME=xgi
AC_SUBST([DRIVER_NAME])
......
......@@ -79,20 +79,8 @@
#define PDEBUG5(p)
#endif
#include "xgi_ver.h"
/* Always unlock the registers (should be set!) */
#define UNLOCK_ALWAYS
/*
#define XGIDRIVERVERSIONYEAR 4
#define XGIDRIVERVERSIONMONTH 2
#define XGIDRIVERVERSIONDAY 26
#define XGIDRIVERREVISION 1
*/
#define XGIDRIVERIVERSION (XGIDRIVERVERSIONYEAR << 16) | \
(XGIDRIVERVERSIONMONTH << 8) | \
XGIDRIVERVERSIONDAY | \
(XGIDRIVERREVISION << 24)
#undef XGI_CP
......@@ -201,13 +189,9 @@
#define XGI_NAME "XGI"
#define XGI_DRIVER_NAME "xgi"
/*
#define XGI_MAJOR_VERSION 1
#define XGI_MINOR_VERSION 1
#define XGI_PATCHLEVEL 4
*/
#define XGI_CURRENT_VERSION ((XGI_MAJOR_VERSION << 16) | \
(XGI_MINOR_VERSION << 8) | XGI_PATCHLEVEL )
#define XGI_CURRENT_VERSION ((PACKAGE_VERSION_MAJOR << 16) | \
(PACKAGE_VERSION_MINOR << 8) | \
PACKAGE_VERSION_PATCHLEVEL)
/* pXGI->Flags (old series only) */
#define SYNCDRAM 0x00000001
......
......@@ -277,9 +277,9 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen)
pDRIInfo->drmDriverName = XGIKernelDriverName;
pDRIInfo->clientDriverName = XGIClientDriverName;
pDRIInfo->busIdString = DRICreatePCIBusID(pXGI->PciInfo);
pDRIInfo->ddxDriverMajorVersion = 0;
pDRIInfo->ddxDriverMinorVersion = 1;
pDRIInfo->ddxDriverPatchVersion = 0;
pDRIInfo->ddxDriverMajorVersion = PACKAGE_VERSION_MAJOR;
pDRIInfo->ddxDriverMinorVersion = PACKAGE_VERSION_MINOR;
pDRIInfo->ddxDriverPatchVersion = PACKAGE_VERSION_PATCHLEVEL;
pDRIInfo->frameBufferPhysicalAddress = pXGI->FbAddress;
pDRIInfo->frameBufferSize = pXGI->FbMapSize;
......
......@@ -326,7 +326,7 @@ static XF86ModuleVersionInfo xgiVersRec = {
#else
XF86_VERSION_CURRENT,
#endif
XGI_MAJOR_VERSION, XGI_MINOR_VERSION, XGI_PATCHLEVEL,
PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
#ifdef ABI_VIDEODRV_VERSION
ABI_VIDEODRV_VERSION,
......@@ -2286,9 +2286,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
*/
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"XGI driver (%d/%02d/%02d-%d)\n",
XGIDRIVERVERSIONYEAR + 2000, XGIDRIVERVERSIONMONTH,
XGIDRIVERVERSIONDAY, XGIDRIVERREVISION);
"XGI driver (%s)\n", XGI_RELEASE_DATE);
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Copyright (C) 2001-2004 Thomas Winischhofer <thomas@winischhofer.net> and others\n");
......
/* Copyright (C) 2003-2006 by XGI Technology, Taiwan.
*
* 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"), to deal in the Software without restriction, including
* without limitation on the rights to use, copy, modify, merge,
* publish, distribute, sublicense, and/or sell copies of the Software,
* and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial
* portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NON-INFRINGEMENT. IN NO EVENT SHALL XGI AND/OR
* ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
*/
/*****************************************************
* xgi_ver.h
* Generated from mkdrv shell script.
*
*
*
* Generate by 2006/08/25
*****************************************************/
#define XGI_MAJOR_VERSION 1
#define XGI_MINOR_VERSION 4
#define XGI_PATCHLEVEL 9
#define XGIDRIVERVERSIONYEAR 6
#define XGIDRIVERVERSIONMONTH 8
#define XGIDRIVERVERSIONDAY 25
#define XGIDRIVERREVISION 1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment