Make it easy to build without DRM support

diff --git a/src/qt-compositor/qt-compositor.pri b/src/qt-compositor/qt-compositor.pri
index 558e726..91d1e07 100644 (file)
--- a/src/qt-compositor/qt-compositor.pri
+++ b/src/qt-compositor/qt-compositor.pri
@@ -10,8 +10,7 @@ SOURCES += $$PWD/qtcompositor.cpp \
         $$PWD/wloutput.cpp \
         $$PWD/wldisplay.cpp \
         $$PWD/wlbuffer.cpp \
-        $$PWD/wlshmbuffer.cpp \
-        $$PWD/wldrmbuffer.cpp
+        $$PWD/wlshmbuffer.cpp 
 
 HEADERS += $$PWD/qtcompositor.h \
         $$PWD/wlcompositor.h \
@@ -19,7 +18,12 @@ HEADERS += $$PWD/qtcompositor.h \
         $$PWD/wloutput.h \
         $$PWD/wlbuffer.h \
         $$PWD/wlshmbuffer.h \
-        $$PWD/wldrmbuffer.h \
         $$PWD/wldisplay.h \
         $$PWD/wlobject.h
 
+wayland_drm  {
+  SOURCES += $$PWD/wldrmbuffer.cpp
+  HEADERS +=  $$PWD/wldrmbuffer.h
+
+  DEFINES += QT_WAYLAND_DRM
+}

diff --git a/src/qt-compositor/qt-compositor.pro b/src/qt-compositor/qt-compositor.pro
index 7443257..bc172a9 100644 (file)
--- a/src/qt-compositor/qt-compositor.pro
+++ b/src/qt-compositor/qt-compositor.pro
@@ -4,12 +4,16 @@ DEPENDPATH += .
 INCLUDEPATH += .
 INCLUDEPATH += ../3rdparty/wayland
 
-DESTDIR=$$PWD/../../bin/
+# comment out the following line to disable DRM
+CONFIG += wayland_drm
 
+DESTDIR=$$PWD/../../bin/
 
 LIBS += -L ../../lib
 
-LIBS += -lxcb-dri2 -lEGL
+wayland_drm  {
+  LIBS += -lxcb-dri2 -lEGL
+}
 include (qt-compositor.pri)
 
 # Input

diff --git a/src/qt-compositor/wlcompositor.cpp b/src/qt-compositor/wlcompositor.cpp
index a833ac1..6de7ea0 100644 (file)
--- a/src/qt-compositor/wlcompositor.cpp
+++ b/src/qt-compositor/wlcompositor.cpp
@@ -165,7 +165,9 @@ const static struct wl_shell_interface shell_interface = {
 Compositor::Compositor(WaylandCompositor *qt_compositor)
     : m_display(new Display)
     , m_shm(this)
+#ifdef QT_WAYLAND_DRM
     , m_drm(this)
+#endif
     , m_current_frame(0)
     , m_last_queued_buf(-1)
     , m_qt_compositor(qt_compositor)
@@ -180,7 +182,9 @@ Compositor::Compositor(WaylandCompositor *qt_compositor)
 
     m_display->addGlobalObject(m_output.base(), &wl_output_interface, 0, output_post_geometry);
     m_display->addGlobalObject(&m_shell, &wl_shell_interface, &shell_interface, 0);
+#ifdef QT_WAYLAND_DRM
     m_display->addGlobalObject(m_drm.base(), &wl_drm_interface, &drm_interface, post_drm_device);
+#endif
     m_display->addGlobalObject(m_shm.base(), &wl_shm_interface, &shm_interface, 0);
 
     wl_input_device_init(&m_input, base());

diff --git a/src/qt-compositor/wlcompositor.h b/src/qt-compositor/wlcompositor.h
index 0e2353f..f87137f 100644 (file)
--- a/src/qt-compositor/wlcompositor.h
+++ b/src/qt-compositor/wlcompositor.h
@@ -45,7 +45,9 @@
 #include "wlsurface.h"
 #include "wldisplay.h"
 #include "wlshmbuffer.h"
-#include "wldrmbuffer.h"
+#ifdef QT_WAYLAND_DRM
+# include "wldrmbuffer.h"
+#endif
 
 #include <wayland-server.h>
 
@@ -102,8 +104,9 @@ private:
 
     /* shm/drm-Handler */
     ShmHandler m_shm;
+#ifdef QT_WAYLAND_DRM
     DrmHandler m_drm;
-
+#endif
     QList<Surface *> m_surfaces;
 
     /* Render state */