From 9b3d71ef63b5ebcd6540bbb2668478da87ecc911 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 15 Jul 2016 10:31:42 +0300 Subject: wayland: Upgrade 1.10.0 -> 1.11.0 Add a musl build fix patch. Signed-off-by: Jussi Kukkonen --- ...0001-scanner-Use-unit32_t-instead-of-uint.patch | 30 +++++++++++++++ meta/recipes-graphics/wayland/wayland_1.10.0.bb | 41 --------------------- meta/recipes-graphics/wayland/wayland_1.11.0.bb | 43 ++++++++++++++++++++++ 3 files changed, 73 insertions(+), 41 deletions(-) create mode 100644 meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch delete mode 100644 meta/recipes-graphics/wayland/wayland_1.10.0.bb create mode 100644 meta/recipes-graphics/wayland/wayland_1.11.0.bb 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 @@ +From 5516d32e694badca35b6c71b02a3f08f650308bf Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +Signed-off-by: Jussi Kukkonen +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 + diff --git a/meta/recipes-graphics/wayland/wayland_1.10.0.bb b/meta/recipes-graphics/wayland/wayland_1.10.0.bb deleted file mode 100644 index 41d08b7e25..0000000000 --- a/meta/recipes-graphics/wayland/wayland_1.10.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Wayland, a protocol between a compositor and clients" -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ -as well as a C library implementation of that protocol. The compositor can be \ -a standalone display server running on Linux kernel modesetting and evdev \ -input devices, an X application, or a wayland client itself. The clients can \ -be traditional applications, X servers (rootless or fullscreen) or other \ -display servers." -HOMEPAGE = "http://wayland.freedesktop.org" -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" - -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native nativesdk" - -DEPENDS = "expat libxml2 libffi wayland-native" - -EXTRA_OECONF = "--disable-documentation --with-host-scanner" - -# Wayland installs a M4 macro for other projects to use, which uses the target -# pkg-config to find files. Replace pkg-config with pkg-config-native. -do_install_append_class-native() { - sed -e 's,PKG_CHECK_MODULES(.*),,g' \ - -e 's,$PKG_CONFIG,pkg-config-native,g' \ - -i ${D}/${datadir}/aclocal/wayland-scanner.m4 -} - -sysroot_stage_all_append_class-target () { - rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 - cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ -} - -FILES_${PN} = "${libdir}/*${SOLIBS}" -FILES_${PN}-dev += "${bindir} ${datadir}/wayland" diff --git a/meta/recipes-graphics/wayland/wayland_1.11.0.bb b/meta/recipes-graphics/wayland/wayland_1.11.0.bb new file mode 100644 index 0000000000..3413406d05 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland_1.11.0.bb @@ -0,0 +1,43 @@ +SUMMARY = "Wayland, a protocol between a compositor and clients" +DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ +as well as a C library implementation of that protocol. The compositor can be \ +a standalone display server running on Linux kernel modesetting and evdev \ +input devices, an X application, or a wayland client itself. The clients can \ +be traditional applications, X servers (rootless or fullscreen) or other \ +display servers." +HOMEPAGE = "http://wayland.freedesktop.org" +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 \ + 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" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native nativesdk" + +DEPENDS = "expat libxml2 libffi wayland-native" + +EXTRA_OECONF = "--disable-documentation --with-host-scanner" + +# Wayland installs a M4 macro for other projects to use, which uses the target +# pkg-config to find files. Replace pkg-config with pkg-config-native. +do_install_append_class-native() { + sed -e 's,PKG_CHECK_MODULES(.*),,g' \ + -e 's,$PKG_CONFIG,pkg-config-native,g' \ + -i ${D}/${datadir}/aclocal/wayland-scanner.m4 +} + +sysroot_stage_all_append_class-target () { + rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 + cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ +} + +FILES_${PN} = "${libdir}/*${SOLIBS}" +FILES_${PN}-dev += "${bindir} ${datadir}/wayland" -- cgit 1.2.3-korg