aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Bachmann <mbc@iot.bzh>2015-10-01 11:51:10 +0200
committerYong-iL Joh <yong-il.joh@windriver.com>2015-11-10 20:52:31 +0900
commit647889838b7175d687c094f75f55b1c4ddf8aef0 (patch)
tree274d3ffba92fe54e4aea8c4f4dbbb9ddadc6f2cf
parentf997a4b0ced1b5e25d05f4b1fa7c47abf2f49c94 (diff)
downloadmeta-ivi-647889838b7175d687c094f75f55b1c4ddf8aef0.tar.gz
meta-ivi-647889838b7175d687c094f75f55b1c4ddf8aef0.tar.bz2
meta-ivi-647889838b7175d687c094f75f55b1c4ddf8aef0.zip
wayland-ivi-extension: add support for version 1.5.0
- Also adds a backport for Wayland/Weston 1.5.0 ; work in all cases, though. - to keep the API of wayland-ivi-extension, set preferred version to 1.3.0 Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>
-rw-r--r--README.md5
-rw-r--r--meta-ivi/conf/distro/poky-ivi-systemd.conf3
-rw-r--r--meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/apply_weston-1.5.x.patch249
-rw-r--r--meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb20
4 files changed, 277 insertions, 0 deletions
diff --git a/README.md b/README.md
index 8c96939..da10773 100644
--- a/README.md
+++ b/README.md
@@ -92,3 +92,8 @@ export TEMPLATECONF=/full/path/to/meta-ivi/meta-ivi/conf
5. To login use these credentials:
> User - root
> Password - root
+
+6. To use wayland-ivi-extension 1.5.0,
+ put below line to conf/local.conf at your build directory
+
+ PREFERRED_VERSION_wayland-ivi-extension = "1.5.0"
diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf
index f67f17f..285ceeb 100644
--- a/meta-ivi/conf/distro/poky-ivi-systemd.conf
+++ b/meta-ivi/conf/distro/poky-ivi-systemd.conf
@@ -34,6 +34,9 @@ PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.4.%"
PREFERRED_VERSION_gstreamer1.0-libav ?= "1.4.%"
PREFERRED_VERSION_gstreamer1.0-omx ?= "1.2.%"
+# to keep the compatibility of wayland-ivi-extension
+PREFERRED_VERSION_wayland-ivi-extension ?= "1.3.0"
+
POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "packagegroup-core-device-devel",d)}"
DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"
DISTRO_EXTRA_RDEPENDS_append_qemux86 = " ${POKYQEMUDEPS}"
diff --git a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/apply_weston-1.5.x.patch b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/apply_weston-1.5.x.patch
new file mode 100644
index 0000000..8cbbdd1
--- /dev/null
+++ b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension/apply_weston-1.5.x.patch
@@ -0,0 +1,249 @@
+From fb66405f4f8ee200a443e22d3b4f56a0e917f785 Mon Sep 17 00:00:00 2001
+From: Manuel Bachmann <mbc@iot.bzh>
+Date: Wed, 30 Sep 2015 05:22:25 +0200
+Subject: [PATCH] Backport to Wayland/Weston 1.9.0 > 1.5.0.
+
+Downgrade requirements to Wayland/Weston 1.9.0 > 1.5.0.
+
+"wl_display_roundtrip_queue()" did not exist at the time,
+so just use the wrapper functions instead.
+
+Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>
+---
+ .../ilmClient/src/ilm_client_wayland_platform.c | 15 ++----
+ .../ilmControl/src/ilm_control_wayland_platform.c | 52 +++++++++++++++++---
+ protocol/CMakeLists.txt | 4 +-
+ weston-ivi-shell/CMakeLists.txt | 4 +-
+ weston-ivi-shell/src/ivi-extension.c | 9 +++-
+ weston-ivi-shell/src/ivi-layout-export.h | 2 +
+ 6 files changed, 63 insertions(+), 23 deletions(-)
+
+diff --git a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c
+index 55b1621..8730616 100644
+--- a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c
++++ b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c
+@@ -61,7 +61,6 @@ struct ilm_client_context {
+ struct wl_registry *registry;
+ struct wl_compositor *compositor;
+ struct ivi_application *ivi_application;
+- struct wl_event_queue *queue;
+
+ struct wl_list list_surface;
+
+@@ -167,12 +166,6 @@ destroy_client_resouses(void)
+ ctx->ivi_application = NULL;
+ }
+
+- if (ctx->queue)
+- {
+- wl_event_queue_destroy(ctx->queue);
+- ctx->queue = NULL;
+- }
+-
+ if (ctx->registry)
+ {
+ wl_registry_destroy(ctx->registry);
+@@ -203,21 +196,19 @@ init_client(void)
+
+ wl_list_init(&ctx->list_surface);
+
+- ctx->queue = wl_display_create_queue(ctx->display);
+ ctx->registry = wl_display_get_registry(ctx->display);
+ if (ctx->registry == NULL) {
+- wl_event_queue_destroy(ctx->queue);
+ fprintf(stderr, "Failed to get registry\n");
+ return;
+ }
+
+- wl_proxy_set_queue((void*)ctx->registry, ctx->queue);
+ if (wl_registry_add_listener(ctx->registry,
+ &registry_client_listener, ctx)) {
+ fprintf(stderr, "Failed to add registry listener\n");
+ return;
+ }
+- wl_display_roundtrip_queue(ctx->display, ctx->queue);
++ wl_display_dispatch(ctx->display);
++ wl_display_roundtrip(ctx->display);
+
+ if ((ctx->display == NULL) || (ctx->ivi_application == NULL)) {
+ fprintf(stderr, "Failed to connect display at ilm_client\n");
+@@ -239,7 +230,7 @@ get_client_instance(void)
+ exit(0);
+ }
+
+- wl_display_roundtrip_queue(ctx->display, ctx->queue);
++ wl_display_roundtrip(ctx->display);
+
+ return ctx;
+ }
+diff --git a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
+index 8910df5..61bdfc5 100644
+--- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
++++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
+@@ -76,6 +76,46 @@ struct screen_context {
+ struct ilm_control_context *ctx;
+ };
+
++static void roundtrip_done(void *data, struct wl_callback *callback,
++ uint32_t serial)
++{
++ (void) serial;
++
++ *(int *)data = 1;
++
++ wl_callback_destroy(callback);
++}
++
++static struct wl_callback_listener roundtrip_listener = {roundtrip_done};
++
++int display_roundtrip_queue(struct wl_display *display,
++ struct wl_event_queue *queue)
++{
++ int done = 0;
++ int ret = 0;
++ struct wl_callback *callback = wl_display_sync(display);
++
++ if (! callback)
++ {
++ return -1;
++ }
++
++ wl_proxy_set_queue((void *)callback, queue);
++ wl_callback_add_listener(callback, &roundtrip_listener, &done);
++
++ while (ret != -1 && !done)
++ {
++ ret = wl_display_dispatch_queue(display, queue);
++ }
++
++ if (ret == -1 && !done)
++ {
++ wl_callback_destroy(callback);
++ }
++
++ return ret;
++}
++
+ static inline void lock_context(struct ilm_control_context *ctx)
+ {
+ pthread_mutex_lock(&ctx->mutex);
+@@ -1304,11 +1344,11 @@ init_control(void)
+
+ if (
+ // first level objects; ivi_controller
+- wl_display_roundtrip_queue(wl->display, wl->queue) == -1 ||
++ display_roundtrip_queue(wl->display, wl->queue) == -1 ||
+ // second level object: ivi_controller_surfaces/layers
+- wl_display_roundtrip_queue(wl->display, wl->queue) == -1 ||
++ display_roundtrip_queue(wl->display, wl->queue) == -1 ||
+ // third level objects: ivi_controller_surfaces/layers properties
+- wl_display_roundtrip_queue(wl->display, wl->queue) == -1)
++ display_roundtrip_queue(wl->display, wl->queue) == -1)
+ {
+ fprintf(stderr, "Failed to initialize wayland connection: %s\n", strerror(errno));
+ return -1;
+@@ -1349,7 +1389,7 @@ ilmErrorTypes impl_sync_and_acquire_instance(struct ilm_control_context *ctx)
+
+ lock_context(ctx);
+
+- if (wl_display_roundtrip_queue(ctx->wl.display, ctx->wl.queue) == -1) {
++ if (display_roundtrip_queue(ctx->wl.display, ctx->wl.queue) == -1) {
+ int err = wl_display_get_error(ctx->wl.display);
+ fprintf(stderr, "Error communicating with wayland: %s\n", strerror(err));
+ unlock_context(ctx);
+@@ -2454,7 +2494,7 @@ ilm_getPropertiesOfSurface(t_ilm_uint surfaceID,
+ // request statistics for surface
+ ivi_controller_surface_send_stats(ctx_surf->controller);
+ // force submission
+- int ret = wl_display_roundtrip_queue(ctx->wl.display, ctx->wl.queue);
++ int ret = display_roundtrip_queue(ctx->wl.display, ctx->wl.queue);
+
+ // If we got an error here, there is really no sense
+ // in returning the properties as something is fundamentally
+@@ -2567,7 +2607,7 @@ ilm_commitChanges(void)
+ if (ctx->wl.controller != NULL) {
+ ivi_controller_commit_changes(ctx->wl.controller);
+
+- if (wl_display_roundtrip_queue(ctx->wl.display, ctx->wl.queue) != -1)
++ if (display_roundtrip_queue(ctx->wl.display, ctx->wl.queue) != -1)
+ {
+ returnValue = ILM_SUCCESS;
+ }
+diff --git a/protocol/CMakeLists.txt b/protocol/CMakeLists.txt
+index 6842131..207b8f1 100644
+--- a/protocol/CMakeLists.txt
++++ b/protocol/CMakeLists.txt
+@@ -22,8 +22,8 @@ cmake_minimum_required (VERSION 2.6)
+ project(ivi-extension-protocol)
+
+ find_package(PkgConfig REQUIRED)
+-pkg_check_modules(WAYLAND_CLIENT wayland-client>=1.9.0 REQUIRED)
+-pkg_check_modules(WAYLAND_SERVER wayland-server>=1.9.0 REQUIRED)
++pkg_check_modules(WAYLAND_CLIENT wayland-client>=1.5.0 REQUIRED)
++pkg_check_modules(WAYLAND_SERVER wayland-server>=1.5.0 REQUIRED)
+
+ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner)
+
+diff --git a/weston-ivi-shell/CMakeLists.txt b/weston-ivi-shell/CMakeLists.txt
+index c2664df..927e3f5 100644
+--- a/weston-ivi-shell/CMakeLists.txt
++++ b/weston-ivi-shell/CMakeLists.txt
+@@ -23,8 +23,8 @@ cmake_minimum_required (VERSION 2.6)
+ project(ivi-controller)
+
+ find_package(PkgConfig REQUIRED)
+-pkg_check_modules(WAYLAND_SERVER wayland-server>=1.9.0 REQUIRED)
+-pkg_check_modules(WESTON weston>=1.9.0 REQUIRED)
++pkg_check_modules(WAYLAND_SERVER wayland-server>=1.5.0 REQUIRED)
++pkg_check_modules(WESTON weston>=1.5.0 REQUIRED)
+ pkg_check_modules(PIXMAN pixman-1 REQUIRED)
+
+ GET_TARGET_PROPERTY(IVI_EXTENSION_INCLUDE_DIRS ivi-extension-protocol INCLUDE_DIRECTORIES)
+diff --git a/weston-ivi-shell/src/ivi-extension.c b/weston-ivi-shell/src/ivi-extension.c
+index bb3b23d..ba2d7e6 100755
+--- a/weston-ivi-shell/src/ivi-extension.c
++++ b/weston-ivi-shell/src/ivi-extension.c
+@@ -702,11 +702,17 @@ ivi_extension_layer_set_fade_info(struct ivishell *shell,
+ start_alpha, end_alpha);
+ }
+
++#if 0 // this is for weston/wayland 1.7.0
+ WL_EXPORT int
+ controller_module_init(struct weston_compositor *compositor,
+ int *argc, char *argv[],
+ const struct ivi_controller_interface *interface,
+ size_t interface_version)
++#else
++WL_EXPORT int
++module_init(struct weston_compositor *compositor,
++ int *argc, char *argv[])
++#endif
+ {
+ struct ivi_controller_shell *controller_shell;
+ (void)argc;
+@@ -718,7 +724,8 @@ controller_module_init(struct weston_compositor *compositor,
+
+ memset(controller_shell, 0, sizeof *controller_shell);
+
+- controller_shell->interface = interface;
++ //controller_shell->interface = interface;
++ controller_shell->interface = get_ivi_controller_interface();
+
+ init_ivi_shell(compositor, &controller_shell->base);
+
+diff --git a/weston-ivi-shell/src/ivi-layout-export.h b/weston-ivi-shell/src/ivi-layout-export.h
+index d38d6ea..e07acb2 100644
+--- a/weston-ivi-shell/src/ivi-layout-export.h
++++ b/weston-ivi-shell/src/ivi-layout-export.h
+@@ -169,6 +169,8 @@ typedef void (*ivi_controller_surface_content_callback)(
+ struct ivi_layout_surface *ivisurf,
+ int32_t content,
+ void *userdata);
++
++struct ivi_controller_interface *get_ivi_controller_interface(void);
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
+--
+1.7.9.5
+
diff --git a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb
new file mode 100644
index 0000000..56bb560
--- /dev/null
+++ b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bb
@@ -0,0 +1,20 @@
+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=176cedb32f48dd58f07e0c1c717b3ea4"
+
+DEPENDS = "weston"
+
+SRC_URI = "git://git.projects.genivi.org/${PN}.git \
+ file://apply_weston-1.5.x.patch \
+ "
+SRCREV = "8f0874b606b8e2a9385af947728905735bad3939"
+
+S = "${WORKDIR}/git"
+
+inherit cmake autotools
+
+FILES_${PN} += "${libdir}/weston/*"
+FILES_${PN}-dbg += "${libdir}/weston/.debug/*"