From 6fe7a95e048be59afcadbd848b56ac86f0fb4fbd Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Mon, 4 Oct 2021 01:04:39 +0900 Subject: Import wayland-ivi-extension The ivi guest for demo require wayland-ivi-extension on weston. Current AGL is already removed it. This patch import wayland-ivi-extension for weston-8 from meta-arago. git://arago-project.org/git/meta-arago.git Bug-AGL: SPEC-4096 Signed-off-by: Naoto Yamaguchi Change-Id: Ib2c47e603334ae4ab590fdf48b8723956f73022b --- ...1-ivi-input-controller-update-to-weston-7.patch | 28 ++++++++++++++++++ ...02-ivi-id-agent-update-to-weston-7-header.patch | 30 +++++++++++++++++++ ...-update-dependencies-to-build-on-weston-8.patch | 28 ++++++++++++++++++ .../wayland/wayland-ivi-extension_2.2.0.bb | 34 ++++++++++++++++++++++ 4 files changed, 120 insertions(+) create mode 100644 meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/01-ivi-input-controller-update-to-weston-7.patch create mode 100644 meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/02-ivi-id-agent-update-to-weston-7-header.patch create mode 100644 meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/03-ivi-id-agent-update-dependencies-to-build-on-weston-8.patch create mode 100644 meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb diff --git a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/01-ivi-input-controller-update-to-weston-7.patch b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/01-ivi-input-controller-update-to-weston-7.patch new file mode 100644 index 00000000..70756e53 --- /dev/null +++ b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/01-ivi-input-controller-update-to-weston-7.patch @@ -0,0 +1,28 @@ +From efdd2a85519d4990596194af5bf50636d2610f09 Mon Sep 17 00:00:00 2001 +From: Rajendraprasad K J +Date: Mon, 6 Jan 2020 06:41:57 -0500 +Subject: [PATCH] ivi-input-controller: update to weston 7 header files + +update the header file path. + +Upstream-Status: Submitted [https://github.com/GENIVI/wayland-ivi-extension/pull/110] + +Signed-off-by: Rajendraprasad K J +Signed-off-by: Gowtham Tammana +--- + .../ivi-input-controller/src/ivi-input-controller.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c +index a0bfc48..257a1dc 100644 +--- a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c ++++ b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c +@@ -31,7 +31,7 @@ + #include + #include + +-#include "plugin-registry.h" ++#include + #include "ilm_types.h" + + #include "ivi-input-server-protocol.h" diff --git a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/02-ivi-id-agent-update-to-weston-7-header.patch b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/02-ivi-id-agent-update-to-weston-7-header.patch new file mode 100644 index 00000000..8c7189e2 --- /dev/null +++ b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/02-ivi-id-agent-update-to-weston-7-header.patch @@ -0,0 +1,30 @@ +From 5abb2b497e0153210d41ec3685dc0152587625fa Mon Sep 17 00:00:00 2001 +From: Rajendraprasad K J +Date: Mon, 6 Jan 2020 06:45:11 -0500 +Subject: [PATCH] ivi-id-agent: update to weston 7 header files + +update the header file path. + +Upstream-Status: Submitted [https://github.com/GENIVI/wayland-ivi-extension/pull/110] + +Signed-off-by: Rajendraprasad K J +Signed-off-by: Gowtham Tammana +--- + ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c +index 8f0c199..b80e2a4 100644 +--- a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c ++++ b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c +@@ -26,8 +26,8 @@ + #include + + #include +-#include +-#include "config-parser.h" ++#include ++#include + #include + + #ifndef INVALID_ID diff --git a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/03-ivi-id-agent-update-dependencies-to-build-on-weston-8.patch b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/03-ivi-id-agent-update-dependencies-to-build-on-weston-8.patch new file mode 100644 index 00000000..1b18d9bf --- /dev/null +++ b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/03-ivi-id-agent-update-dependencies-to-build-on-weston-8.patch @@ -0,0 +1,28 @@ +From b99082adfaf250b15f03345cdf1b433fb1575581 Mon Sep 17 00:00:00 2001 +From: Rajendraprasad K J +Date: Mon, 6 Jan 2020 06:45:54 -0500 +Subject: [PATCH] ivi-id-agent: update dependencies to build on weston 8 + +upgrade libweston-desktop version. + +Upstream-Status: Submitted [https://github.com/GENIVI/wayland-ivi-extension/pull/110] + +Signed-off-by: Rajendraprasad K J +Signed-off-by: Gowtham Tammana +--- + ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt +index 3e604a5..ff47808 100644 +--- a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt ++++ b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt +@@ -25,7 +25,7 @@ find_package(PkgConfig REQUIRED) + pkg_check_modules(WAYLAND_SERVER wayland-server REQUIRED) + pkg_check_modules(WESTON weston>=6.0.0 REQUIRED) + pkg_check_modules(PIXMAN pixman-1 REQUIRED) +-pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-6 REQUIRED) ++pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-8 REQUIRED) + + find_package(Threads REQUIRED) + diff --git a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb new file mode 100644 index 00000000..a172c1bf --- /dev/null +++ b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb @@ -0,0 +1,34 @@ +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" + +SRCREV = "e9c2fe4c5034a06b159cfd45dbd485755cbaf4c8" + +SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \ + file://01-ivi-input-controller-update-to-weston-7.patch \ + file://02-ivi-id-agent-update-to-weston-7-header.patch \ + file://03-ivi-id-agent-update-dependencies-to-build-on-weston-8.patch \ + " + +S = "${WORKDIR}/git" + +DEPENDS = "weston virtual/libgles2 pixman wayland-native" + +inherit cmake + +EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1" + +FILES_${PN} += "${datadir}/wayland-protocols/stable/ivi-application/ivi-application.xml" +FILES_${PN} += "${libdir}/weston/*" +FILES_${PN}-dbg += "${libdir}/weston/.debug/*" + +EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" + +PR = "r1" + +# Need these temporarily to prevent a non-fatal do_package_qa issue +INSANE_SKIP_${PN} += "dev-deps" +INSANE_SKIP_${PN}-dev += "dev-elf dev-so" -- cgit 1.2.3-korg