I dug into what autotools is doing. It's using -Wl,--whole-archive to link everything, in this target, not just the state tracker. I think I'm okay with this patch given that, so I'm going to apply the same change to the other media state trackers and send it out as a series.
Quoting Dylan Baker (2018-01-11 09:24:42) > Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> > --- > src/gallium/targets/vdpau/meson.build | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/src/gallium/targets/vdpau/meson.build > b/src/gallium/targets/vdpau/meson.build > index 67f1469fb0f..432a32a7340 100644 > --- a/src/gallium/targets/vdpau/meson.build > +++ b/src/gallium/targets/vdpau/meson.build > @@ -23,6 +23,7 @@ > # configure.ac) > > vdpau_link_args = [] > +vdpau_link_with = [] > vdpau_link_depends = [] > vdpau_drivers = [] > > @@ -35,6 +36,13 @@ if with_ld_dynamic_list > vdpau_link_depends += files('../dri-vdpau.dyn') > endif > > +if with_dri > + vdpau_link_with += libswdri > +endif > +if with_gallium_drisw_kms > + vdpau_link_with += libswkmsdri > +endif > + > libvdpau_gallium = shared_library( > 'vdpau_gallium', > 'target.c', > @@ -44,12 +52,14 @@ libvdpau_gallium = shared_library( > include_directories : [ > inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, > ], > + link_whole : [libvdpau_st], > link_with : [ > - libvdpau_st, libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util, > - libpipe_loader_static, libws_null, libwsw, > + libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util, > + libpipe_loader_static, libws_null, libwsw, vdpau_link_with, > ], > dependencies : [ > - dep_thread, dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_libdrm, > + dep_thread, dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, > + dep_xcb_present, dep_xshmfence, dep_xcb_xfixes, dep_xcb_sync, dep_libdrm, > driver_r300, driver_r600, driver_radeonsi, driver_nouveau, > ], > link_depends : vdpau_link_depends, > -- > 2.15.1 >
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev