All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3/4] wayland: bump to version 1.9.0
Date: Sun, 20 Dec 2015 10:40:35 -0300	[thread overview]
Message-ID: <1450618836-3845-3-git-send-email-gustavo@zacarias.com.ar> (raw)
In-Reply-To: <1450618836-3845-1-git-send-email-gustavo@zacarias.com.ar>

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

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/wayland/wayland.hash |  4 ++--
 package/wayland/wayland.mk   | 15 ++-------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash
index 316d6b5..0deafd0 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
+# http://lists.freedesktop.org/archives/wayland-devel/2015-September/024302.html
+sha256  9c8770720aa0034479735f58a4dc4ca9b172ecfede28f5134312e135b7301efa	wayland-1.9.0.tar.xz
diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
index 4e44fa0..74142ec 100644
--- a/package/wayland/wayland.mk
+++ b/package/wayland/wayland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.8.1
+WAYLAND_VERSION = 1.9.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT
@@ -14,18 +14,7 @@ WAYLAND_INSTALL_STAGING = YES
 WAYLAND_DEPENDENCIES = libffi host-pkgconf host-wayland expat
 
 # 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
-- 
2.4.10

  parent reply	other threads:[~2015-12-20 13:40 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-20 13:40 [Buildroot] [PATCH 1/4] libepoxy: move outside x11r7 scope Gustavo Zacarias
2015-12-20 13:40 ` [Buildroot] [PATCH 2/4] libgtk3: bump to version 3.18.6 Gustavo Zacarias
2015-12-20 13:40 ` Gustavo Zacarias [this message]
2015-12-20 13:40 ` [Buildroot] [PATCH 4/4] weston: bump to version 1.9.0 Gustavo Zacarias

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1450618836-3845-3-git-send-email-gustavo@zacarias.com.ar \
    --to=gustavo@zacarias.com.ar \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.