Partially revert "st/xa: Fix advertized version number and try to avoid future discrepancies"
This reverts commit61bedc3d6b
. 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 commit42158926c6
. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
This commit is contained in:
parent
f9832f960f
commit
56f531657c
12
configure.ac
12
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
|
||||
|
|
|
@ -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)
|
Loading…
Reference in New Issue