fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-23 01:50:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

meson: fix vdpau target linkage

Browse source 
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: 68076b8747 ("meson: build gallium vdpau state tracker")
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Acked-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 90d361753c)
This commit is contained in:
Dylan Baker 2018-01-11 09:22:24 -08:00 • committed by Emil Velikov
parent 8069a71465
commit 9d1499af33
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/targets/vdpau/meson.build
View file

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