diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-07-15 10:31:42 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:28:52 +0100 |
commit | ddb0de65085f196ebf83c71d23b6ff4ac5f0bc76 (patch) | |
tree | 052cf5bfa5559d6a007ccc26b747eb6598ea4831 /meta | |
parent | 534cc8612c0ec4d474daad9dbb09a0d2e9ae2abe (diff) | |
download | poky-ddb0de65085f196ebf83c71d23b6ff4ac5f0bc76.tar.gz |
wayland: Upgrade 1.10.0 -> 1.11.0
Add a musl build fix patch.
(From OE-Core rev: 9b3d71ef63b5ebcd6540bbb2668478da87ecc911)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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.11.0.bb (renamed from meta/recipes-graphics/wayland/wayland_1.10.0.bb) | 8 |
2 files changed, 35 insertions, 3 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 new file mode 100644 index 0000000000..dece95c764 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 5516d32e694badca35b6c71b02a3f08f650308bf Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 15 Jul 2016 16:23:48 -0700 | ||
4 | Subject: [PATCH] scanner: Use unit32_t instead of uint | ||
5 | |||
6 | uint32_t is C99 defined stdint type | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
10 | Upstream-Status: Submitted | ||
11 | --- | ||
12 | src/scanner.c | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/scanner.c b/src/scanner.c | ||
16 | index 5f06e8e..10a4023 100644 | ||
17 | --- a/src/scanner.c | ||
18 | +++ b/src/scanner.c | ||
19 | @@ -808,7 +808,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 | -- | ||
29 | 2.1.4 | ||
30 | |||
diff --git a/meta/recipes-graphics/wayland/wayland_1.10.0.bb b/meta/recipes-graphics/wayland/wayland_1.11.0.bb index 41d08b7e25..3413406d05 100644 --- a/meta/recipes-graphics/wayland/wayland_1.10.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.11.0.bb | |||
@@ -10,9 +10,11 @@ LICENSE = "MIT" | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ | 10 | 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 | ||
13 | SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" | 13 | SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ |
14 | SRC_URI[md5sum] = "e7751c38807c231afaba9d6b68f2a2b7" | 14 | file://0001-scanner-Use-unit32_t-instead-of-uint.patch \ |
15 | SRC_URI[sha256sum] = "4bf6e790aa6f50ab3825676282ecd75850ec9c4767af96ecb7127b1f3c3d60dc" | 15 | " |
16 | SRC_URI[md5sum] = "fccf680be066e234729d5b69e0bd0fa9" | ||
17 | SRC_URI[sha256sum] = "9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0" | ||
16 | 18 | ||
17 | EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" | 19 | EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" |
18 | 20 | ||