From: Emil Velikov Date: Sat, 22 Nov 2014 04:23:05 +0000 (+0000) Subject: nine: the .pc file should not follow mesa version X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9b7037a3696cc9282f209435fc26702998341b5e;p=mesa.git 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: Signed-off-by: Emil Velikov Reviewed-by: David Heidelberg --- 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}