[Mesa-dev] [Test Patch] Meson: ensure vdpau has proper symbolsexposed

[Marc Dietrich]

Hi Dylan,


Am Donnerstag, 11. Januar 2018, 18:24:42 CET schrieb Dylan Baker:
> Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
> ---
>  src/gallium/targets/vdpau/meson.build | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)


this makes the symbol (and a few more) available here. The whole linking stuff 
looks very dubious to me. This might also explain some of the size differences 
between autotools and meson builds, e.g. meson always uses "-Wl,O1", whatever 
this does or means. I didn't found a place where to change this default? 
setting. 

Anyway, thanks for tracking this down!

Marc

> 
> 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,

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180113/399a080a/attachment.sig>