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@vmware.com> Reviewed-by: Rob Clark <robdclark@gmail.com>tags/mesa-10.2-rc1
@@ -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 |
@@ -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) |