Make it build and work with wayland and weston master (~ 1.2)