diff options
| author | Emil Velikov <[email protected]> | 2014-11-22 04:23:05 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-11-26 21:23:59 +0000 |
| commit | 16eaf01a6aacce5a933d631aebbdf6898ccbafd4 (patch) | |
| tree | 04ad913d133356c49a3cf18579c17302f7a227ef | |
| parent | 6316d415c45ba67f1cf772de33648a1b883c6ffb (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]>
(cherry picked from commit 9b7037a3696cc9282f209435fc26702998341b5e)
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/gallium/targets/d3dadapter9/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/targets/d3dadapter9/d3d.pc.in | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 33cbf227ddc..f99ea3d27f8 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 62312369adc..dc97931d247 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} |