Signed-off-by: Michael Tretter <m.tret...@pengutronix.de>
---
rules/weston.in | 6 ++----
rules/weston.make | 38 +++++++++++++++++++-------------------
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/rules/weston.in b/rules/weston.in
index 7db255202..56b85d26a 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -13,7 +13,6 @@ menuconfig WESTON
select CAIRO
select CAIRO_PNG
select LIBDRM if WESTON_DRM_COMPOSITOR
- select MTDEV if WESTON_DRM_COMPOSITOR ||
WESTON_FBDEV_COMPOSITOR
select UDEV if WESTON_DRM_COMPOSITOR ||
WESTON_FBDEV_COMPOSITOR
select UDEV_LIBUDEV if WESTON_DRM_COMPOSITOR ||
WESTON_FBDEV_COMPOSITOR
select MESALIB if WESTON_DRM_COMPOSITOR
@@ -30,6 +29,7 @@ menuconfig WESTON
select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME
select SYSTEMD if WESTON_SYSTEMD
select SYSTEMD_LOGIND if WESTON_SYSTEMD_LOGIND
+ select DBUS if WESTON_SYSTEMD_LOGIND
prompt "weston "
help
Wayland compositor reference implementation
@@ -59,9 +59,7 @@ config WESTON_FBDEV_COMPOSITOR
config WESTON_SYSTEMD
bool
- depends on INITMETHOD_SYSTEMD
- default y
- prompt "systemd support"
+ default INITMETHOD_SYSTEMD
config WESTON_SYSTEMD_LOGIND
bool
diff --git a/rules/weston.make b/rules/weston.make
index 6e7065982..61cb6b072 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -17,8 +17,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
#
# Paths and names
#
-WESTON_VERSION := 3.0.0
-WESTON_MD5 := 9c42a4c51a1b9f35d040fa9d45ada36d
+WESTON_VERSION := 4.0.0
+LIBWESTON_MAJOR := 4
+WESTON_MD5 := 33709aa4d5916f89643fca0fc0064b39
WESTON := weston-$(WESTON_VERSION)
WESTON_SUFFIX := tar.xz
WESTON_URL :=
http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX)
@@ -61,12 +62,11 @@ WESTON_CONF_OPT := \
--disable-weston-launch \
--enable-fullscreen-shell \
--disable-colord \
- --disable-dbus \
+ --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-dbus \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
--disable-junit-xml \
--disable-ivi-shell \
--$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
- --disable-libunwind \
--disable-demo-clients-install \
--disable-lcms \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
@@ -96,23 +96,23 @@ ifdef PTXCONF_WESTON_WCAP_TOOLS
@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/wcap-decode)
endif
- @$(call install_lib, weston, 0, 0, 0644, libweston-3)
- @$(call install_lib, weston, 0, 0, 0644, libweston-desktop-3)
+ @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR))
+ @$(call install_lib, weston, 0, 0, 0644,
libweston-desktop-$(LIBWESTON_MAJOR))
ifdef PTXCONF_WESTON_XWAYLAND
- @$(call install_lib, weston, 0, 0, 0644, libweston-3/xwayland)
+ @$(call install_lib, weston, 0, 0, 0644,
libweston-$(LIBWESTON_MAJOR)/xwayland)
endif
ifdef PTXCONF_WESTON_DRM_COMPOSITOR
- @$(call install_lib, weston, 0, 0, 0644, libweston-3/drm-backend)
+ @$(call install_lib, weston, 0, 0, 0644,
libweston-$(LIBWESTON_MAJOR)/drm-backend)
endif
ifdef PTXCONF_WESTON_HEADLESS_COMPOSITOR
- @$(call install_lib, weston, 0, 0, 0644, libweston-3/headless-backend)
+ @$(call install_lib, weston, 0, 0, 0644,
libweston-$(LIBWESTON_MAJOR)/headless-backend)
endif
ifdef PTXCONF_WESTON_FBDEV_COMPOSITOR
- @$(call install_lib, weston, 0, 0, 0644, libweston-3/fbdev-backend)
+ @$(call install_lib, weston, 0, 0, 0644,
libweston-$(LIBWESTON_MAJOR)/fbdev-backend)
endif
ifdef PTXCONF_WESTON_GL
- @$(call install_lib, weston, 0, 0, 0644, libweston-3/wayland-backend)
- @$(call install_lib, weston, 0, 0, 0644, libweston-3/gl-renderer)
+ @$(call install_lib, weston, 0, 0, 0644,
libweston-$(LIBWESTON_MAJOR)/wayland-backend)
+ @$(call install_lib, weston, 0, 0, 0644,
libweston-$(LIBWESTON_MAJOR)/gl-renderer)
endif
@$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
@$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
@@ -127,16 +127,16 @@ endif
@$(foreach image, \
- wayland.svg \
- terminal.png \
- wayland.png \
border.png \
- pattern.png \
- sign_maximize.png \
icon_window.png \
+ pattern.png \
sign_close.png \
- sign_maximize.png, \
- $(call install_copy, weston, 0, 0, 0644, -,
/usr/share/weston/$(image));)
+ sign_maximize.png \
+ sign_minimize.png \
+ terminal.png \
+ wayland.png \
+ wayland.svg, \
+ $(call install_copy, weston, 0, 0, 0644, -,
/usr/share/weston/$(image))$(ptx/nl))
@$(call install_finish, weston)
--
2.16.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
