diff options
| author | Eric Engestrom <[email protected]> | 2018-12-11 16:51:25 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-01-25 12:10:00 +0000 |
| commit | 69e944036720d826d0548a019f8fe18b9ed57e6e (patch) | |
| tree | 6e94f5a105c5bb8f95e35f7b4cdd60918edc684f | |
| parent | 9af77fcf98bd8084ff117ebbd9abfc1b695397d2 (diff) | |
meson/vdpau: add missing soversion
This mirrors what autotools does in src/gallium/state_trackers/vdpau/Makefile.am
and src/gallium/targets/vdpau/Makefile.am:
VDPAU_MAJOR = 1
VDPAU_MINOR = 0
libvdpau_gallium_la_LDFLAGS = -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR)
Reported-by: Igor Gnatenko <[email protected]>
Fixes: 68076b87474e7959c161 "meson: build gallium vdpau state tracker"
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
| -rw-r--r-- | src/gallium/state_trackers/vdpau/meson.build | 9 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau/meson.build | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/vdpau/meson.build b/src/gallium/state_trackers/vdpau/meson.build index 9678b79ef6c..28b98ae5369 100644 --- a/src/gallium/state_trackers/vdpau/meson.build +++ b/src/gallium/state_trackers/vdpau/meson.build @@ -18,13 +18,20 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +VDPAU_MAJOR = 1 +VDPAU_MINOR = 0 + libvdpau_st = static_library( 'vdpau_st', files( 'bitmap.c', 'decode.c', 'device.c', 'ftab.c', 'htab.c', 'mixer.c', 'output.c', 'preemption.c', 'presentation.c', 'query.c', 'surface.c', ), - c_args : [c_vis_args, '-DVER_MAJOR=1', '-DVER_MINOR=0'], + c_args : [ + c_vis_args, + '-DVER_MAJOR=@0@'.format(VDPAU_MAJOR), + '-DVER_MINOR=@0@'.format(VDPAU_MINOR), + ], include_directories : [ inc_include, inc_src, inc_util, inc_gallium, inc_gallium_aux, ], diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index 005cf642498..22e3f5ffdd8 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -54,13 +54,14 @@ libvdpau_gallium = shared_library( dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, ], link_depends : vdpau_link_depends, + soversion : '@0@.@[email protected]'.format(VDPAU_MAJOR, VDPAU_MINOR), ) foreach d : [[with_gallium_r300, 'r300'], [with_gallium_r600, 'r600'], [with_gallium_radeonsi, 'radeonsi'], [with_gallium_nouveau, 'nouveau']] if d[0] - vdpau_drivers += 'libvdpau_@[email protected]'.format(d[1]) + vdpau_drivers += 'libvdpau_@[email protected].@1@.@[email protected]'.format(d[1], VDPAU_MAJOR, VDPAU_MINOR) endif endforeach |