From cb3787e569fa7610cb065243e5085a7ff58cef93 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Mon, 6 Apr 2020 18:13:54 +0200
Subject: [PATCH] zeus migration: wayland: update recipe to v1.18.0

https://jira.digi.com/browse/DEL-7013

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../wayland/wayland-ivi-extension_git.bb      | 30 -------------
 .../wayland/wayland-protocols_1.16.imx.bb     | 21 ----------
 .../wayland/wayland-protocols_1.18.imx.bb     |  7 ++++
 .../wayland/wayland_%.bbappend                | 11 +++++
 .../wayland/wayland_1.16.0.bb                 | 42 -------------------
 .../wayland/wayland_1.18.0.bb                 |  4 ++
 6 files changed, 22 insertions(+), 93 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-graphics/wayland/wayland-ivi-extension_git.bb
 delete mode 100644 meta-digi-dey/recipes-graphics/wayland/wayland-protocols_1.16.imx.bb
 create mode 100644 meta-digi-dey/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb
 create mode 100644 meta-digi-dey/recipes-graphics/wayland/wayland_%.bbappend
 delete mode 100644 meta-digi-dey/recipes-graphics/wayland/wayland_1.16.0.bb
 create mode 100644 meta-digi-dey/recipes-graphics/wayland/wayland_1.18.0.bb

diff --git a/meta-digi-dey/recipes-graphics/wayland/wayland-ivi-extension_git.bb b/meta-digi-dey/recipes-graphics/wayland/wayland-ivi-extension_git.bb
deleted file mode 100644
index deafeac4c..000000000
--- a/meta-digi-dey/recipes-graphics/wayland/wayland-ivi-extension_git.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY = "Wayland IVI Extension"
-DESCRIPTION = "GENIVI Layer Management API based on Wayland IVI Extension"
-HOMEPAGE = "http://projects.genivi.org/wayland-ivi-extension"
-BUGTRACKER = "http://bugs.genivi.org/enter_bug.cgi?product=Wayland%20IVI%20Extension"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1f1a56bb2dadf5f2be8eb342acf4ed79"
-
-PR = "r0"
-
-SRCREV = "b13e438cbc6ca24fb5e070c125b3dcd8f120b4c2"
-SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http;branch=master \
-    "
-PV = "2.2.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-DEPENDS = "weston wayland-native"
-
-inherit cmake
-
-EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1"
-
-FILES_${PN} += " \
-        ${libdir}/weston/* \
-        ${datadir}/wayland-protocols \
-    "
-FILES_${PN}-dbg += "${libdir}/weston/.debug/*"
-INSANE_SKIP_${PN} = "dev-deps"
-
-EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}"
-
diff --git a/meta-digi-dey/recipes-graphics/wayland/wayland-protocols_1.16.imx.bb b/meta-digi-dey/recipes-graphics/wayland/wayland-protocols_1.16.imx.bb
deleted file mode 100644
index 41eba4b68..000000000
--- a/meta-digi-dey/recipes-graphics/wayland/wayland-protocols_1.16.imx.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "Collection of additional Wayland protocols, i.MX fork"
-DESCRIPTION = "Wayland protocols that add functionality not \
-available in the Wayland core protocol. Such protocols either add \
-completely new functionality, or extend the functionality of some other \
-protocol either in Wayland core, or some other protocol in \
-wayland-protocols."
-HOMEPAGE = "http://wayland.freedesktop.org"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
-                    file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
-
-WAYLAND_PROTOCOLS_SRC ?= "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https"
-SRCBRANCH = "wayland-protocols-imx-1.16"
-SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH} "
-SRCREV = "e05c19d9520f0b1289cf0844d6e2f877114f39d5" 
-S = "${WORKDIR}/git"
-
-inherit allarch autotools pkgconfig
-
-PACKAGES = "${PN}"
-FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc"
diff --git a/meta-digi-dey/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb b/meta-digi-dey/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb
new file mode 100644
index 000000000..8ba8f9ee8
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb
@@ -0,0 +1,7 @@
+require recipes-graphics/wayland/wayland-protocols_1.17.imx.bb
+
+WAYLAND_PROTOCOLS_SRC ?= "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https"
+SRCBRANCH = "wayland-protocols-imx-1.18"
+SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH} "
+SRCREV = "ee18c1f66877f7fb652467c349108395c20d4f9a"
+S = "${WORKDIR}/git"
diff --git a/meta-digi-dey/recipes-graphics/wayland/wayland_%.bbappend b/meta-digi-dey/recipes-graphics/wayland/wayland_%.bbappend
new file mode 100644
index 000000000..f29d84a47
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/wayland/wayland_%.bbappend
@@ -0,0 +1,11 @@
+FILES_${PN}_class-nativesdk = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
+            ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+            ${base_bindir}/* ${base_sbindir}/* \
+            ${base_libdir}/*${SOLIBS} \
+            ${base_prefix}/lib/udev ${prefix}/lib/udev \
+            ${base_libdir}/udev ${libdir}/udev \
+            ${datadir}/${BPN} ${libdir}/${BPN}/* \
+            ${datadir}/pixmaps ${datadir}/applications \
+            ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
+            ${libdir}/bonobo/servers"
+FILES_${PN}-dev_remove_class-nativesdk = "${bindir} ${datadir}/wayland"
diff --git a/meta-digi-dey/recipes-graphics/wayland/wayland_1.16.0.bb b/meta-digi-dey/recipes-graphics/wayland/wayland_1.16.0.bb
deleted file mode 100644
index aac19529d..000000000
--- a/meta-digi-dey/recipes-graphics/wayland/wayland_1.16.0.bb
+++ /dev/null
@@ -1,42 +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"
-
-DEPENDS = "expat libxml2 libffi wayland-native"
-
-SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
-	   file://fixpathinpcfiles.patch \
-           "
-SRC_URI[md5sum] = "0c215e53de71d6fb26f7102cdc6432d3"
-SRC_URI[sha256sum] = "4e72c2b56109ccfb6610d776e465f4ca0af2280c9c2f7d5cc23f0ed2548752f5"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-documentation --with-host-scanner"
-EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"
-
-# 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}_class-target = "${libdir}/*${SOLIBS}"
-FILES_${PN}-dev_append_class-target = " ${bindir} ${datadir}/wayland"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-digi-dey/recipes-graphics/wayland/wayland_1.18.0.bb b/meta-digi-dey/recipes-graphics/wayland/wayland_1.18.0.bb
new file mode 100644
index 000000000..19bcdf1fe
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/wayland/wayland_1.18.0.bb
@@ -0,0 +1,4 @@
+require recipes-graphics/wayland/wayland_1.17.0.bb
+
+SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65"
+SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d"