From 6f609142a539aee9ee2be6b7baeb3a7619613fa5 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sun, 15 Oct 2023 21:44:38 +0200 Subject: [PATCH] Restore Wayland & Weston --- conf/distro/jpos.conf | 2 +- recipes-jpos/images/image-jpos.bb | 2 +- recipes-jpos/jpos-weather/jpos-weather_git.bb | 10 ---------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/conf/distro/jpos.conf b/conf/distro/jpos.conf index deb42a7..1d8911c 100644 --- a/conf/distro/jpos.conf +++ b/conf/distro/jpos.conf @@ -2,7 +2,7 @@ require conf/distro/poky.conf DISTRO = "jpos" DISTRO_NAME = "jpOS" -DISTRO_FEATURES:append = " opengl systemd wifi" +DISTRO_FEATURES:append = " opengl systemd wayland wifi" DISTRO_FEATURES:remove = " ptest x11" MAINTAINER = "J-P Nurmi " diff --git a/recipes-jpos/images/image-jpos.bb b/recipes-jpos/images/image-jpos.bb index a081c47..9ad8be3 100644 --- a/recipes-jpos/images/image-jpos.bb +++ b/recipes-jpos/images/image-jpos.bb @@ -8,4 +8,4 @@ IMAGE_INSTALL += "\ packagegroup-fonts-truetype \ packagegroup-jpos \ " -IMAGE_FEATURES += "splash" +IMAGE_FEATURES += "splash weston" diff --git a/recipes-jpos/jpos-weather/jpos-weather_git.bb b/recipes-jpos/jpos-weather/jpos-weather_git.bb index edbfde1..edebc3c 100644 --- a/recipes-jpos/jpos-weather/jpos-weather_git.bb +++ b/recipes-jpos/jpos-weather/jpos-weather_git.bb @@ -13,15 +13,5 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://LICENSES/GPL-3.0-only.txt;md5=75d892af193fd5a298f724c4377d8f62" DEPENDS = "\ - libdrm \ - libinput \ - libxkbcommon \ openssl \ - seatd \ - udev \ - virtual/egl \ - virtual/libgbm \ " - -CARGO_FEATURES = "slint/backend-linuxkms slint/renderer-femtovg" -EXTRA_CARGO_FLAGS = "--no-default-features"