Merge pull request #123 from Smithay/fix/example

Fix example & test on travis

.travis.yml

@@ -51,6 +51,8 @@ env:
     - FEATURES="default"
       # test all features simultaneously
     - FEATURES="all"
+      # test our examples
+    - FEATURES="examples"
       # test our house compositor
     - FEATURES="anvil" ANVIL_FEATURES=""
     - FEATURES="anvil" ANVIL_FEATURES="egl"
@@ -91,6 +93,9 @@ script:
             vagga cargo-$TRAVIS_RUST_VERSION test &&
             vagga cargo-$TRAVIS_RUST_VERSION doc --no-deps
         ;;
+        "examples")
+            vagga cargo-$TRAVIS_RUST_VERSION check --examples
+        ;;
         "cargo-fmt")
             vagga cargo-$TRAVIS_RUST_VERSION fmt --all -- --check
         ;;

Cargo.toml

@@ -54,4 +54,8 @@ backend_session_logind = ["dbus", "systemd", "backend_session"]
 renderer_gl = ["gl_generator"]
 renderer_glium = ["renderer_gl", "glium"]
 native_lib = ["wayland-sys", "wayland-server/native_lib", "wayland-protocols/native_server"]
-xwayland = []
+xwayland = []
+
+[[example]]
+name = "raw_drm"
+required-features = ["backend_drm_legacy"]

examples/raw_drm.rs

@@ -1,10 +1,8 @@
-extern crate drm;
 extern crate smithay;
 #[macro_use]
 extern crate slog;
 extern crate slog_term;
 
-use drm::{buffer::PixelFormat, control::dumbbuffer::DumbBuffer};
 use slog::Drain;
 use smithay::{
     backend::drm::{
@@ -13,9 +11,14 @@ use smithay::{
         Device, DeviceHandler, RawSurface, Surface,
     },
     reexports::{
-        drm::control::{
+        drm::{
-            connector::{self, State as ConnectorState},
+            buffer::PixelFormat,
-            crtc, encoder, framebuffer, Device as ControlDevice, ResourceInfo,
+            control::{
+                connector::{self, State as ConnectorState},
+                crtc,
+                dumbbuffer::DumbBuffer,
+                encoder, framebuffer, Device as ControlDevice, ResourceInfo,
+            },
         },
         wayland_server::calloop::EventLoop,
     },