]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
wayland: Upgrade 1.10.0 -> 1.11.0
authorJussi Kukkonen <jussi.kukkonen@intel.com>
Fri, 15 Jul 2016 07:31:42 +0000 (10:31 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 20 Jul 2016 09:24:56 +0000 (10:24 +0100)
Add a musl build fix patch.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch [new file with mode: 0644]
meta/recipes-graphics/wayland/wayland_1.11.0.bb [moved from meta/recipes-graphics/wayland/wayland_1.10.0.bb with 87% similarity]

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 (file)
index 0000000..dece95c
--- /dev/null
@@ -0,0 +1,30 @@
+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
+@@ -808,7 +808,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
+
similarity index 87%
rename from meta/recipes-graphics/wayland/wayland_1.10.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.11.0.bb
index 41d08b7e251a1ec76696359876f11e2f4cbb8ef2..3413406d052cc72501d6e674ddee125932b68dc5 100644 (file)
@@ -10,9 +10,11 @@ LICENSE = "MIT"
 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"
-SRC_URI[md5sum] = "e7751c38807c231afaba9d6b68f2a2b7"
-SRC_URI[sha256sum] = "4bf6e790aa6f50ab3825676282ecd75850ec9c4767af96ecb7127b1f3c3d60dc"
+SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+           file://0001-scanner-Use-unit32_t-instead-of-uint.patch \
+           "
+SRC_URI[md5sum] = "fccf680be066e234729d5b69e0bd0fa9"
+SRC_URI[sha256sum] = "9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0"
 
 EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"