aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-03-18 09:50:42 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-03-21 14:35:48 +0000
commit28d9892a442da85ab0a7ba815ce2fd9982e7e29a (patch)
treecf67cab47ddc6125f3afbd53b4cc55382abbf447
parentc21827ecac183e29c43470a953fa37270f5520c7 (diff)
Update wayland-ivi-extension to 1.11.0
* remove unused recipes wayland-ivi-extension 1.5.0 * fix patch 0001-wayland-ivi-extension-patch-for-wl-shell-emulator.patch for the new version 1.11.0 of wayland-ivi-extension. Bug-AGL: SPEC-411 jsmoeller: readd after accident. early merge & revert Change-Id: I34add4548497a8f7105a9e635a953a98e2780e8c Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--recipes-graphics/wayland/wayland-ivi-extension/0001-wayland-ivi-extension-patch-for-wl-shell-emulator.patch82
-rw-r--r--recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend (renamed from recipes-graphics/wayland/wayland-ivi-extension_1.9.1.bbappend)1
-rw-r--r--recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bbappend28
3 files changed, 18 insertions, 93 deletions
diff --git a/recipes-graphics/wayland/wayland-ivi-extension/0001-wayland-ivi-extension-patch-for-wl-shell-emulator.patch b/recipes-graphics/wayland/wayland-ivi-extension/0001-wayland-ivi-extension-patch-for-wl-shell-emulator.patch
index cfcd1e49c..53d414fa0 100644
--- a/recipes-graphics/wayland/wayland-ivi-extension/0001-wayland-ivi-extension-patch-for-wl-shell-emulator.patch
+++ b/recipes-graphics/wayland/wayland-ivi-extension/0001-wayland-ivi-extension-patch-for-wl-shell-emulator.patch
@@ -15,61 +15,13 @@ index a75390f..3610fa9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@ if(WITH_ILM_INPUT)
- add_subdirectory(ivi-input-controller)
+ add_subdirectory(ivi-input-modules/ivi-input-controller)
endif()
-
+
+add_subdirectory(wl-shell-emulator)
-
+
#=============================================================================================
# generate all documents
-diff --git a/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp b/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp
-index 2e65864..8b7e0d1 100644
---- a/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp
-+++ b/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp
-@@ -126,8 +126,11 @@ OpenGLES2App::OpenGLES2App(float fps, float animationSpeed, SurfaceConfiguration
- createWLContext(config);
- createEGLContext();
-
-- ilmClient_init((t_ilm_nativedisplay)m_wlContextStruct.wlDisplay);
-- setupLayerMangement(config);
-+ if (m_wlContextStruct.wlShell == NULL)
-+ {
-+ ilmClient_init((t_ilm_nativedisplay)m_wlContextStruct.wlDisplay);
-+ setupLayerMangement(config);
-+ }
-
- if (config->nosky)
- {
-diff --git a/weston-ivi-shell/src/ivi-controller-interface.h b/weston-ivi-shell/src/ivi-controller-interface.h
-index cdafcc9..fd18009 100644
---- a/weston-ivi-shell/src/ivi-controller-interface.h
-+++ b/weston-ivi-shell/src/ivi-controller-interface.h
-@@ -66,6 +66,25 @@ struct ivi_controller_interface {
- int32_t (*commit_changes)(void);
-
- /**
-+ * \brief Creates an ivi_layout_surface.
-+ *
-+ * \return IVI_SUCCEEDED if the method call was successful
-+ * \return IVI_FAILED if the method call was failed
-+ */
-+ struct ivi_layout_surface* (*surface_create)(
-+ struct weston_surface *wl_surface,
-+ uint32_t id_surface);
-+
-+ /**
-+ * \brief Configure an ivi_layout_surface
-+ *
-+ * \return IVI_SUCCEEDED if the method call was successful
-+ * \return IVI_FAILED if the method call was failed
-+ */
-+ void (*surface_configure)(struct ivi_layout_surface *ivisurf,
-+ int32_t width, int32_t height);
-+
-+ /**
- * surface controller interface
- */
-
diff --git a/wl-shell-emulator/CMakeLists.txt b/wl-shell-emulator/CMakeLists.txt
new file mode 100644
index 0000000..2678098
@@ -206,8 +158,8 @@ index 0000000..274b192
+
+#include <weston/compositor.h>
+
-+#include "ivi-layout-export.h"
-+#include "ivi-controller-interface.h"
++#include "weston/ivi-layout-export.h"
++
+
+#ifndef container_of
+#define container_of(ptr, type, member) ({ \
@@ -244,7 +196,7 @@ index 0000000..274b192
+ struct wl_list controller_list;
+ struct wl_list surface_list;
+ struct weston_compositor *compositor;
-+ const struct ivi_controller_interface *ivi_controller_interface;
++ const struct ivi_layout_interface *ivi_layout_interface;
+
+ uint32_t id_surface_base;
+};
@@ -260,7 +212,7 @@ index 0000000..274b192
+emulator_surface_move(struct wl_client *client, struct wl_resource *resource,
+ struct wl_resource *seat_resource, uint32_t serial)
+{
-+/*Use ivi_controller_interface to implement*/
++/*Use ivi_layout_interface to implement*/
+}
+
+static void
@@ -268,14 +220,14 @@ index 0000000..274b192
+ struct wl_resource *seat_resource, uint32_t serial,
+ uint32_t edges)
+{
-+/*Use ivi_controller_interface to implement*/
++/*Use ivi_layout_interface to implement*/
+}
+
+static void
+emulator_surface_set_toplevel(struct wl_client *client,
+ struct wl_resource *resource)
+{
-+/*Use ivi_controller_interface to implement*/
++/*Use ivi_layout_interface to implement*/
+}
+
+static void
@@ -284,7 +236,7 @@ index 0000000..274b192
+ struct wl_resource *parent_resource,
+ int x, int y, uint32_t flags)
+{
-+/*Use ivi_controller_interface to implement*/
++/*Use ivi_layout_interface to implement*/
+}
+
+static void
@@ -294,7 +246,7 @@ index 0000000..274b192
+ uint32_t framerate,
+ struct wl_resource *output_resource)
+{
-+/*Use ivi_controller_interface to implement*/
++/*Use ivi_layout_interface to implement*/
+}
+
+static void
@@ -388,7 +340,7 @@ index 0000000..274b192
+ surf->last_height = surface->height;
+
+ ctx = surf->context;
-+ ctx->ivi_controller_interface->surface_configure(surf->layout_surface,
++ ctx->ivi_layout_interface->surface_configure(surf->layout_surface,
+ surface->width,
+ surface->height);
+ }
@@ -418,8 +370,8 @@ index 0000000..274b192
+ struct weston_surface *surface;
+ struct ivi_layout_surface *layout_surface;
+ struct wl_resource *res;
-+ const struct ivi_controller_interface *interface =
-+ context->ivi_controller_interface;
++ const struct ivi_layout_interface *interface =
++ context->ivi_layout_interface;
+
+ surface = wl_resource_get_user_data(surface_resource);
+
@@ -510,7 +462,7 @@ index 0000000..274b192
+
+static struct emulator_context *
+create_emulator_context(struct weston_compositor *ec,
-+ const struct ivi_controller_interface *interface)
++ const struct ivi_layout_interface *interface)
+{
+ struct emulator_context *ctx = NULL;
+ ctx = calloc(1, sizeof *ctx);
@@ -523,7 +475,7 @@ index 0000000..274b192
+ memset(ctx, 0, sizeof *ctx);
+
+ ctx->compositor = ec;
-+ ctx->ivi_controller_interface = interface;
++ ctx->ivi_layout_interface = interface;
+ wl_list_init(&ctx->controller_list);
+ wl_list_init(&ctx->surface_list);
+
@@ -552,7 +504,7 @@ index 0000000..274b192
+
+WL_EXPORT int
+controller_module_init(struct weston_compositor *ec, int* argc, char *argv[],
-+ const struct ivi_controller_interface *interface,
++ const struct ivi_layout_interface *interface,
+ size_t interface_version)
+{
+ struct emulator_context *ctx = create_emulator_context(ec, interface);
diff --git a/recipes-graphics/wayland/wayland-ivi-extension_1.9.1.bbappend b/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend
index 56574eb18..16553da67 100644
--- a/recipes-graphics/wayland/wayland-ivi-extension_1.9.1.bbappend
+++ b/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend
@@ -11,6 +11,7 @@ DISABLE_TEST = "-DBUILD_ILM_API_TESTS:BOOL=FALSE \
PACKAGECONFIG ??= "ilm_input test"
PACKAGECONFIG[test] = "${ENABLE_TEST},${DISABLE_TEST},gtest"
+
SRC_URI_append = "\
file://0001-wayland-ivi-extension-patch-for-wl-shell-emulator.patch \
file://cmake-find-gtest.patch \
diff --git a/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bbappend b/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bbappend
deleted file mode 100644
index da97895a2..000000000
--- a/recipes-graphics/wayland/wayland-ivi-extension_1.5.0.bbappend
+++ /dev/null
@@ -1,28 +0,0 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-
-ENABLE_TEST = "-DBUILD_ILM_API_TESTS:BOOL=TRUE \
- -DINSTALL_ILM_API_TESTS:BOOL=TRUE \
- "
-
-DISABLE_TEST = "-DBUILD_ILM_API_TESTS:BOOL=FALSE \
- -DINSTALL_ILM_API_TESTS:BOOL=FALSE \
- "
-
-PACKAGECONFIG ??= "test"
-PACKAGECONFIG[test] = "${ENABLE_TEST},${DISABLE_TEST},gtest"
-
-SRC_URI_append = "\
- file://0001-wayland-ivi-extension-patch-for-wl-shell-emulator.patch \
- file://cmake-find-gtest.patch \
- file://test-path.patch \
- "
-
-PACKAGES =+ "${PN}-test"
-
-FILES_${PN}-test = "${libdir}/${PN}/test/*/CTestTestfile.cmake \
- ${libdir}/${PN}/test/ivi-layermanagement-api-test \
- ${libdir}/${PN}/test/ivi-input-api-test \
- "
-FILES_${PN}-dbg += "${libdir}/${PN}/test/.debug"
-
-RDEPENDS_${PN}-test += "cmake"