From patchwork Wed Mar 9 09:58:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 594924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 21ED414032B for ; Wed, 9 Mar 2016 20:59:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=zacarias.com.ar header.i=@zacarias.com.ar header.b=S9jrCzUC; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5939E338C3; Wed, 9 Mar 2016 09:59:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EaIogpdP0sqs; Wed, 9 Mar 2016 09:59:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9DF66339CF; Wed, 9 Mar 2016 09:59:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 27BD81C0BC2 for ; Wed, 9 Mar 2016 09:59:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 21F7A914F0 for ; Wed, 9 Mar 2016 09:59:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z0ErzH1HwQ9L for ; Wed, 9 Mar 2016 09:59:35 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [176.9.42.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6C3B391540 for ; Wed, 9 Mar 2016 09:59:35 +0000 (UTC) Received: from asgard (cpe-186-22-138-122.telecentro-reversos.com.ar [186.22.138.122] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.15.1/8.15.1) with ESMTPSA id u299xTUa002112 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 9 Mar 2016 09:59:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1457517573; bh=b3ovFmL1iUtiBsfUlDvtRxOYpzA4E5S6hRjg6GJWrL8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S9jrCzUCAHo94DT0zaSwDb5PWFAqghO/3c6G20ITWQEjjfa5H/TReBrL3HcJdEv2X qyP+Ltk7dcbJAcp3/gh57t4v7oXzMNcMZwFzikABLB4GeElwAI36chbnGH9tM3bhXu atvecRcNjcxkahJ+bIBmFYEvWYQCl2DKXINcW/xs= Received: by asgard (sSMTP sendmail emulation); Wed, 09 Mar 2016 06:59:13 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Wed, 9 Mar 2016 06:58:43 -0300 Message-Id: <1457517525-7716-6-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1457517525-7716-1-git-send-email-gustavo@zacarias.com.ar> References: <1457517525-7716-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.98.7 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH v3 5/7] wayland: bump to version 1.10.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" wayland-scanner host/cross support is now native so drop the funky trick. Signed-off-by: Gustavo Zacarias --- package/wayland/Config.in | 3 ++- package/wayland/wayland.hash | 4 ++-- package/wayland/wayland.mk | 18 +++--------------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/package/wayland/Config.in b/package/wayland/Config.in index 857ba73..32718fc 100644 --- a/package/wayland/Config.in +++ b/package/wayland/Config.in @@ -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 diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash index 316d6b5..c9d0721 100644 --- a/package/wayland/wayland.hash +++ b/package/wayland/wayland.hash @@ -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 diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk index 4e44fa0..215e70a 100644 --- a/package/wayland/wayland.mk +++ b/package/wayland/wayland.mk @@ -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