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@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: David Heidelberg <david@ixit.cz>

diff --git a/configure.ac b/configure.ac
index 882898f1d5422be65b9c93c8d1950bfbae3f6a34..1d9d015481ecfc479bde3a57b3d12f0f0a8c6df4 100644 (file)
--- 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 65069240d883c46cace53478c1502ab7b75f1c9e..1f3f3cb8212757f7f20c827640c87c35d0165205 100644 (file)
--- 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 9a18a5c1b8e256a8593182b81c58b514e908ef2d..d34b2a7d8d83fcff1c8a153706bd854f139b137d 100644 (file)
--- 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}