diff options
| author |   Fathi Boudra <fathi.boudra@linaro.org> | 2016-11-08 09:57:58 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-15 15:18:49 +0000 |
| commit | 7812e6e5b0c8f4e0bb289d87f9fa9e0748390edf (patch) | |
| tree | 015e83106209a576a7671e8207ba5b2494cd95a9 | |
| parent | 5b73d5f484cc844affe91ec19d881d42e187f30c (diff) | |
| download | openembedded-core-contrib-7812e6e5b0c8f4e0bb289d87f9fa9e0748390edf.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
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>
| -rw-r--r-- | meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch | 30 | ||||
| -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 @@ -From 5516d32e694badca35b6c71b02a3f08f650308bf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 15 Jul 2016 16:23:48 -0700 -Subject: [PATCH] scanner: Use unit32_t instead of uint - -uint32_t is C99 defined stdint type - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Upstream-Status: Submitted ---- - src/scanner.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/scanner.c b/src/scanner.c -index 5f06e8e..10a4023 100644 ---- a/src/scanner.c -+++ b/src/scanner.c -@@ -812,7 +812,7 @@ find_enumeration(struct protocol *protocol, - struct interface *i; - struct enumeration *e; - char *enum_name; -- uint idx = 0, j; -+ uint32_t idx = 0, j; - - for (j = 0; j + 1 < strlen(enum_attribute); j++) { - if (enum_attribute[j] == '.') { --- -2.1.4 - 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 \ file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-scanner-Use-unit32_t-instead-of-uint.patch \ " -SRC_URI[md5sum] = "82f227c65faec3df0335847626811303" -SRC_URI[sha256sum] = "4c8a99d030282740e898dead98c92d92023be9c3536c7f504444d215a7e39195" +SRC_URI[md5sum] = "ee615e2d1e205eec48b02f069327eb96" +SRC_URI[sha256sum] = "d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1" EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" |