Thanks for fixing this, Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
Quoting Eric Engestrom (2018-12-11 09:13:54) > 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 <i.gnatenko.br...@gmail.com> > Fixes: 68076b87474e7959c161 "meson: build gallium vdpau state tracker" > Signed-off-by: Eric Engestrom <eric.engest...@intel.com> > --- > src/gallium/state_trackers/vdpau/meson.build | 9 ++++++++- > 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 9678b79ef6c952a48e45..28b98ae5369fa5c5ccf2 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 0c09b2b811429b5688b8..cfc616edf3eac3dd1540 100644 > --- a/src/gallium/targets/vdpau/meson.build > +++ b/src/gallium/targets/vdpau/meson.build > @@ -54,6 +54,7 @@ libvdpau_gallium = shared_library( > dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, > driver_tegra, > ], > link_depends : vdpau_link_depends, > + soversion : '@0@.@1@.0'.format(VDPAU_MAJOR, VDPAU_MINOR), > ) > foreach d : [[with_gallium_r300, 'r300'], > [with_gallium_r600, 'r600'], > @@ -61,7 +62,7 @@ foreach d : [[with_gallium_r300, 'r300'], > [with_gallium_tegra, 'tegra'], > [with_gallium_nouveau, 'nouveau']] > if d[0] > - vdpau_drivers += 'libvdpau_@0@.so.1.0.0'.format(d[1]) > + vdpau_drivers += 'libvdpau_@0@.so.@1@.@2@.0'.format(d[1], VDPAU_MAJOR, > VDPAU_MINOR) > endif > endforeach > > -- > Cheers, > Eric >
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
