jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-04 00:47:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

weston: add support for XWayland

Browse Source 
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Gustavo Zacarias 2016-05-26 16:44:58 -03:00 committed by Thomas Petazzoni
parent e6af110aab
commit 36366add97
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/weston/Config.in
View File

@ -92,4 +92,16 @@ config BR2_PACKAGE_WESTON_X11
comment "X11 compositor needs X.org enabled" comment "X11 compositor needs X.org enabled"
depends on !BR2_PACKAGE_XORG7 depends on !BR2_PACKAGE_XORG7
config BR2_PACKAGE_WESTON_XWAYLAND
bool "XWayland support"
depends on BR2_PACKAGE_XORG7
depends on BR2_PACKAGE_LIBEPOXY
select BR2_PACKAGE_CAIRO
select BR2_PACKAGE_LIBXCB
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXCURSOR
comment "XWayland support needs libepoxy and X.org enabled"
depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY
endif endif

8
package/weston/weston.mk
View File

@ -18,7 +18,6 @@ WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
WESTON_CONF_OPTS = \ WESTON_CONF_OPTS = \
--with-dtddir=$(STAGING_DIR)/usr/share/wayland \ --with-dtddir=$(STAGING_DIR)/usr/share/wayland \
--disable-xwayland \
--disable-wayland-compositor \ --disable-wayland-compositor \
--disable-headless-compositor \ --disable-headless-compositor \
--disable-colord \ --disable-colord \
@ -111,6 +110,13 @@ else
WESTON_CONF_OPTS += --disable-x11-compositor WESTON_CONF_OPTS += --disable-x11-compositor
endif endif
ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y)
WESTON_CONF_OPTS += --enable-xwayland
WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor
else
WESTON_CONF_OPTS += --disable-xwayland
endif
ifeq ($(BR2_PACKAGE_LIBVA),y) ifeq ($(BR2_PACKAGE_LIBVA),y)
WESTON_CONF_OPTS += --enable-vaapi-recorder WESTON_CONF_OPTS += --enable-vaapi-recorder
WESTON_DEPENDENIES += libva WESTON_DEPENDENIES += libva