Mesa (master): st/xa: Fix advertized version number and try to avoid future discrepancies

[Thomas Hellstrom]

Module: Mesa
Branch: master
Commit: 61bedc3d6b08943f015f9d590c07a6af36c2a92c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=61bedc3d6b08943f015f9d590c07a6af36c2a92c

Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Thu Apr  3 07:59:31 2014 +0200

st/xa: Fix advertized version number and try to avoid future discrepancies

The xa version number had to be set in two places. In configure.ac and in
xa_tracker.h. Furthermore, xa_tracker.h is an installed header so we can't
use mesa internal defines. So therefore, at configure time, modify the
xa_tracker.h header to use the version given by configure.ac

Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
Reviewed-by: Rob Clark <robdclark at gmail.com>

---

 configure.ac                                                    |    1 +
 src/gallium/state_trackers/xa/{xa_tracker.h => xa_tracker.h.in} |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index af1b0d1..9b665b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2055,6 +2055,7 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/state_trackers/vdpau/Makefile
 		src/gallium/state_trackers/vega/Makefile
 		src/gallium/state_trackers/xa/Makefile
+                src/gallium/state_trackers/xa/xa_tracker.h
 		src/gallium/state_trackers/xvmc/Makefile
 		src/gallium/targets/Makefile
 		src/gallium/targets/dri-freedreno/Makefile
diff --git a/src/gallium/state_trackers/xa/xa_tracker.h b/src/gallium/state_trackers/xa/xa_tracker.h.in
similarity index 97%
rename from src/gallium/state_trackers/xa/xa_tracker.h
rename to src/gallium/state_trackers/xa/xa_tracker.h.in
index 43e56ff..25344f5 100644
--- a/src/gallium/state_trackers/xa/xa_tracker.h
+++ b/src/gallium/state_trackers/xa/xa_tracker.h.in
@@ -36,9 +36,9 @@
 
 #include <stdint.h>
 
-#define XA_TRACKER_VERSION_MAJOR 2
-#define XA_TRACKER_VERSION_MINOR 1
-#define XA_TRACKER_VERSION_PATCH 0
+#define XA_TRACKER_VERSION_MAJOR @XA_MAJOR@
+#define XA_TRACKER_VERSION_MINOR @XA_MINOR@
+#define XA_TRACKER_VERSION_PATCH @XA_TINY@
 
 #define XA_FLAG_SHARED         (1 << 0)
 #define XA_FLAG_RENDER_TARGET  (1 << 1)