From 8c136b53b79e90b9e8f30f891b8bef112fee375d Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Thu, 6 Mar 2014 15:20:56 +0100 Subject: fix vdpau interop when using -Bsymbolic-functions in ldflags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Explicitly add radeon_drm_winsys_create and nouveau_drm_screen_create to the dynamic list. This will ensure vdpau interop still works even when the user links with -Bsymbolic-functions in hardened builds. Signed-off-by: Maarten Lankhorst Tested-by: Rachel Greenham Reported-by: Peter Frühberger Reviewed-by: Christian König --- src/gallium/targets/radeonsi/dri/Makefile.am | 4 +++- src/gallium/targets/radeonsi/vdpau/Makefile.am | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/gallium/targets/radeonsi') diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am b/src/gallium/targets/radeonsi/dri/Makefile.am index eab28b5a253..c49e5fcac87 100644 --- a/src/gallium/targets/radeonsi/dri/Makefile.am +++ b/src/gallium/targets/radeonsi/dri/Makefile.am @@ -37,7 +37,9 @@ nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp radeonsi_dri_la_SOURCES = \ drm_target.c -radeonsi_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS) +radeonsi_dri_la_LDFLAGS = \ + $(GALLIUM_DRI_LINKER_FLAGS) \ + -Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn radeonsi_dri_la_LIBADD = \ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am index 54d65b3d783..8e276136842 100644 --- a/src/gallium/targets/radeonsi/vdpau/Makefile.am +++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am @@ -36,7 +36,9 @@ libvdpau_radeonsi_la_SOURCES = \ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c libvdpau_radeonsi_la_LDFLAGS = \ - $(GALLIUM_VDPAU_LINKER_FLAGS) + $(GALLIUM_VDPAU_LINKER_FLAGS) \ + -Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn + libvdpau_radeonsi_la_LIBADD = \ $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ -- cgit v1.2.3