diff options
| author | Emil Velikov <[email protected]> | 2014-04-07 13:17:01 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-04-09 22:12:35 +0100 |
| commit | 56f531657cde93494de37d7dd6d47cc3d22022b3 (patch) | |
| tree | ad7e513183a965a5a178be37a49bc0eaccab9dfd | |
| parent | f9832f960fa8edcee0eb6866698cc5f9f25bd8f9 (diff) | |
Partially revert "st/xa: Fix advertized version number and try to avoid future discrepancies"
This reverts commit 61bedc3d6b08943f015f9d590c07a6af36c2a92c.
As the header is the one defining the API/ABI and is distributed
during installation, we should be using it rather than re-defining
the XA version in configure.ac.
Bump the version in the header to 2.2.0, to reflect what was the
original intent of commit 42158926c6d7d3ddbe61b9a04d60544ff1b50a96.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Thomas Hellstrom <[email protected]>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_tracker.h (renamed from src/gallium/state_trackers/xa/xa_tracker.h.in) | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index d2732aabf51..ea0f3081f5a 100644 --- a/configure.ac +++ b/configure.ac @@ -2000,9 +2000,14 @@ AC_SUBST([VDPAU_MINOR], 0) AC_SUBST([XVMC_MAJOR], 1) AC_SUBST([XVMC_MINOR], 0) -AC_SUBST([XA_MAJOR], 2) -AC_SUBST([XA_MINOR], 2) -AC_SUBST([XA_TINY], 0) +XA_HEADER="$srcdir/src/gallium/state_trackers/xa/xa_tracker.h" +XA_MAJOR=`grep "#define XA_TRACKER_VERSION_MAJOR" $XA_HEADER | $SED 's/^#define XA_TRACKER_VERSION_MAJOR //'` +XA_MINOR=`grep "#define XA_TRACKER_VERSION_MINOR" $XA_HEADER | $SED 's/^#define XA_TRACKER_VERSION_MINOR //'` +XA_TINY=`grep "#define XA_TRACKER_VERSION_PATCH" $XA_HEADER | $SED 's/^#define XA_TRACKER_VERSION_PATCH //'` + +AC_SUBST([XA_MAJOR], $XA_MAJOR) +AC_SUBST([XA_MINOR], $XA_MINOR) +AC_SUBST([XA_TINY], $XA_TINY) AC_SUBST([XA_VERSION], "$XA_MAJOR.$XA_MINOR.$XA_TINY") dnl Restore LDFLAGS and CPPFLAGS @@ -2061,7 +2066,6 @@ 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.in b/src/gallium/state_trackers/xa/xa_tracker.h index 25344f5ee53..5c6435e19c1 100644 --- a/src/gallium/state_trackers/xa/xa_tracker.h.in +++ b/src/gallium/state_trackers/xa/xa_tracker.h @@ -36,9 +36,9 @@ #include <stdint.h> -#define XA_TRACKER_VERSION_MAJOR @XA_MAJOR@ -#define XA_TRACKER_VERSION_MINOR @XA_MINOR@ -#define XA_TRACKER_VERSION_PATCH @XA_TINY@ +#define XA_TRACKER_VERSION_MAJOR 2 +#define XA_TRACKER_VERSION_MINOR 2 +#define XA_TRACKER_VERSION_PATCH 0 #define XA_FLAG_SHARED (1 << 0) #define XA_FLAG_RENDER_TARGET (1 << 1) |