commit ab81f1515a5ede0936166d0051208f7618c2aa9e
author Pekka Paalanen <pekka.paalanen@collabora.co.uk> Mon Aug 24 14:27:07 2015 +0300
committer Bryce Harrington <bryce@osg.samsung.com> Mon Aug 24 16:33:46 2015 -0700
tree 77eea28604e8042511664713326b6fe0f2d6ef88
parent faee330c5e027011941d50533156683be3a67ca3

build, compositor-drm: fix output name constants another way

Bumping libdrm requirement by 3 years just for output connector name
constants was a bit much. Fix the problem introduced in
89c49b3060a115e846ba1e7fbef94d14894244f2 by conditionally using the new
additions.

Both VIRTUAL and DSI came in the same libdrm commit
566c3ce877a4be72697e15cdfc421ce965f7c37d, so we check only for DSI.

This patch also reverts faee330c5e027011941d50533156683be3a67ca3.

Reported-by: Eugen Friedrich <friedrix@gmail.com>
Cc: Derek Foreman <derekf@osg.samsung.com>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Acked-by: Bryce Harrington <bryce@osg.samsung.com>

src/compositor-drm.c

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index c85a462..f5f125a 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -1760,8 +1760,10 @@
 	[DRM_MODE_CONNECTOR_HDMIB]       = "HDMI-B",
 	[DRM_MODE_CONNECTOR_TV]          = "TV",
 	[DRM_MODE_CONNECTOR_eDP]         = "eDP",
+#ifdef DRM_MODE_CONNECTOR_DSI
 	[DRM_MODE_CONNECTOR_VIRTUAL]     = "Virtual",
 	[DRM_MODE_CONNECTOR_DSI]         = "DSI",
+#endif
 };
 
 static char *