Derive the module version numbers from the package version. This idea was

lifted from Michel Dänzer's similar code in xf86-video-ati.

Also, make the riva and nv driver versions match.
This commit is contained in:
Aaron Plattner
2006-05-24 15:05:22 -07:00
parent 1a40c4a79b
commit eda3bac20d
5 changed files with 22 additions and 7 deletions

View File

@@ -1,3 +1,14 @@
2006-05-24 Aaron Plattner <aplattner@nvidia.com>
* configure.ac:
* src/nv_const.h:
* src/riva_const.h:
Derive the module version numbers from the package version. This idea was
lifted from Michel Dänzer's similar code in xf86-video-ati.
* src/riva_driver.c:
Make the riva and nv driver versions match.
2006-04-27 Aaron Plattner <aplattner@nvidia.com>
* configure.ac:

View File

@@ -26,6 +26,16 @@ AC_INIT([xf86-video-nv],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-nv)
AC_DEFINE_UNQUOTED([NV_MAJOR_VERSION],
[$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\)\.[[0-9]]\.[[0-9]]/\1/')],
[Major version])
AC_DEFINE_UNQUOTED([NV_MINOR_VERSION],
[$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.\([[0-9]]\)\.[[0-9]]/\1/')],
[Minor version])
AC_DEFINE_UNQUOTED([NV_PATCHLEVEL],
[$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.[[0-9]]\.\([[0-9]]\)/\1/')],
[Patch version])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)

View File

@@ -6,9 +6,6 @@
#define NV_VERSION 4000
#define NV_NAME "NV"
#define NV_DRIVER_NAME "nv"
#define NV_MAJOR_VERSION 1
#define NV_MINOR_VERSION 1
#define NV_PATCHLEVEL 2
#endif /* __NV_CONST_H__ */

View File

@@ -6,9 +6,6 @@
#define RIVA_VERSION 4000
#define RIVA_NAME "RIVA128"
#define RIVA_DRIVER_NAME "riva128"
#define RIVA_MAJOR_VERSION 1
#define RIVA_MINOR_VERSION 1
#define RIVA_PATCHLEVEL 0
#endif /* __RIVA_CONST_H__ */

View File

@@ -177,7 +177,7 @@ static XF86ModuleVersionInfo rivaVersRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
RIVA_MAJOR_VERSION, RIVA_MINOR_VERSION, RIVA_PATCHLEVEL,
NV_MAJOR_VERSION, NV_MINOR_VERSION, NV_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,
MOD_CLASS_VIDEODRV,