Mesa (master): meson: Add versioning for xvmc tracker

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jul 3 09:52:37 UTC 2020


Module: Mesa
Branch: master
Commit: 02d0b2d5604d4a9e0ddfa8234db4c92682de0e69
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=02d0b2d5604d4a9e0ddfa8234db4c92682de0e69

Author: Emmanuel Vadot <manu at FreeBSD.org>
Date:   Wed Jul  1 11:54:32 2020 +0200

meson: Add versioning for xvmc tracker

The xvmc tracker used to be versionned with autotool but this seems to have been
lost in the meson switch.

Fixes: 22a817af8a89eb3c762f ("meson: build gallium xvmc state tracker")
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Signed-off-by: Emmanuel Vadot <manu at FreeBSD.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5708>

---

 src/gallium/frontends/xvmc/meson.build | 3 +++
 src/gallium/targets/xvmc/meson.build   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gallium/frontends/xvmc/meson.build b/src/gallium/frontends/xvmc/meson.build
index 6ed9f30248b..75a2716a239 100644
--- a/src/gallium/frontends/xvmc/meson.build
+++ b/src/gallium/frontends/xvmc/meson.build
@@ -18,6 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+XVMC_MAJOR = 1
+XVMC_MINOR = 0
+
 libxvmc_st = static_library(
   'xvmc_st',
   files('attributes.c', 'block.c', 'context.c', 'surface.c', 'subpicture.c'),
diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build
index 6ae5a4f7282..9fa0f659c17 100644
--- a/src/gallium/targets/xvmc/meson.build
+++ b/src/gallium/targets/xvmc/meson.build
@@ -50,11 +50,12 @@ libxvmc_gallium = shared_library(
   install : true,
   install_dir : xvmc_drivers_path,
   name_suffix : 'so',
+  version : '@0 at .@1 at .0'.format(XVMC_MAJOR, XVMC_MINOR),
 )
 
 foreach d : [[with_gallium_r600, 'r600'], [with_gallium_nouveau, 'nouveau']]
   if d[0]
-    xvmc_drivers += 'libXvMC at 0@.so'.format(d[1])
+    xvmc_drivers += 'libXvMC at 0@.so. at 1@. at 2@.0'.format(d[1], XVMC_MAJOR, XVMC_MINOR)
   endif
 endforeach
 



More information about the mesa-commit mailing list