Commit be33cb9e authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

weston: new package 



[Peter: fix udev comment, add upstream URL]
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 41c08646

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ endif 


source "package/qt5/Config.in"

source "package/x11r7/Config.in"

source "package/weston/Config.in"



comment "X libraries and helper libraries"

source "package/liberation/Config.in"

package/weston/Config.in

0 → 100644
+31 −0
Original line number Diff line number Diff line 
comment "weston requires udev"

	depends on !BR2_PACKAGE_UDEV



config BR2_PACKAGE_WESTON

	bool "weston"

	select BR2_PACKAGE_WAYLAND

	select BR2_PACKAGE_LIBXKBCOMMON

	select BR2_PACKAGE_CAIRO

	select BR2_PACKAGE_CAIRO_PNG

	select BR2_PACKAGE_LIBPNG

	select BR2_PACKAGE_JPEG

	select BR2_PACKAGE_MTDEV

	depends on BR2_PACKAGE_UDEV

	# Runtime dependency

	select BR2_PACKAGE_XKEYBOARD_CONFIG

	# Make sure at least one backend is selected

	select BR2_PACKAGE_WESTON_FBDEV

	help

	  Weston is the reference implementation of a Wayland

	  compositor, and a useful compositor in its own right.

	  Weston has various backends that lets it run on Linux kernel

	  modesetting and evdev input as well as under X11.



	  http://wayland.freedesktop.org/



if BR2_PACKAGE_WESTON



config BR2_PACKAGE_WESTON_FBDEV

	bool "fbdev compositor"



endif

package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch

0 → 100644
+47 −0
Original line number Diff line number Diff line 
From b8a831387a37f09ea5479eeb1d435a26680299c6 Mon Sep 17 00:00:00 2001

From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Date: Fri, 19 Apr 2013 06:19:05 +0200

Subject: [PATCH] Pull DRM dependent code only when the DRM compositor is

 enabled



The <xf86drm.h> header and the drm*() functions may not be available

at all when the DRM compositor is not enabled, so they should not be

used. Fixes build failures when building the fbdev compositor on

systems where DRM is not available.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---

 src/launcher-util.c |    5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)



diff --git a/src/launcher-util.c b/src/launcher-util.c

index 9196e4f..d2fb160 100644

--- a/src/launcher-util.c

+++ b/src/launcher-util.c

@@ -31,7 +31,9 @@

 #include <sys/uio.h>

 #include <fcntl.h>

 

+#ifdef BUILD_DRM_COMPOSITOR

 #include <xf86drm.h>

+#endif

 

 #include "compositor.h"

 #include "launcher-util.h"

@@ -103,6 +105,7 @@ weston_launcher_open(struct weston_compositor *compositor,

 	return data->fd;

 }

 

+#ifdef BUILD_DRM_COMPOSITOR

 int

 weston_launcher_drm_set_master(struct weston_compositor *compositor,

 			       int drm_fd, char master)

@@ -157,4 +160,4 @@ weston_launcher_drm_set_master(struct weston_compositor *compositor,

 

 	return ret;

 }

-

+#endif

-- 

1.7.9.5

package/weston/weston.mk

0 → 100644
+32 −0
Original line number Diff line number Diff line 
#############################################################

#

# weston

#

#############################################################



WESTON_VERSION = 1.1.0

WESTON_SITE = http://wayland.freedesktop.org/releases/

WESTON_SOURCE = weston-$(WAYLAND_VERSION).tar.xz

WESTON_LICENSE = MIT

WESTON_LICENSE_FILES = COPYING



WESTON_DEPENDENCIES = wayland libxkbcommon pixman libpng jpeg mtdev udev

WESTON_CONF_OPT = \

	--disable-egl \

	--disable-xwayland \

	--disable-x11-compositor \

	--disable-drm-compositor \

	--disable-wayland-compositor \

	--disable-headless-compositor \

	--disable-rpi-compositor \

	--disable-weston-launch \

	--disable-libunwind



ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)

WESTON_CONF_OPT += --enable-fbdev-compositor

else

WESTON_CONF_OPT += --disable-fbdev-compositor

endif



$(eval $(autotools-package))