Mesa (staging/20.1): meson: Add versioning for xvmc tracker

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 4a43f88d462d8e9acf517e9c7c1a26243abf9b7b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a43f88d462d8e9acf517e9c7c1a26243abf9b7b

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>
(cherry picked from commit 02d0b2d5604d4a9e0ddfa8234db4c92682de0e69)

---

 .pick_status.json                           | 2 +-
 src/gallium/state_trackers/xvmc/meson.build | 3 +++
 src/gallium/targets/xvmc/meson.build        | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index b4b1f774980..940f11ae0a0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -40,7 +40,7 @@
         "description": "meson: Add versioning for xvmc tracker",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "22a817af8a89eb3c762fc3e07b443a3ce37d7416"
     },
diff --git a/src/gallium/state_trackers/xvmc/meson.build b/src/gallium/state_trackers/xvmc/meson.build
index 9022bf4d0a6..9ac30270c94 100644
--- a/src/gallium/state_trackers/xvmc/meson.build
+++ b/src/gallium/state_trackers/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 b96a9d34465..535634c3a54 100644
--- a/src/gallium/targets/xvmc/meson.build
+++ b/src/gallium/targets/xvmc/meson.build
@@ -51,11 +51,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