blob: 666a4f62e87b10dafc6adacf20c67f01592501ef (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From ee82d3e79496926270663f155ca1e4217a025358 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Thu, 1 Nov 2012 10:41:29 +0100
Subject: [PATCH 3/4] kms: Allow compiling libkms without Intel support
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
libkms/Makefile.am | 5 ++++-
libkms/linux.c | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/libkms/Makefile.am b/libkms/Makefile.am
index 215450a..518021f 100644
--- a/libkms/Makefile.am
+++ b/libkms/Makefile.am
@@ -15,10 +15,13 @@ libkms_la_LIBADD = ../libdrm.la
libkms_la_SOURCES = \
internal.h \
linux.c \
- intel.c \
dumb.c \
api.c
+if HAVE_INTEL
+libkms_la_SOURCES += intel.c
+endif
+
if HAVE_VMWGFX
libkms_la_SOURCES += vmwgfx.c
endif
diff --git a/libkms/linux.c b/libkms/linux.c
index eec0162..d160bc8 100644
--- a/libkms/linux.c
+++ b/libkms/linux.c
@@ -101,8 +101,12 @@ linux_from_sysfs(int fd, struct kms_driver **out)
if (ret)
return ret;
- if (!strcmp(name, "intel"))
+ if (0)
+ {}
+#ifdef HAVE_INTEL
+ else if (!strcmp(name, "intel"))
ret = intel_create(fd, out);
+#endif
#ifdef HAVE_VMWGFX
else if (!strcmp(name, "vmwgfx"))
ret = vmwgfx_create(fd, out);
--
1.7.12.4
|