summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2016-11-08 09:57:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-15 15:19:54 +0000
commitac0d917b67ff3a180986fa234c44c14a0cb38c63 (patch)
treeae8220bcf99ce374814f43d609a4cad62a7308cb
parent2ef30ef6243cf26b16809aefe445e67c86a48634 (diff)
downloadpoky-ac0d917b67ff3a180986fa234c44c14a0cb38c63.tar.gz
wayland: upgrade from 1.11.1 to 1.12.0
* Remove 0001-scanner-Use-unit32_t-instead-of-uint.patch applied upstream https://cgit.freedesktop.org/wayland/wayland/commit/?id=6750b47d9e0d30 * Update release tarball md5sum/sha256sum (From OE-Core rev: 7812e6e5b0c8f4e0bb289d87f9fa9e0748390edf) Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch30
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.12.0.bb (renamed from meta/recipes-graphics/wayland/wayland_1.11.1.bb)5
2 files changed, 2 insertions, 33 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch b/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch
deleted file mode 100644
index ef41b79c5a..0000000000
--- a/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 5516d32e694badca35b6c71b02a3f08f650308bf Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 15 Jul 2016 16:23:48 -0700
4Subject: [PATCH] scanner: Use unit32_t instead of uint
5
6uint32_t is C99 defined stdint type
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Upstream-Status: Submitted
11---
12 src/scanner.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/scanner.c b/src/scanner.c
16index 5f06e8e..10a4023 100644
17--- a/src/scanner.c
18+++ b/src/scanner.c
19@@ -812,7 +812,7 @@ find_enumeration(struct protocol *protocol,
20 struct interface *i;
21 struct enumeration *e;
22 char *enum_name;
23- uint idx = 0, j;
24+ uint32_t idx = 0, j;
25
26 for (j = 0; j + 1 < strlen(enum_attribute); j++) {
27 if (enum_attribute[j] == '.') {
28--
292.1.4
30
diff --git a/meta/recipes-graphics/wayland/wayland_1.11.1.bb b/meta/recipes-graphics/wayland/wayland_1.12.0.bb
index fa674f6430..de261fe9b1 100644
--- a/meta/recipes-graphics/wayland/wayland_1.11.1.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.12.0.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
11 file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" 11 file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce"
12 12
13SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 13SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
14 file://0001-scanner-Use-unit32_t-instead-of-uint.patch \
15 " 14 "
16SRC_URI[md5sum] = "82f227c65faec3df0335847626811303" 15SRC_URI[md5sum] = "ee615e2d1e205eec48b02f069327eb96"
17SRC_URI[sha256sum] = "4c8a99d030282740e898dead98c92d92023be9c3536c7f504444d215a7e39195" 16SRC_URI[sha256sum] = "d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1"
18 17
19EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" 18EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"
20 19