* [rocko 1/3] weston: Addition of add_screen_remove_layer API
@ 2018-06-22 5:17 Karthik Ramanan
2018-06-22 5:17 ` [rocko 2/3] wayland-ivi-extension: Update to version 2.1.0 Karthik Ramanan
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Karthik Ramanan @ 2018-06-22 5:17 UTC (permalink / raw)
To: meta-arago
This additional patch is a required dependency for adding
support for wayland-ivi-extension >= 2.0.0
Signed-off-by: Karthik Ramanan <a0393906@ti.com>
---
...001-ivi-shell-add_screen_remove_layer-API.patch | 85 ++++++++++++++++++++++
.../recipes-graphics/wayland/weston_2.0.0.bbappend | 3 +-
2 files changed, 87 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
new file mode 100644
index 0000000..4eb28e1
--- /dev/null
+++ b/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
@@ -0,0 +1,85 @@
+From deee858b0b199d8cfa8033a46d7078f30b23725e Mon Sep 17 00:00:00 2001
+From: "Ucan, Emre (ADITG/SW1)" <eucan@de.adit-jv.com>
+Date: Thu, 2 Mar 2017 08:47:33 +0000
+Subject: [PATCH] ivi-shell: add_screen_remove_layer API
+
+It is analagous to layer_remove_surface API.
+The API removes a layer from the render order
+of the screen.
+
+v3:
+add the new vfunc at the end of
+the ivi_layout_interface struct.
+
+Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
+Reviewed-by: Eugen Friedrich <friedrix@gmail.com>
+Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+---
+ ivi-shell/ivi-layout-export.h | 10 ++++++++++
+ ivi-shell/ivi-layout.c | 22 ++++++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
+index 2317d6e..39ffde1 100644
+--- a/ivi-shell/ivi-layout-export.h
++++ b/ivi-shell/ivi-layout-export.h
+@@ -578,6 +578,16 @@ struct ivi_layout_interface {
+ */
+ struct ivi_layout_surface *
+ (*get_surface)(struct weston_surface *surface);
++
++ /**
++ * \brief Remove a ivi_layer to a weston_output which is currently managed
++ * by the service
++ *
++ * \return IVI_SUCCEEDED if the method call was successful
++ * \return IVI_FAILED if the method call was failed
++ */
++ int32_t (*screen_remove_layer)(struct weston_output *output,
++ struct ivi_layout_layer *removelayer);
+ };
+
+ #ifdef __cplusplus
+diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
+index 298e18e..8e4280b 100644
+--- a/ivi-shell/ivi-layout.c
++++ b/ivi-shell/ivi-layout.c
+@@ -1664,6 +1664,27 @@ ivi_layout_screen_add_layer(struct weston_output *output,
+ }
+
+ static int32_t
++ivi_layout_screen_remove_layer(struct weston_output *output,
++ struct ivi_layout_layer *removelayer)
++{
++ struct ivi_layout_screen *iviscrn;
++
++ if (output == NULL || removelayer == NULL) {
++ weston_log("ivi_layout_screen_remove_layer: invalid argument\n");
++ return IVI_FAILED;
++ }
++
++ iviscrn = get_screen_from_output(output);
++
++ wl_list_remove(&removelayer->pending.link);
++ wl_list_init(&removelayer->pending.link);
++
++ iviscrn->order.dirty = 1;
++
++ return IVI_SUCCEEDED;
++}
++
++static int32_t
+ ivi_layout_screen_set_render_order(struct weston_output *output,
+ struct ivi_layout_layer **pLayer,
+ const int32_t number)
+@@ -2088,6 +2109,7 @@ static struct ivi_layout_interface ivi_layout_interface = {
+ */
+ .get_screens_under_layer = ivi_layout_get_screens_under_layer,
+ .screen_add_layer = ivi_layout_screen_add_layer,
++ .screen_remove_layer = ivi_layout_screen_remove_layer,
+ .screen_set_render_order = ivi_layout_screen_set_render_order,
+
+ /**
+--
+1.9.1
+
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
index ce6f56d..ec8e6b0 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
@@ -2,7 +2,7 @@
PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
-PR_append = ".arago28"
+PR_append = ".arago29"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
@@ -14,6 +14,7 @@ SRC_URI += " \
file://0002-weston-Allow-visual_id-to-be-0.patch \
file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
file://0004-weston-Fix-touch-screen-crash-issue.patch \
+ file://0001-ivi-shell-add_screen_remove_layer-API.patch \
"
INHIBIT_PACKAGE_STRIP = "1"
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [rocko 2/3] wayland-ivi-extension: Update to version 2.1.0
2018-06-22 5:17 [rocko 1/3] weston: Addition of add_screen_remove_layer API Karthik Ramanan
@ 2018-06-22 5:17 ` Karthik Ramanan
2018-06-25 18:07 ` Denys Dmytriyenko
2018-06-22 5:17 ` [rocko 3/3] packagegroup*-graphics: Enable wayland-ivi-extension Karthik Ramanan
2018-06-25 18:06 ` [rocko 1/3] weston: Addition of add_screen_remove_layer API Denys Dmytriyenko
2 siblings, 1 reply; 8+ messages in thread
From: Karthik Ramanan @ 2018-06-22 5:17 UTC (permalink / raw)
To: meta-arago
This version is compatible with weston 2.0.0
Signed-off-by: Karthik Ramanan <a0393906@ti.com>
---
.../wayland/wayland-ivi-extension_1.11.0.bb | 33 ----------------------
.../wayland/wayland-ivi-extension_2.1.0.bb | 31 ++++++++++++++++++++
2 files changed, 31 insertions(+), 33 deletions(-)
delete mode 100644 meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
create mode 100644 meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb
diff --git a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
deleted file mode 100644
index 75e284f..0000000
--- a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-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 = "c9001582b10ce209c37b42dd560947c5aa8928b3"
-
-SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \
- file://force-type-conversion.patch \
- file://0001-layer-add-surfaces-Add-screenId-as-an-argument.patch \
- file://0002-layer-add-surfaces-surface-layer-management.patch \
- "
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "weston virtual/libgles2 pixman wayland-native"
-
-inherit cmake
-
-EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1"
-
-FILES_${PN} += "${libdir}/weston/*"
-FILES_${PN}-dbg += "${libdir}/weston/.debug/*"
-
-EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}"
-
-PR = "r3"
-
-# 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"
diff --git a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb
new file mode 100644
index 0000000..894d1b8
--- /dev/null
+++ b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb
@@ -0,0 +1,31 @@
+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 = "d2c2e262f3bdc9db33b3014293fcdbcfdc90ab27"
+
+SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \
+ file://force-type-conversion.patch \
+ "
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "weston virtual/libgles2 pixman wayland-native"
+
+inherit cmake
+
+EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1"
+
+FILES_${PN} += "${libdir}/weston/*"
+FILES_${PN}-dbg += "${libdir}/weston/.debug/*"
+
+EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib', True).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"
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [rocko 3/3] packagegroup*-graphics: Enable wayland-ivi-extension
2018-06-22 5:17 [rocko 1/3] weston: Addition of add_screen_remove_layer API Karthik Ramanan
2018-06-22 5:17 ` [rocko 2/3] wayland-ivi-extension: Update to version 2.1.0 Karthik Ramanan
@ 2018-06-22 5:17 ` Karthik Ramanan
2018-06-25 18:06 ` [rocko 1/3] weston: Addition of add_screen_remove_layer API Denys Dmytriyenko
2 siblings, 0 replies; 8+ messages in thread
From: Karthik Ramanan @ 2018-06-22 5:17 UTC (permalink / raw)
To: meta-arago
Signed-off-by: Karthik Ramanan <a0393906@ti.com>
---
.../recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
index 8029665..75cd9bc 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
@@ -4,11 +4,11 @@ PR = "r20"
inherit packagegroup
-# wayland-ivi-extension
GRAPHICS_WAYLAND = "\
weston \
weston-init \
weston-examples \
+ wayland-ivi-extension \
"
GRAPHICS_WAYLAND_append_omap-a15 = "\
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [rocko 1/3] weston: Addition of add_screen_remove_layer API
2018-06-22 5:17 [rocko 1/3] weston: Addition of add_screen_remove_layer API Karthik Ramanan
2018-06-22 5:17 ` [rocko 2/3] wayland-ivi-extension: Update to version 2.1.0 Karthik Ramanan
2018-06-22 5:17 ` [rocko 3/3] packagegroup*-graphics: Enable wayland-ivi-extension Karthik Ramanan
@ 2018-06-25 18:06 ` Denys Dmytriyenko
2018-06-27 8:20 ` Karthik Ramanan
2 siblings, 1 reply; 8+ messages in thread
From: Denys Dmytriyenko @ 2018-06-25 18:06 UTC (permalink / raw)
To: Karthik Ramanan; +Cc: meta-arago
On Fri, Jun 22, 2018 at 10:47:46AM +0530, Karthik Ramanan wrote:
> This additional patch is a required dependency for adding
> support for wayland-ivi-extension >= 2.0.0
>
> Signed-off-by: Karthik Ramanan <a0393906@ti.com>
> ---
> ...001-ivi-shell-add_screen_remove_layer-API.patch | 85 ++++++++++++++++++++++
> .../recipes-graphics/wayland/weston_2.0.0.bbappend | 3 +-
> 2 files changed, 87 insertions(+), 1 deletion(-)
> create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
>
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
> new file mode 100644
> index 0000000..4eb28e1
> --- /dev/null
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
> @@ -0,0 +1,85 @@
> +From deee858b0b199d8cfa8033a46d7078f30b23725e Mon Sep 17 00:00:00 2001
> +From: "Ucan, Emre (ADITG/SW1)" <eucan@de.adit-jv.com>
> +Date: Thu, 2 Mar 2017 08:47:33 +0000
> +Subject: [PATCH] ivi-shell: add_screen_remove_layer API
> +
> +It is analagous to layer_remove_surface API.
> +The API removes a layer from the render order
> +of the screen.
> +
> +v3:
> +add the new vfunc at the end of
> +the ivi_layout_interface struct.
Missing Upstream-Status field here, probably "Backport"
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status
> +Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
> +Reviewed-by: Eugen Friedrich <friedrix@gmail.com>
> +Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
> +---
> + ivi-shell/ivi-layout-export.h | 10 ++++++++++
> + ivi-shell/ivi-layout.c | 22 ++++++++++++++++++++++
> + 2 files changed, 32 insertions(+)
> +
> +diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
> +index 2317d6e..39ffde1 100644
> +--- a/ivi-shell/ivi-layout-export.h
> ++++ b/ivi-shell/ivi-layout-export.h
> +@@ -578,6 +578,16 @@ struct ivi_layout_interface {
> + */
> + struct ivi_layout_surface *
> + (*get_surface)(struct weston_surface *surface);
> ++
> ++ /**
> ++ * \brief Remove a ivi_layer to a weston_output which is currently managed
> ++ * by the service
> ++ *
> ++ * \return IVI_SUCCEEDED if the method call was successful
> ++ * \return IVI_FAILED if the method call was failed
> ++ */
> ++ int32_t (*screen_remove_layer)(struct weston_output *output,
> ++ struct ivi_layout_layer *removelayer);
> + };
> +
> + #ifdef __cplusplus
> +diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
> +index 298e18e..8e4280b 100644
> +--- a/ivi-shell/ivi-layout.c
> ++++ b/ivi-shell/ivi-layout.c
> +@@ -1664,6 +1664,27 @@ ivi_layout_screen_add_layer(struct weston_output *output,
> + }
> +
> + static int32_t
> ++ivi_layout_screen_remove_layer(struct weston_output *output,
> ++ struct ivi_layout_layer *removelayer)
> ++{
> ++ struct ivi_layout_screen *iviscrn;
> ++
> ++ if (output == NULL || removelayer == NULL) {
> ++ weston_log("ivi_layout_screen_remove_layer: invalid argument\n");
> ++ return IVI_FAILED;
> ++ }
> ++
> ++ iviscrn = get_screen_from_output(output);
> ++
> ++ wl_list_remove(&removelayer->pending.link);
> ++ wl_list_init(&removelayer->pending.link);
> ++
> ++ iviscrn->order.dirty = 1;
> ++
> ++ return IVI_SUCCEEDED;
> ++}
> ++
> ++static int32_t
> + ivi_layout_screen_set_render_order(struct weston_output *output,
> + struct ivi_layout_layer **pLayer,
> + const int32_t number)
> +@@ -2088,6 +2109,7 @@ static struct ivi_layout_interface ivi_layout_interface = {
> + */
> + .get_screens_under_layer = ivi_layout_get_screens_under_layer,
> + .screen_add_layer = ivi_layout_screen_add_layer,
> ++ .screen_remove_layer = ivi_layout_screen_remove_layer,
> + .screen_set_render_order = ivi_layout_screen_set_render_order,
> +
> + /**
> +--
> +1.9.1
> +
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
> index ce6f56d..ec8e6b0 100644
> --- a/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
> @@ -2,7 +2,7 @@
> PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
> PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
>
> -PR_append = ".arago28"
> +PR_append = ".arago29"
>
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> @@ -14,6 +14,7 @@ SRC_URI += " \
> file://0002-weston-Allow-visual_id-to-be-0.patch \
> file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
> file://0004-weston-Fix-touch-screen-crash-issue.patch \
> + file://0001-ivi-shell-add_screen_remove_layer-API.patch \
> "
>
> INHIBIT_PACKAGE_STRIP = "1"
> --
> 1.9.1
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rocko 2/3] wayland-ivi-extension: Update to version 2.1.0
2018-06-22 5:17 ` [rocko 2/3] wayland-ivi-extension: Update to version 2.1.0 Karthik Ramanan
@ 2018-06-25 18:07 ` Denys Dmytriyenko
2018-06-27 8:20 ` Karthik Ramanan
0 siblings, 1 reply; 8+ messages in thread
From: Denys Dmytriyenko @ 2018-06-25 18:07 UTC (permalink / raw)
To: Karthik Ramanan; +Cc: meta-arago
On Fri, Jun 22, 2018 at 10:47:47AM +0530, Karthik Ramanan wrote:
> This version is compatible with weston 2.0.0
>
> Signed-off-by: Karthik Ramanan <a0393906@ti.com>
> ---
> .../wayland/wayland-ivi-extension_1.11.0.bb | 33 ----------------------
> .../wayland/wayland-ivi-extension_2.1.0.bb | 31 ++++++++++++++++++++
> 2 files changed, 31 insertions(+), 33 deletions(-)
> delete mode 100644 meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
> create mode 100644 meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb
To simplify review, please make it as a diff (-M/-C flags) between old and new.
> diff --git a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
> deleted file mode 100644
> index 75e284f..0000000
> --- a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -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 = "c9001582b10ce209c37b42dd560947c5aa8928b3"
> -
> -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \
> - file://force-type-conversion.patch \
> - file://0001-layer-add-surfaces-Add-screenId-as-an-argument.patch \
> - file://0002-layer-add-surfaces-surface-layer-management.patch \
> - "
> -
> -S = "${WORKDIR}/git"
> -
> -DEPENDS = "weston virtual/libgles2 pixman wayland-native"
> -
> -inherit cmake
> -
> -EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1"
> -
> -FILES_${PN} += "${libdir}/weston/*"
> -FILES_${PN}-dbg += "${libdir}/weston/.debug/*"
> -
> -EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}"
> -
> -PR = "r3"
> -
> -# 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"
> diff --git a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb
> new file mode 100644
> index 0000000..894d1b8
> --- /dev/null
> +++ b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb
> @@ -0,0 +1,31 @@
> +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 = "d2c2e262f3bdc9db33b3014293fcdbcfdc90ab27"
> +
> +SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \
> + file://force-type-conversion.patch \
> + "
> +
> +S = "${WORKDIR}/git"
> +
> +DEPENDS = "weston virtual/libgles2 pixman wayland-native"
> +
> +inherit cmake
> +
> +EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1"
> +
> +FILES_${PN} += "${libdir}/weston/*"
> +FILES_${PN}-dbg += "${libdir}/weston/.debug/*"
> +
> +EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib', True).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"
> --
> 1.9.1
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rocko 1/3] weston: Addition of add_screen_remove_layer API
2018-06-25 18:06 ` [rocko 1/3] weston: Addition of add_screen_remove_layer API Denys Dmytriyenko
@ 2018-06-27 8:20 ` Karthik Ramanan
0 siblings, 0 replies; 8+ messages in thread
From: Karthik Ramanan @ 2018-06-27 8:20 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago
On 25-Jun-18 11:36 PM, Denys Dmytriyenko wrote:
> On Fri, Jun 22, 2018 at 10:47:46AM +0530, Karthik Ramanan wrote:
>> This additional patch is a required dependency for adding
>> support for wayland-ivi-extension >= 2.0.0
>>
>> Signed-off-by: Karthik Ramanan <a0393906@ti.com>
>> ---
>> ...001-ivi-shell-add_screen_remove_layer-API.patch | 85 ++++++++++++++++++++++
>> .../recipes-graphics/wayland/weston_2.0.0.bbappend | 3 +-
>> 2 files changed, 87 insertions(+), 1 deletion(-)
>> create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
>>
>> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
>> new file mode 100644
>> index 0000000..4eb28e1
>> --- /dev/null
>> +++ b/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
>> @@ -0,0 +1,85 @@
>> +From deee858b0b199d8cfa8033a46d7078f30b23725e Mon Sep 17 00:00:00 2001
>> +From: "Ucan, Emre (ADITG/SW1)" <eucan@de.adit-jv.com>
>> +Date: Thu, 2 Mar 2017 08:47:33 +0000
>> +Subject: [PATCH] ivi-shell: add_screen_remove_layer API
>> +
>> +It is analagous to layer_remove_surface API.
>> +The API removes a layer from the render order
>> +of the screen.
>> +
>> +v3:
>> +add the new vfunc at the end of
>> +the ivi_layout_interface struct.
> Missing Upstream-Status field here, probably "Backport"
> https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status
Yes, that is correct. Submitting v2 with this change included.
>
>
>> +Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
>> +Reviewed-by: Eugen Friedrich <friedrix@gmail.com>
>> +Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
>> +---
>> + ivi-shell/ivi-layout-export.h | 10 ++++++++++
>> + ivi-shell/ivi-layout.c | 22 ++++++++++++++++++++++
>> + 2 files changed, 32 insertions(+)
>> +
>> +diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
>> +index 2317d6e..39ffde1 100644
>> +--- a/ivi-shell/ivi-layout-export.h
>> ++++ b/ivi-shell/ivi-layout-export.h
>> +@@ -578,6 +578,16 @@ struct ivi_layout_interface {
>> + */
>> + struct ivi_layout_surface *
>> + (*get_surface)(struct weston_surface *surface);
>> ++
>> ++ /**
>> ++ * \brief Remove a ivi_layer to a weston_output which is currently managed
>> ++ * by the service
>> ++ *
>> ++ * \return IVI_SUCCEEDED if the method call was successful
>> ++ * \return IVI_FAILED if the method call was failed
>> ++ */
>> ++ int32_t (*screen_remove_layer)(struct weston_output *output,
>> ++ struct ivi_layout_layer *removelayer);
>> + };
>> +
>> + #ifdef __cplusplus
>> +diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
>> +index 298e18e..8e4280b 100644
>> +--- a/ivi-shell/ivi-layout.c
>> ++++ b/ivi-shell/ivi-layout.c
>> +@@ -1664,6 +1664,27 @@ ivi_layout_screen_add_layer(struct weston_output *output,
>> + }
>> +
>> + static int32_t
>> ++ivi_layout_screen_remove_layer(struct weston_output *output,
>> ++ struct ivi_layout_layer *removelayer)
>> ++{
>> ++ struct ivi_layout_screen *iviscrn;
>> ++
>> ++ if (output == NULL || removelayer == NULL) {
>> ++ weston_log("ivi_layout_screen_remove_layer: invalid argument\n");
>> ++ return IVI_FAILED;
>> ++ }
>> ++
>> ++ iviscrn = get_screen_from_output(output);
>> ++
>> ++ wl_list_remove(&removelayer->pending.link);
>> ++ wl_list_init(&removelayer->pending.link);
>> ++
>> ++ iviscrn->order.dirty = 1;
>> ++
>> ++ return IVI_SUCCEEDED;
>> ++}
>> ++
>> ++static int32_t
>> + ivi_layout_screen_set_render_order(struct weston_output *output,
>> + struct ivi_layout_layer **pLayer,
>> + const int32_t number)
>> +@@ -2088,6 +2109,7 @@ static struct ivi_layout_interface ivi_layout_interface = {
>> + */
>> + .get_screens_under_layer = ivi_layout_get_screens_under_layer,
>> + .screen_add_layer = ivi_layout_screen_add_layer,
>> ++ .screen_remove_layer = ivi_layout_screen_remove_layer,
>> + .screen_set_render_order = ivi_layout_screen_set_render_order,
>> +
>> + /**
>> +--
>> +1.9.1
>> +
>> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
>> index ce6f56d..ec8e6b0 100644
>> --- a/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
>> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
>> @@ -2,7 +2,7 @@
>> PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
>> PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
>>
>> -PR_append = ".arago28"
>> +PR_append = ".arago29"
>>
>> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>>
>> @@ -14,6 +14,7 @@ SRC_URI += " \
>> file://0002-weston-Allow-visual_id-to-be-0.patch \
>> file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
>> file://0004-weston-Fix-touch-screen-crash-issue.patch \
>> + file://0001-ivi-shell-add_screen_remove_layer-API.patch \
>> "
>>
>> INHIBIT_PACKAGE_STRIP = "1"
>> --
>> 1.9.1
>>
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rocko 2/3] wayland-ivi-extension: Update to version 2.1.0
2018-06-25 18:07 ` Denys Dmytriyenko
@ 2018-06-27 8:20 ` Karthik Ramanan
0 siblings, 0 replies; 8+ messages in thread
From: Karthik Ramanan @ 2018-06-27 8:20 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago
On 25-Jun-18 11:37 PM, Denys Dmytriyenko wrote:
> On Fri, Jun 22, 2018 at 10:47:47AM +0530, Karthik Ramanan wrote:
>> This version is compatible with weston 2.0.0
>>
>> Signed-off-by: Karthik Ramanan <a0393906@ti.com>
>> ---
>> .../wayland/wayland-ivi-extension_1.11.0.bb | 33 ----------------------
>> .../wayland/wayland-ivi-extension_2.1.0.bb | 31 ++++++++++++++++++++
>> 2 files changed, 31 insertions(+), 33 deletions(-)
>> delete mode 100644 meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
>> create mode 100644 meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb
> To simplify review, please make it as a diff (-M/-C flags) between old and new.
Done. Submitted v2.
>
>
>> diff --git a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
>> deleted file mode 100644
>> index 75e284f..0000000
>> --- a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb
>> +++ /dev/null
>> @@ -1,33 +0,0 @@
>> -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 = "c9001582b10ce209c37b42dd560947c5aa8928b3"
>> -
>> -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \
>> - file://force-type-conversion.patch \
>> - file://0001-layer-add-surfaces-Add-screenId-as-an-argument.patch \
>> - file://0002-layer-add-surfaces-surface-layer-management.patch \
>> - "
>> -
>> -S = "${WORKDIR}/git"
>> -
>> -DEPENDS = "weston virtual/libgles2 pixman wayland-native"
>> -
>> -inherit cmake
>> -
>> -EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1"
>> -
>> -FILES_${PN} += "${libdir}/weston/*"
>> -FILES_${PN}-dbg += "${libdir}/weston/.debug/*"
>> -
>> -EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}"
>> -
>> -PR = "r3"
>> -
>> -# 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"
>> diff --git a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb
>> new file mode 100644
>> index 0000000..894d1b8
>> --- /dev/null
>> +++ b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb
>> @@ -0,0 +1,31 @@
>> +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 = "d2c2e262f3bdc9db33b3014293fcdbcfdc90ab27"
>> +
>> +SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \
>> + file://force-type-conversion.patch \
>> + "
>> +
>> +S = "${WORKDIR}/git"
>> +
>> +DEPENDS = "weston virtual/libgles2 pixman wayland-native"
>> +
>> +inherit cmake
>> +
>> +EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1"
>> +
>> +FILES_${PN} += "${libdir}/weston/*"
>> +FILES_${PN}-dbg += "${libdir}/weston/.debug/*"
>> +
>> +EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib', True).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"
>> --
>> 1.9.1
>>
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* [rocko 1/3] weston: Addition of add_screen_remove_layer API
@ 2018-06-27 8:18 Karthik Ramanan
0 siblings, 0 replies; 8+ messages in thread
From: Karthik Ramanan @ 2018-06-27 8:18 UTC (permalink / raw)
To: meta-arago
This additional patch is a required dependency for adding
support for wayland-ivi-extension >= 2.0.0
Signed-off-by: Karthik Ramanan <a0393906@ti.com>
---
...001-ivi-shell-add_screen_remove_layer-API.patch | 87 ++++++++++++++++++++++
.../recipes-graphics/wayland/weston_2.0.0.bbappend | 3 +-
2 files changed, 89 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
new file mode 100644
index 0000000..3e9e54f
--- /dev/null
+++ b/meta-arago-distro/recipes-graphics/wayland/weston/0001-ivi-shell-add_screen_remove_layer-API.patch
@@ -0,0 +1,87 @@
+From deee858b0b199d8cfa8033a46d7078f30b23725e Mon Sep 17 00:00:00 2001
+From: "Ucan, Emre (ADITG/SW1)" <eucan@de.adit-jv.com>
+Date: Thu, 2 Mar 2017 08:47:33 +0000
+Subject: [PATCH] ivi-shell: add_screen_remove_layer API
+
+It is analagous to layer_remove_surface API.
+The API removes a layer from the render order
+of the screen.
+
+v3:
+add the new vfunc at the end of
+the ivi_layout_interface struct.
+
+Upstream-Status: Backport
+
+Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
+Reviewed-by: Eugen Friedrich <friedrix@gmail.com>
+Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+---
+ ivi-shell/ivi-layout-export.h | 10 ++++++++++
+ ivi-shell/ivi-layout.c | 22 ++++++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
+index 2317d6e..39ffde1 100644
+--- a/ivi-shell/ivi-layout-export.h
++++ b/ivi-shell/ivi-layout-export.h
+@@ -578,6 +578,16 @@ struct ivi_layout_interface {
+ */
+ struct ivi_layout_surface *
+ (*get_surface)(struct weston_surface *surface);
++
++ /**
++ * \brief Remove a ivi_layer to a weston_output which is currently managed
++ * by the service
++ *
++ * \return IVI_SUCCEEDED if the method call was successful
++ * \return IVI_FAILED if the method call was failed
++ */
++ int32_t (*screen_remove_layer)(struct weston_output *output,
++ struct ivi_layout_layer *removelayer);
+ };
+
+ #ifdef __cplusplus
+diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
+index 298e18e..8e4280b 100644
+--- a/ivi-shell/ivi-layout.c
++++ b/ivi-shell/ivi-layout.c
+@@ -1664,6 +1664,27 @@ ivi_layout_screen_add_layer(struct weston_output *output,
+ }
+
+ static int32_t
++ivi_layout_screen_remove_layer(struct weston_output *output,
++ struct ivi_layout_layer *removelayer)
++{
++ struct ivi_layout_screen *iviscrn;
++
++ if (output == NULL || removelayer == NULL) {
++ weston_log("ivi_layout_screen_remove_layer: invalid argument\n");
++ return IVI_FAILED;
++ }
++
++ iviscrn = get_screen_from_output(output);
++
++ wl_list_remove(&removelayer->pending.link);
++ wl_list_init(&removelayer->pending.link);
++
++ iviscrn->order.dirty = 1;
++
++ return IVI_SUCCEEDED;
++}
++
++static int32_t
+ ivi_layout_screen_set_render_order(struct weston_output *output,
+ struct ivi_layout_layer **pLayer,
+ const int32_t number)
+@@ -2088,6 +2109,7 @@ static struct ivi_layout_interface ivi_layout_interface = {
+ */
+ .get_screens_under_layer = ivi_layout_get_screens_under_layer,
+ .screen_add_layer = ivi_layout_screen_add_layer,
++ .screen_remove_layer = ivi_layout_screen_remove_layer,
+ .screen_set_render_order = ivi_layout_screen_set_render_order,
+
+ /**
+--
+1.9.1
+
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
index ce6f56d..ec8e6b0 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
@@ -2,7 +2,7 @@
PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
-PR_append = ".arago28"
+PR_append = ".arago29"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
@@ -14,6 +14,7 @@ SRC_URI += " \
file://0002-weston-Allow-visual_id-to-be-0.patch \
file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
file://0004-weston-Fix-touch-screen-crash-issue.patch \
+ file://0001-ivi-shell-add_screen_remove_layer-API.patch \
"
INHIBIT_PACKAGE_STRIP = "1"
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-06-27 8:21 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-22 5:17 [rocko 1/3] weston: Addition of add_screen_remove_layer API Karthik Ramanan
2018-06-22 5:17 ` [rocko 2/3] wayland-ivi-extension: Update to version 2.1.0 Karthik Ramanan
2018-06-25 18:07 ` Denys Dmytriyenko
2018-06-27 8:20 ` Karthik Ramanan
2018-06-22 5:17 ` [rocko 3/3] packagegroup*-graphics: Enable wayland-ivi-extension Karthik Ramanan
2018-06-25 18:06 ` [rocko 1/3] weston: Addition of add_screen_remove_layer API Denys Dmytriyenko
2018-06-27 8:20 ` Karthik Ramanan
2018-06-27 8:18 Karthik Ramanan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.