From d74f0eae3e08c74647a247dd8600ce03c370474c Mon Sep 17 00:00:00 2001
From: DanyLE <xsang.le@gmail.com>
Date: Wed, 26 Jul 2023 12:08:14 +0200
Subject: [PATCH] add labwc and foot from meta-wayland

---
 .../images/core-image-minimal.bbappend        |  3 +-
 recipes-graphics/diya-shell/labwc_git.bb      | 39 ---------------
 recipes-graphics/diya-shell/wl-roots_git.bb   | 47 -------------------
 3 files changed, 2 insertions(+), 87 deletions(-)
 delete mode 100644 recipes-graphics/diya-shell/labwc_git.bb
 delete mode 100644 recipes-graphics/diya-shell/wl-roots_git.bb

diff --git a/recipes-core/images/core-image-minimal.bbappend b/recipes-core/images/core-image-minimal.bbappend
index 936352d..efe821e 100644
--- a/recipes-core/images/core-image-minimal.bbappend
+++ b/recipes-core/images/core-image-minimal.bbappend
@@ -51,7 +51,8 @@ IMAGE_INSTALL:append = "libcurl \
                         raspi-gpio \
                         rsync \
                         coreutils \
-                        wayland wayland-protocols hwdata \
+                        wayland wayland-protocols \
+                        labwc foot \
                         qtbase \
                         qtdeclarative \
                         qtquickcontrols2 \
diff --git a/recipes-graphics/diya-shell/labwc_git.bb b/recipes-graphics/diya-shell/labwc_git.bb
deleted file mode 100644
index af12e5a..0000000
--- a/recipes-graphics/diya-shell/labwc_git.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-DESCRIPTION = "lawc waylad compositor"
-
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
-
-#FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-DEPENDS = "wayland wayland-protocols fontconfig seatd liberation-fonts libxkbcommon libdrm eudev pixman mesa cairo"
-
-
-SRCREV = "${AUTOREV}"
-# SRCREV = "27d2d9f0c76b5805ff43578272e809aeb665a498"
-SRC_URI = "git://github.com/labwc/labwc.git;protocol=https;branch=master;"
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-DEPENDS += " \
-	libxml2 \
-	glib-2.0 \
-	cairo \
-	pango \
-	wayland \
-	wayland-native \
-	wayland-protocols \
-	libdrm \
-	libxkbcommon \
-	libinput \
-	wl-roots \
-"
-S = "${WORKDIR}/git"
-
-inherit meson
-
-do_install:append () {
-    # remove files not needed
-    rm -rf ${D}/usr/local/include
-    rm -rf ${D}/usr/local/lib
-    rm -rf ${D}/usr/local/share
-}
\ No newline at end of file
diff --git a/recipes-graphics/diya-shell/wl-roots_git.bb b/recipes-graphics/diya-shell/wl-roots_git.bb
deleted file mode 100644
index 75ffe2c..0000000
--- a/recipes-graphics/diya-shell/wl-roots_git.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-SUMMARY = "A modular Wayland compositor library"
-DESCRIPTION = "Pluggable, composable, unopinionated modules for building a \
-Wayland compositor; or about 50,000 lines of code you were \
-going to write anyway."
-HOMEPAGE = "https://gitlab.freedesktop.org/wlroots"
-BUGTRACKER = "https://gitlab.freedesktop.org/wlroots/wlroots/-/issues"
-SECTION = "graphics"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-DEPENDS += " \
-	hwdata-native \
-	libdrm \
-	libxkbcommon \
-	libliftoff \
-	pixman \
-	seatd \
-	wayland \
-	wayland-native \
-	wayland-protocols \
-"
-
-PACKAGECONFIG[opengl] = ",,virtual/egl virtual/libgles2"
-PACKAGECONFIG[gbm] = ",,virtual/libgbm"
-PACKAGECONFIG[libinput] = ",,libinput"
-PACKAGECONFIG[systemd] = ",,systemd"
-PACKAGECONFIG[sysvinit] = ",,eudev elogind"
-PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang-native"
-PACKAGECONFIG[x11] = ",,xcb-util-renderutil"
-PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xwayland xcb-util-wm,xwayland"
-
-PACKAGECONFIG ?= " \
-	${@bb.utils.filter('DISTRO_FEATURES', 'systemd sysvinit vulkan x11 xwayland opengl', d)} \
-	libinput \
-"
-
-SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=0.16;protocol=https"
-SRCREV = "0a32b5a74db06a27bee55a47205951bb277a9657"
-
-S = "${WORKDIR}/git"
-PV = "0.16.2"
-
-inherit meson pkgconfig features_check
-
-EXTRA_OEMESON += "--buildtype release"
\ No newline at end of file