diff --git a/conf/layer.conf b/conf/layer.conf index 64e7b5b..79556ac 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-slint" BBFILE_PATTERN_meta-slint = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-slint = "6" -LAYERDEPENDS_meta-slint = "core clang-layer" +LAYERDEPENDS_meta-slint = "core" LAYERSERIES_COMPAT_meta-slint = "kirkstone langdale mickledore" RUST_PANIC_STRATEGY = "abort" diff --git a/recipes-slint/slint/slint-cpp-v2.inc b/recipes-slint/slint/slint-cpp-v2.inc index 3c488b9..e560a9c 100644 --- a/recipes-slint/slint/slint-cpp-v2.inc +++ b/recipes-slint/slint/slint-cpp-v2.inc @@ -20,7 +20,6 @@ inherit slint_common REQUIRED_DISTRO_FEATURES:append:class-target = "opengl" DEPENDS:append:class-target = " fontconfig libxkbcommon virtual/libgl" -DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH}" SLINT_REV ?= "master" SRC_URI = "git://github.com/slint-ui/slint.git;protocol=https;branch=master;rev=${SLINT_REV}" @@ -31,7 +30,7 @@ EXTRA_OECMAKE:append:class-target = " -DSLINT_COMPILER=/\$ENV{OECORE_NATIVE_SYSR PACKAGECONFIG:append:class-native = "slint-compiler" PACKAGECONFIG:class-nativesdk = "slint-compiler" PACKAGECONFIG:append:class-target = " \ - slint-runtime renderer-skia interpreter \ + slint-runtime renderer-femtovg interpreter \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'backend-winit-wayland', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'backend-winit-x11', '', d)} \ " @@ -39,7 +38,7 @@ PACKAGECONFIG:append:class-target = " \ PACKAGECONFIG[slint-compiler] = "-DSLINT_FEATURE_COMPILER=ON, -DSLINT_FEATURE_COMPILER=OFF," PACKAGECONFIG[slint-runtime] = "-DSLINT_BUILD_RUNTIME=ON, -DSLINT_BUILD_RUNTIME=OFF," PACKAGECONFIG[backend-linuxkms] = "-DSLINT_FEATURE_BACKEND_LINUXKMS=ON, -DSLINT_FEATURE_BACKEND_LINUXKMS=OFF,libdrm virtual/egl virtual/libgbm seatd udev libinput" -PACKAGECONFIG[renderer-skia] = "-DSLINT_FEATURE_RENDERER_SKIA=ON, -DSLINT_FEATURE_RENDERER_SKIA=OFF," +PACKAGECONFIG[renderer-skia] = "-DSLINT_FEATURE_RENDERER_SKIA=ON, -DSLINT_FEATURE_RENDERER_SKIA=OFF,clang-cross-${TARGET_ARCH}" PACKAGECONFIG[renderer-femtovg] = "-DSLINT_FEATURE_RENDERER_FEMTOVG=ON, -DSLINT_FEATURE_RENDERER_FEMTOVG=OFF," PACKAGECONFIG[interpreter] = "-DSLINT_FEATURE_INTERPRETER=ON, -DSLINT_FEATURE_INTERPRETER=OFF," PACKAGECONFIG[backend-winit-wayland] = "-DSLINT_FEATURE_BACKEND_WINIT_WAYLAND=ON, -DSLINT_FEATURE_BACKEND_WINIT_WAYLAND=OFF,wayland"