Module: Mesa
Branch: master
Commit: 9b7037a3696cc9282f209435fc26702998341b5e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b7037a3696cc9282f209435fc26702998341b5e
Author: Emil Velikov <emil.l.veli...@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-sta...@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
Reviewed-by: David Heidelberg <da...@ixit.cz>
---
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 882898f..1d9d015 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 6506924..1f3f3cb 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}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
