diff options
| author | Emil Velikov <[email protected]> | 2015-02-10 15:11:09 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-02-12 13:19:26 +0000 |
| commit | c39dbfdd0f764b1aaa7319b4694e7335692993dd (patch) | |
| tree | 56c97237bba4abac064de035914361608323ca40 /src/gallium/auxiliary/Makefile.sources | |
| parent | 153539bd9d4445b504110958306f00632222f840 (diff) | |
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" <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Tested-by: Andy Furniss <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/Makefile.sources')
| -rw-r--r-- | src/gallium/auxiliary/Makefile.sources | 5 |
1 files changed, 4 insertions, 1 deletions
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 |