Nouveau Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Rhys Kidd <rhyskidd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Subject: [PATCH xf86-video-nouveau 02/17] config, nv: Use xorg-macros PACKAGE_VERSION_{MAJOR, MINOR, PATCHLEVEL}
Date: Mon, 21 Jan 2019 00:52:08 -0500	[thread overview]
Message-ID: <20190121055223.7891-3-rhyskidd@gmail.com> (raw)
In-Reply-To: <20190121055223.7891-1-rhyskidd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

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>
---
 configure.ac    | 9 ---------
 src/nv_driver.c | 2 +-
 2 files changed, 1 insertion(+), 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,
-- 
2.19.1

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

  parent reply	other threads:[~2019-01-21  5:52 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-21  5:52 [PATCH xf86-video-nouveau 00/17] autotools configuration cleanups Rhys Kidd
     [not found] ` <20190121055223.7891-1-rhyskidd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 01/17] config: Fix typo in comment Rhys Kidd
2019-01-21  5:52   ` Rhys Kidd [this message]
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 03/17] config: Only check for presence of libdrm package once Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 04/17] config: Rely upon list.h as at least xorg-server 1.8 required Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 05/17] config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 06/17] gitignore: Update to mirror modern X.org drivers Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 07/17] config: libtoolize: put macros in AC_CONFIG_MACRO_DIR, 'm4' Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 08/17] config: Use XORG_DEFAULT_OPTIONS which replaces six XORG_* macros Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 09/17] config: remove unrequired AC_HEADER_STDC Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 10/17] config: Utilize util-macros 1.8 for additional man page support Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 11/17] config: Use LT_INIT option instead of AC_DISABLE_STATIC Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 12/17] config: Add comments for main statements Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 13/17] config: Remove unrequired AC_SUBST for LIBDRM_NOUVEAU and LIBUDEV Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 14/17] config: remove unused sdkdir=$(pkg-config...) statement Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 15/17] config: Set automake options consistently in one location Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 16/17] config: Complete bug report URL for Xorg DDX nouveau driver Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 17/17] config: Suggest upstream to find macros in case they are missing Rhys Kidd
2019-01-22  2:30   ` [PATCH xf86-video-nouveau 00/17] autotools configuration cleanups Ilia Mirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190121055223.7891-3-rhyskidd@gmail.com \
    --to=rhyskidd-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox