wayland: bump to version 1.10.0

wayland-scanner host/cross support is now native so drop the funky
trick.

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-03-09 06:58:43 -03:00 committed by Thomas Petazzoni
parent 0911f32d1c
commit 3a24c8bd66
3 changed files with 7 additions and 18 deletions

View file

@ -2,8 +2,9 @@ config BR2_PACKAGE_WAYLAND
bool "wayland"
depends on !BR2_STATIC_LIBS # dlfcn.h
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_LIBFFI
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_LIBFFI
select BR2_PACKAGE_LIBXML2
help
Wayland is a project to define a protocol for a compositor
to talk to its clients as well as a library implementation

View file

@ -1,2 +1,2 @@
# From: http://lists.freedesktop.org/archives/wayland-devel/2015-June/022630.html
sha256 f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8 wayland-1.8.1.tar.xz
# From https://lists.freedesktop.org/archives/wayland-devel/2016-February/027038.html
sha256 4bf6e790aa6f50ab3825676282ecd75850ec9c4767af96ecb7127b1f3c3d60dc wayland-1.10.0.tar.xz

View file

@ -4,28 +4,16 @@
#
################################################################################
WAYLAND_VERSION = 1.8.1
WAYLAND_VERSION = 1.10.0
WAYLAND_SITE = http://wayland.freedesktop.org/releases
WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
WAYLAND_LICENSE = MIT
WAYLAND_LICENSE_FILES = COPYING
WAYLAND_INSTALL_STAGING = YES
WAYLAND_DEPENDENCIES = libffi host-pkgconf host-wayland expat
WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
# wayland-scanner is only needed for building, not on the target
WAYLAND_CONF_OPTS = --disable-scanner
# We must provide a specialy-crafted wayland-scanner .pc file
# which we vampirise and adapt from the host-wayland copy
define WAYLAND_SCANNER_PC
$(INSTALL) -m 0644 -D $(HOST_DIR)/usr/lib/pkgconfig/wayland-scanner.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc
$(SED) 's:^prefix=.*:prefix=/usr:' \
-e 's:^wayland_scanner=.*:wayland_scanner=$(HOST_DIR)/usr/bin/wayland-scanner:' \
$(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc
endef
WAYLAND_POST_INSTALL_STAGING_HOOKS += WAYLAND_SCANNER_PC
WAYLAND_CONF_OPTS = --disable-scanner --with-host-scanner
# Remove the DTD from the target, it's not needed at runtime
define WAYLAND_TARGET_CLEANUP