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/auxiliary/Makefile.sources | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/gallium/auxiliary/Makefile.sources') diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index c45dd18a623..d330935b3ac 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -334,10 +334,13 @@ VL_SOURCES := \ vl/vl_video_buffer.h \ vl/vl_vlc.h \ vl/vl_winsys.h \ - vl/vl_winsys_dri.c \ vl/vl_zscan.c \ vl/vl_zscan.h +# XXX: Nuke this as our dri targets no longer depend on VL. +VL_WINSYS_SOURCES := \ + vl/vl_winsys_dri.c + VL_STUB_SOURCES := \ vl/vl_stubs.c -- cgit v1.2.3