xf86-video-nv: 2 commits - ChangeLog configure.ac src/nv_const.h src/riva_const.h src/riva_driver.c
Aaron Plattner
aplattner at kemper.freedesktop.org
Sat Jun 17 04:03:45 EEST 2006
ChangeLog | 127 ------------------------------------------------------
configure.ac | 10 ++++
src/nv_const.h | 3 -
src/riva_const.h | 3 -
src/riva_driver.c | 2
5 files changed, 11 insertions(+), 134 deletions(-)
New commits:
diff-tree 04d344dfcbb9928cf33943a880de333557e14be9 (from eda3bac20dce2d5584ac07cc6b28a08ec55aa798)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Fri Jun 16 18:03:21 2006 -0700
Delete the ChangeLog. The git history is just as good.
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 7f01255..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,138 +0,0 @@
-2006-05-24 Aaron Plattner <aplattner at 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 at nvidia.com>
-
- * configure.ac:
- * src/nv_include.h:
- * src/nv_local.h:
- * src/nv_video.c:
- * src/riva_include.h:
- * src/riva_local.h:
- Add the libcwrapper back, conditionalized on the server version.
-
-2006-04-27 Aaron Plattner <aplattner at nvidia.com>
-
- * configure.ac:
- * src/nv_video.c:
- Determine whether PutImage hooks take a DrawablePtr by server version.
- Remove dependency on xorg-server >= 1.0.99.901.
-
-2006-04-25 Aaron Plattner <aplattner at nvidia.com>
-
- * configure.ac:
- * src/nv_const.h:
- Bump to 1.1.2 for new product names.
-
-2006-04-25 Aaron Plattner <aplattner at nvidia.com>
-
- * src/nv_driver.c:
- Add names for Quadro FX 5500, 3500, 1500, 560, 550, and 350.
-
-2006-04-07 Adam Jackson <ajax at freedesktop.org>
-
- * configure.ac:
- * src/nv_const.h:
- Bump to 1.1.1 for Xv changes.
-
-2006-04-07 Aaron Plattner <aplattner at nvidia.com>
-
- * src/nv_video.c: (NVPutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
-
-2006-04-07 Adam Jackson <ajax at freedesktop.org>
-
- * configure.ac:
- * src/nv_const.h:
- * src/nv_include.h:
- * src/nv_local.h:
- * src/nv_video.c:
- * src/riva_const.h:
- * src/riva_include.h:
- * src/riva_local.h:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
-
-2006-03-27 Aaron Plattner <aplattner at nvidia.com>
-
- Bump version to 1.0.2.0 for release.
-
-2006-03-09 Aaron Plattner <aplattner at nvidia.com>
-
- * src/nv_driver.c: (NVPreInit):
- * src/riva_driver.c: (RivaPreInit):
- Coverity nos. 868 and 869: Free the result of xf86GetEntityInfo.
-
-2006-01-24 Aaron Plattner <aplattner at nvidia.com>
-
- * src/nv_driver.c:
- Fix typo in PCI ID (reported by Stefan Dirsch).
- Patch from Mark Vojkovich to XFree86 CVS on 2006-01-23.
-
-2006-01-22 Aaron Plattner <aplattner at nvidia.com>
-
- * man/nv.man:
- * src/nv_driver.c: (NVProbe), (NVPreInit):
- * src/nv_hw.c: (nvGetClocks), (NVCalcStateExt), (NVLoadStateExt):
- New chip support from Mark Vojkovich's 2006-01-20 and 2006-01-21 XFree86 CVS
- updates.
-
-2006-01-01 Aaron Plattner <aplattner at nvidia.com>
-
- * man/nv.man:
- * src/nv_driver.c: (NVPreInit), (NVScreenInit), (NVRandRGetInfo),
- (NVRandRSetConfig), (NVDriverFunc):
- * src/nv_include.h:
- * src/nv_shadow.c: (NVRefreshArea8), (NVRefreshArea16),
- (NVRefreshArea32):
- * src/nv_type.h:
- Preliminary RandR rotation support.
- Bug #4708 <https://bugs.freedesktop.org/show_bug.cgi?id=4708>
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax at freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff-tree eda3bac20dce2d5584ac07cc6b28a08ec55aa798 (from 1a40c4a79b79034d191496726a27af8b0805dba6)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Wed May 24 15:05:22 2006 -0700
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.
diff --git a/ChangeLog b/ChangeLog
index 1df8806..7f01255 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-05-24 Aaron Plattner <aplattner at 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 at nvidia.com>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 31637e8..a44f78b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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(.)
diff --git a/src/nv_const.h b/src/nv_const.h
index 523c7ee..7a7bdea 100644
--- a/src/nv_const.h
+++ b/src/nv_const.h
@@ -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__ */
diff --git a/src/riva_const.h b/src/riva_const.h
index 8221dca..4949fc1 100644
--- a/src/riva_const.h
+++ b/src/riva_const.h
@@ -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__ */
diff --git a/src/riva_driver.c b/src/riva_driver.c
index c5e6ea0..e062995 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -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,
More information about the xorg-commit
mailing list