From 90d361753ce5a5e705adecbc68edaf7a6d0f51ee Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 11 Jan 2018 09:22:24 -0800 Subject: [PATCH] meson: fix vdpau target linkage The VDPAU state tracker needs to be linked with whole-archive (autotools does this). Because we are linking the whole archive we alos need to link with libswdri and libswkmsdri if those have been enabled. v4: - Always add libswdri and libswkmsdri to link_with list Fixes: 68076b87474e7959 ("meson: build gallium vdpau state tracker") Signed-off-by: Dylan Baker Acked-by: Eric Engestrom Reviewed-by: Emil Velikov --- src/gallium/targets/vdpau/meson.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index a03f0edfad9..93969d8399b 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2018 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -35,6 +35,7 @@ if with_ld_dynamic_list vdpau_link_depends += files('../dri-vdpau.dyn') endif + libvdpau_gallium = shared_library( 'vdpau_gallium', 'target.c', @@ -44,9 +45,10 @@ 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, libswdri, libswkmsdri, ], dependencies : [ dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, -- 2.30.2