[Mesa-dev] [PATCH v2] auxiliary/vl: bring back the VL code for the dri targets

[Jon TURNEY]

On 10/02/2015 22:29, Emil Velikov wrote:
> 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.

This now makes us try to build vl_winsys_dri.c on targets which don't 
have DRI2 (See [1])

I guess something like the attached is needed.

[1] http://tinderbox.x.org/builds/2015-02-13-0007/logs/mesa-mesa/#build

-------------- next part --------------
From 19c254ca57cad4b67466e6bbfb76a1460ea0821d Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Sat, 14 Feb 2015 17:12:41 +0000
Subject: [PATCH] auxiliary/vl: Only build vl_winsys_dri.c if we have DRI2

Refine commit c39dbfdd0f764b1aaa7319b4694e7335692993dd so it only turns on
building of vl_winsys_dri.c if we have DRI2

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 src/gallium/auxiliary/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 453282a..5c96161 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -74,6 +74,7 @@ libgalliumvl_la_CFLAGS = \
 libgalliumvl_la_SOURCES = \
 	$(VL_SOURCES)
 
+if HAVE_DRI2
 noinst_LTLIBRARIES += libgalliumvlwinsys.la
 
 libgalliumvlwinsys_la_CFLAGS = \
@@ -81,6 +82,7 @@ libgalliumvlwinsys_la_CFLAGS = \
 
 libgalliumvlwinsys_la_SOURCES = \
 	$(VL_WINSYS_SOURCES)
+endif
 
 endif
 
-- 
2.1.4