From 4b735891a88ad6bb36786d50f7f8e53b0c86d7b4 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Wed, 8 Dec 2021 16:59:40 +0100
Subject: [PATCH] lvgl: Drop local versions in favour of the meta-oe ones
New revision of meta-oe includes the recipes.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
.../lvgl/lv-drivers_7.11.0.bb | 46 -------------------
.../recipes-graphics/lvgl/lv-lib-png_8.0.2.bb | 27 -----------
.../recipes-graphics/lvgl/lvgl_8.1.0.bb | 36 ---------------
3 files changed, 109 deletions(-)
delete mode 100644 meta-oniro-staging/recipes-graphics/lvgl/lv-drivers_7.11.0.bb
delete mode 100644 meta-oniro-staging/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb
delete mode 100644 meta-oniro-staging/recipes-graphics/lvgl/lvgl_8.1.0.bb
diff --git a/meta-oniro-staging/recipes-graphics/lvgl/lv-drivers_7.11.0.bb b/meta-oniro-staging/recipes-graphics/lvgl/lv-drivers_7.11.0.bb
deleted file mode 100644
index 6e75f064..00000000
--- a/meta-oniro-staging/recipes-graphics/lvgl/lv-drivers_7.11.0.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: MIT
-
-HOMEPAGE = "https://docs.lvgl.io/latest/en/html/porting/index.html"
-SUMMARY = "LVGL's Display and Touch pad drivers"
-DESCRIPTION = "Collection of drivers: SDL, framebuffer, wayland and more..."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2"
-
-# TODO: Pin upstream release (current v7.11.0-80-g419a757)
-SRC_URI = "git://github.com/lvgl/lv_drivers;destsuffix=${S};protocol=https;nobranch=1"
-SRCREV = "419a757c23aaa67c676fe3a2196d64808fcf2254"
-
-DEPENDS = "libxkbcommon lvgl wayland"
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-inherit cmake
-inherit features_check
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-LVGL_CONFIG_WAYLAND_HOR_RES ?= "480"
-LVGL_CONFIG_WAYLAND_VER_RES ?= "320"
-
-EXTRA_OECMAKE += "-Dinstall:BOOL=ON"
-
-TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1"
-TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl"
-
-# Upstream does not support a default configuration
-# but propose a default "disabled" template, which is used as reference
-# More configuration can be done using external configuration variables
-do_configure_append() {
- [ -r "${S}/lv_drv_conf.h" ] \
- || sed -e "s|#if 0 .*Set it to \"1\" to enable the content.*|#if 1 // Enabled by ${PN}|g" \
- -e "s|# define USE_WAYLAND 0|# define USE_WAYLAND 1|g" \
- -e "s|\(^ *# *define *WAYLAND_HOR_RES *\).*|\1${LVGL_CONFIG_WAYLAND_HOR_RES}|g" \
- -e "s|\(^ *# *define *WAYLAND_VER_RES *\).*|\1${LVGL_CONFIG_WAYLAND_VER_RES}|g" \
- < "${S}/lv_drv_conf_template.h" > "${S}/lv_drv_conf.h"
-}
-
-FILES_${PN}-dev += "\
- ${includedir}/lvgl/lv_drivers/ \
- "
diff --git a/meta-oniro-staging/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb b/meta-oniro-staging/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb
deleted file mode 100644
index 2e5da5a2..00000000
--- a/meta-oniro-staging/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: MIT
-
-HOMEPAGE = "https://docs.lvgl.io"
-SUMMARY = "PNG decoder for LVGL"
-DESCRIPTION = "Allow the use of PNG images in LVGL. This implementation uses lodepng"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2"
-
-SRC_URI = "git://github.com/lvgl/lv_lib_png;destsuffix=${S};protocol=https;nobranch=1"
-SRCREV = "bf1531afe07c9f861107559e29ab8a2d83e4715a"
-
-# because of lvgl dependency
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-DEPENDS += "lvgl"
-
-inherit cmake
-inherit features_check
-
-TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1"
-TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl"
-
-FILES_${PN}-dev = "\
- ${includedir}/lvgl/lv_lib_png/ \
- "
diff --git a/meta-oniro-staging/recipes-graphics/lvgl/lvgl_8.1.0.bb b/meta-oniro-staging/recipes-graphics/lvgl/lvgl_8.1.0.bb
deleted file mode 100644
index d52da14f..00000000
--- a/meta-oniro-staging/recipes-graphics/lvgl/lvgl_8.1.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: MIT
-
-HOMEPAGE = "https://lvgl.io/"
-DESCRIPTION = "LVGL is an OSS graphics library to create embedded GUI"
-SUMMARY = "Light and Versatile Graphics Library"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a"
-
-SRC_URI = "gitsm://github.com/lvgl/lvgl;destsuffix=${S};protocol=https;nobranch=1"
-SRCREV = "d38eb1e689fa5a64c25e677275172d9c8a4ab2f0"
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-inherit cmake
-inherit features_check
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-LVGL_CONFIG_LV_MEM_CUSTOM ?= "0"
-
-# Upstream does not support a default configuration
-# but propose a default "disabled" template, which is used as reference
-# More configuration can be done using external configuration variables
-do_configure_prepend() {
- [ -r "${S}/lv_conf.h" ] \
- || sed -e 's|#if 0 .*Set it to "1" to enable .*|#if 1 // Enabled|g' \
- -e "s|\(#define LV_MEM_CUSTOM .*\)0|\1${LVGL_CONFIG_LV_MEM_CUSTOM}|g" \
- < "${S}/lv_conf_template.h" > "${S}/lv_conf.h"
-}
-
-FILES_${PN}-dev += "\
- ${includedir}/${PN}/ \
- ${includedir}/${PN}/lvgl/ \
- "
--
GitLab