Mesa (10.4): nine: the .pc file should not follow mesa version

[Emil Velikov]

Module: Mesa
Branch: 10.4
Commit: 16eaf01a6aacce5a933d631aebbdf6898ccbafd4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=16eaf01a6aacce5a933d631aebbdf6898ccbafd4

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Sat Nov 22 04:23:05 2014 +0000

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: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: David Heidelberg <david at ixit.cz>
(cherry picked from commit 9b7037a3696cc9282f209435fc26702998341b5e)

---

 configure.ac                                |    2 ++
 src/gallium/targets/d3dadapter9/Makefile.am |    2 +-
 src/gallium/targets/d3dadapter9/d3d.pc.in   |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 33cbf22..f99ea3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2085,6 +2085,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 6231236..dc97931 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 9a18a5c..d34b2a7 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}