aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-11-22 04:23:05 +0000
committerEmil Velikov <[email protected]>2014-11-26 20:09:10 +0000
commit9b7037a3696cc9282f209435fc26702998341b5e (patch)
tree5e2d2c97f423af2484daef85a3e5a3941ae1e983
parentc642e87d9f423c78bf631410e858f675292ba0c4 (diff)
nine: the .pc file should not follow mesa version
The version provided by it should be the same as the one provided/handled by the module. Add the missing tiny version. Cc: <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: David Heidelberg <[email protected]>
-rw-r--r--configure.ac2
-rw-r--r--src/gallium/targets/d3dadapter9/Makefile.am2
-rw-r--r--src/gallium/targets/d3dadapter9/d3d.pc.in2
3 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 882898f1d54..1d9d015481e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2093,6 +2093,8 @@ AM_CONDITIONAL(HAVE_SPARC_ASM, test "x$asm_arch" = xsparc)
AC_SUBST([NINE_MAJOR], 1)
AC_SUBST([NINE_MINOR], 0)
+AC_SUBST([NINE_TINY], 0)
+AC_SUBST([NINE_VERSION], "$NINE_MAJOR.$NINE_MINOR.$NINE_TINY")
AC_SUBST([VDPAU_MAJOR], 1)
AC_SUBST([VDPAU_MINOR], 0)
diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am
index 65069240d88..1f3f3cb8212 100644
--- a/src/gallium/targets/d3dadapter9/Makefile.am
+++ b/src/gallium/targets/d3dadapter9/Makefile.am
@@ -62,7 +62,7 @@ d3dadapter9_la_LDFLAGS = \
-shrext .so \
-module \
-no-undefined \
- -version-number $(NINE_MAJOR):$(NINE_MINOR) \
+ -version-number $(NINE_MAJOR):$(NINE_MINOR):$(NINE_TINY) \
$(GC_SECTIONS) \
$(LD_NO_UNDEFINED)
diff --git a/src/gallium/targets/d3dadapter9/d3d.pc.in b/src/gallium/targets/d3dadapter9/d3d.pc.in
index 9a18a5c1b8e..d34b2a7d8d8 100644
--- a/src/gallium/targets/d3dadapter9/d3d.pc.in
+++ b/src/gallium/targets/d3dadapter9/d3d.pc.in
@@ -6,6 +6,6 @@ moduledir=@D3D_DRIVER_INSTALL_DIR@
Name: d3d
Description: Native D3D driver modules
-Version: @VERSION@
+Version: @NINE_VERSION@
Requires.private: @DRI_PC_REQ_PRIV@
Cflags: -I${includedir}