diff options
| author | Rhys Kidd <rhyskidd@gmail.com> | 2019-01-21 00:52:08 -0500 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2019-01-21 21:29:55 -0500 |
| commit | 9b2b008eb76c6f4c31d5f71ca01a06254a03f7c9 (patch) | |
| tree | 1c83e23a18b7794ccfe1d57f656be70f61234c07 | |
| parent | b098bdae321182d2f18d791e7f1c665dec21f571 (diff) | |
| download | xorg-driver-xf86-video-nouveau-9b2b008eb76c6f4c31d5f71ca01a06254a03f7c9.tar.gz | |
config, nv: Use xorg-macros PACKAGE_VERSION_{MAJOR, MINOR, PATCHLEVEL}
Use xorg-macros provided PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} rather
than rolling our own in xf86-video-nouveau.
Macro has been available since xorg-macros 1.1.5 (we rely on >= 1.8)
provided that XORG_DEFAULT_OPTIONS is called.
Fixes: b82aacd ("configure: require xorg-macros 1.8")
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/nv_driver.c | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 2fb8fcd..c9b8a66 100644 --- a/configure.ac +++ b/configure.ac @@ -26,15 +26,6 @@ AC_INIT([xf86-video-nouveau], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-nouveau]) -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_DEFINE_UNQUOTED([NV_DRIVER_DATE], [$(echo -n \";git log |head -3|tail -1|tr -d '\n';echo -n \")], [Driver date]) diff --git a/src/nv_driver.c b/src/nv_driver.c index a5d50c1..1d276cf 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -154,7 +154,7 @@ static XF86ModuleVersionInfo nouveauVersRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - NV_MAJOR_VERSION, NV_MINOR_VERSION, NV_PATCHLEVEL, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, |