From c39dbfdd0f764b1aaa7319b4694e7335692993dd Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 10 Feb 2015 15:11:09 +0000 Subject: auxiliary/vl: bring back the VL code for the dri targets With commit c642e87d9f4(auxiliary/vl: rework the build of the VL code) we split out the VL code into a separate static library that was meant to be used by the VL targets alone - va, vdpau, xvmc. The commit failed to consider the way we handle vdpau-gl interop and broke it. Bring back the functionality by keeping the vl <> vl_stub separation as requrested by Christian. v2: Update the omx target as well. Update mesa-stable email address. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86837 Cc: "10.5" Signed-off-by: Emil Velikov Tested-by: Andy Furniss --- src/gallium/targets/xvmc/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'src/gallium/targets/xvmc') diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 8aed96966b8..3c16c8d51eb 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -24,6 +24,7 @@ endif # HAVE_LD_VERSION_SCRIPT libXvMCgallium_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ -- cgit v1.2.3