summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/weston/Config.in1
-rw-r--r--package/weston/weston.hash2
-rw-r--r--package/weston/weston.mk11
3 files changed, 5 insertions, 9 deletions
diff --git a/package/weston/Config.in b/package/weston/Config.in
index d7a22691de..b7f4f27db9 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -12,6 +12,7 @@ config BR2_PACKAGE_WESTON
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_MTDEV
+ select BR2_PACKAGE_LIBINPUT
depends on BR2_PACKAGE_HAS_UDEV
depends on !BR2_STATIC_LIBS # wayland
depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
diff --git a/package/weston/weston.hash b/package/weston/weston.hash
new file mode 100644
index 0000000000..8df6f071c8
--- /dev/null
+++ b/package/weston/weston.hash
@@ -0,0 +1,2 @@
+# From http://lists.freedesktop.org/archives/wayland-devel/2015-February/019977.html
+sha256 1c4511945f3f476c24af712e82a7b500ae91a99cbc0fe2e381da1449125166cd weston-1.7.0.tar.xz
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 9964b90848..8a5a891b78 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -4,14 +4,14 @@
#
################################################################################
-WESTON_VERSION = 1.6.0
+WESTON_VERSION = 1.7.0
WESTON_SITE = http://wayland.freedesktop.org/releases
WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
WESTON_LICENSE = MIT
WESTON_LICENSE_FILES = COPYING
WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \
- jpeg mtdev udev cairo
+ jpeg mtdev udev cairo libinput
WESTON_CONF_OPTS = \
--with-dtddir=$(STAGING_DIR)/usr/share/wayland \
@@ -25,13 +25,6 @@ WESTON_CONF_OPTS = \
--disable-weston-launch \
--disable-colord
-ifeq ($(BR2_PACKAGE_LIBINPUT),y)
-WESTON_DEPENDENCIES += libinput
-WESTON_CONF_OPTS += --enable-libinput-backend
-else
-WESTON_CONF_OPTS += --disable-libinput-backend
-endif
-
ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
WESTON_DEPENDENCIES += libunwind
else
OpenPOWER on IntegriCloud