diff options
Diffstat (limited to 'meta-agl-profile-graphical/recipes-graphics')
24 files changed, 0 insertions, 734 deletions
diff --git a/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.bb b/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.bb deleted file mode 100644 index 427132ed6..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A very basic Wayland image with a terminal" - -require agl-image-weston.inc - -LICENSE = "MIT" - -IMAGE_INSTALL_append = "\ - packagegroup-agl-image-weston \ - " - -DISTRO_FEATURES_append = " agl-core-image-profile" -IMAGE_INSTALL_append = " agl-desktop-config" diff --git a/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.inc b/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.inc deleted file mode 100644 index 947d22b50..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/images/agl-image-weston.inc +++ /dev/null @@ -1,7 +0,0 @@ -require recipes-core/images/agl-image-minimal.inc - -IMAGE_FEATURES += "splash package-management ssh-server-dropbear" - -inherit distro_features_check - -REQUIRED_DISTRO_FEATURES = "wayland" diff --git a/meta-agl-profile-graphical/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb b/meta-agl-profile-graphical/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb deleted file mode 100644 index dcf21bcfb..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "The minimal set of packages required for basic Wayland image" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-image-weston \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "weston weston-init weston-ini-conf weston-examples" -RDEPENDS_${PN} += "agl-login-manager" - -RDEPENDS_${PN} += "\ - packagegroup-agl-image-minimal \ - " diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch deleted file mode 100644 index 636ecf1b9..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Resolve-weston-crush-when-repeat-touching-very-quick.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 97af4843a4705cd7d5b6b69abb9002fd974a5b94 Mon Sep 17 00:00:00 2001 -From: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> -Date: Fri, 12 Jan 2018 01:53:01 +0900 -Subject: [PATCH] Resolve weston cursh when repeat touching very quickly - -Weston sometimes crush while the user repeat touching very -quickly icons/shortcuts on HomeScreen. - -Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> ---- - ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c | 4 ++++ - 1 file changed, 4 insertions(+) - -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 b0fe37d..f1a31d0 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 -@@ -557,6 +557,10 @@ touch_grab_up(struct weston_touch_grab *grab, uint32_t time, int touch_id) - const struct ivi_layout_interface *interface = - seat->input_ctx->ivi_layout_interface; - -+ /* if touch device has no focused view, there is nothing to do*/ -+ if (grab->touch->focus == NULL) -+ return; -+ - /* For each surface_ctx, check for focus and send */ - wl_list_for_each(surf_ctx, &seat->input_ctx->surface_list, link) { - struct weston_surface *surf, *send_surf; --- -2.7.4 - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-simple-id-agent-initial-commit.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-simple-id-agent-initial-commit.patch deleted file mode 100644 index 9e95167ed..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-simple-id-agent-initial-commit.patch +++ /dev/null @@ -1,264 +0,0 @@ -From 8f67f40f7c6b6f62e094f0bdc5044793ae76b1c7 Mon Sep 17 00:00:00 2001 -From: Emre Ucan <eucan@de.adit-jv.com> -Date: Fri, 24 Nov 2017 16:24:51 +0100 -Subject: [PATCH 1/2] simple-id-agent: initial commit - -it is a very simple id-agent plugin. -It is possible to configure default surface id -offset. Assigned ids would start -from the given id offset. - -Please check the example weston.ini for loading -and configuring the simple-id-agent - -Signed-off-by: Emre Ucan <eucan@de.adit-jv.com> ---- - CMakeLists.txt | 1 + - id-agent-modules/simple-id-agent/CMakeLists.txt | 72 ++++++++++++ - .../simple-id-agent/src/simple-id-agent.c | 124 +++++++++++++++++++++ - id-agent-modules/simple-id-agent/weston.ini.in | 11 ++ - 4 files changed, 208 insertions(+) - create mode 100644 id-agent-modules/simple-id-agent/CMakeLists.txt - create mode 100644 id-agent-modules/simple-id-agent/src/simple-id-agent.c - create mode 100644 id-agent-modules/simple-id-agent/weston.ini.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bad85df..d07abf5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,6 +35,7 @@ add_subdirectory(ivi-layermanagement-api/ilmClient) - add_subdirectory(ivi-layermanagement-api/ilmControl) - add_subdirectory(ivi-layermanagement-api/test) - add_subdirectory(ivi-layermanagement-examples) -+add_subdirectory(id-agent-modules/simple-id-agent) - - if(WITH_ILM_INPUT) - add_subdirectory(ivi-input-api/ilmInput) -diff --git a/id-agent-modules/simple-id-agent/CMakeLists.txt b/id-agent-modules/simple-id-agent/CMakeLists.txt -new file mode 100644 -index 0000000..8290722 ---- /dev/null -+++ b/id-agent-modules/simple-id-agent/CMakeLists.txt -@@ -0,0 +1,72 @@ -+############################################################################ -+# -+# Copyright (C) 2013 DENSO CORPORATION -+# Copyright 2014 BMW Car IT GmbH -+# -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+# -+############################################################################ -+ -+cmake_minimum_required (VERSION 2.6) -+ -+project(simple-id-agent) -+ -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(WAYLAND_SERVER wayland-server>=1.13.0 REQUIRED) -+pkg_check_modules(WESTON weston>=2.0.0 REQUIRED) -+pkg_check_modules(PIXMAN pixman-1 REQUIRED) -+ -+find_package(Threads REQUIRED) -+ -+GET_TARGET_PROPERTY(IVI_EXTENSION_INCLUDE_DIRS ivi-extension-protocol INCLUDE_DIRECTORIES) -+ -+include_directories( -+ src -+ ${IVI_EXTENSION_INCLUDE_DIRS} -+ ${WAYLAND_SERVER_INCLUDE_DIRS} -+ ${WESTON_INCLUDE_DIRS} -+ ${PIXMAN_INCLUDE_DIRS} -+) -+ -+link_directories( -+ ${WAYLAND_SERVER_LIBRARY_DIRS} -+ ${PIXMAN_LIBRARY_DIRS} -+) -+ -+add_library(${PROJECT_NAME} MODULE -+ src/simple-id-agent.c -+) -+ -+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") -+ -+add_dependencies(${PROJECT_NAME} -+ ivi-extension-protocol -+ ${WAYLAND_SERVER_LIBRARIES} -+ ${PIXMAN_LIBRARIES} -+) -+ -+set(LIBS -+ ${LIBS} -+ ivi-extension-protocol -+ ${WAYLAND_SERVER_LIBRARIES} -+) -+ -+set(CMAKE_C_LDFLAGS "-module -avoid-version") -+ -+target_link_libraries(${PROJECT_NAME} ${LIBS}) -+ -+install ( -+ TARGETS ${PROJECT_NAME} -+ LIBRARY DESTINATION lib${LIB_SUFFIX}/weston -+) -diff --git a/id-agent-modules/simple-id-agent/src/simple-id-agent.c b/id-agent-modules/simple-id-agent/src/simple-id-agent.c -new file mode 100644 -index 0000000..3c9e989 ---- /dev/null -+++ b/id-agent-modules/simple-id-agent/src/simple-id-agent.c -@@ -0,0 +1,124 @@ -+/* -+ * Copyright (C) 2017 Advanced Driver Information Technology Joint Venture GmbH -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and -+ * its documentation for any purpose is hereby granted without fee, provided -+ * that the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of the copyright holders not be used in -+ * advertising or publicity pertaining to distribution of the software -+ * without specific, written prior permission. The copyright holders make -+ * no representations about the suitability of this software for any -+ * purpose. It is provided "as is" without express or implied warranty. -+ * -+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS -+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY -+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#include <stdlib.h> -+#include <stdio.h> -+#include <string.h> -+#include <limits.h> -+ -+#include <weston.h> -+#include <weston/ivi-layout-export.h> -+ -+struct ivi_id_agent -+{ -+ uint32_t default_id_offset; -+ uint32_t last_assigned_id; -+ struct weston_compositor *compositor; -+ const struct ivi_layout_interface *interface; -+ struct wl_listener desktop_surface_configured; -+}; -+ -+static void -+desktop_surface_event_configure(struct wl_listener *listener, -+ void *data) -+{ -+ struct ivi_id_agent *ida = wl_container_of(listener, ida, -+ desktop_surface_configured); -+ struct ivi_layout_surface *layout_surface = -+ (struct ivi_layout_surface *) data; -+ uint32_t tmp_id; -+ -+ tmp_id = ++ida->last_assigned_id; -+ -+ /* Find an unused id */ -+ while(ida->interface->get_surface_from_id(tmp_id)) { -+ weston_log("simple-id-agent: surface id: %d is already used\n", tmp_id); -+ tmp_id++; -+ } -+ -+ ida->last_assigned_id = tmp_id; -+ -+ if (ida->interface->surface_set_id(layout_surface, ida->last_assigned_id) != 0) -+ weston_log("simple-id-agent: failed to set surface id :%d\n", ida->last_assigned_id); -+} -+ -+static void -+deinit(struct ivi_id_agent *ida) -+{ -+ wl_list_remove(&ida->desktop_surface_configured.link); -+ free(ida); -+} -+ -+static int32_t -+read_config(struct ivi_id_agent *ida) -+{ -+ struct weston_config *config = NULL; -+ struct weston_config_section *section = NULL; -+ const char *name = NULL; -+ -+ config = wet_get_config(ida->compositor); -+ if (!config) -+ return -1; -+ -+ section = weston_config_get_section(config, "id-agent", NULL, NULL); -+ -+ if (section) { -+ -+ weston_config_section_get_uint(section, "default-id-offset", -+ &ida->default_id_offset, 0); -+ -+ } else { -+ ida->default_id_offset = 0; -+ } -+ -+ return 0; -+} -+ -+WL_EXPORT int32_t -+id_agent_module_init(struct weston_compositor *ec, -+ const struct ivi_layout_interface *interface, -+ size_t interface_version) -+{ -+ struct ivi_id_agent *ida; -+ -+ ida = calloc(1, sizeof *ida); -+ if (ida == NULL) { -+ weston_log("failed to allocate ivi_id_agent\n"); -+ return -1; -+ } -+ -+ ida->compositor = ec; -+ ida->interface = interface; -+ ida->desktop_surface_configured.notify = desktop_surface_event_configure; -+ ida->interface->add_listener_configure_desktop_surface(&ida->desktop_surface_configured); -+ -+ if(read_config(ida) != 0) { -+ deinit(ida); -+ return -1; -+ } -+ -+ ida->last_assigned_id = ida->default_id_offset; -+ -+ weston_log("id_agent_module_init: success\n"); -+ -+ return 0; -+} -diff --git a/id-agent-modules/simple-id-agent/weston.ini.in b/id-agent-modules/simple-id-agent/weston.ini.in -new file mode 100644 -index 0000000..b5e5fa1 ---- /dev/null -+++ b/id-agent-modules/simple-id-agent/weston.ini.in -@@ -0,0 +1,11 @@ -+[core] -+shell=ivi-shell.so -+require-input=false -+ -+[ivi-shell] -+ivi-module=ivi-controller.so -+ivi-input-module=ivi-input-controller.so -+id-agent-module=simple-id-agent.so -+ -+[id-agent] -+default-id-offset=10 --- -2.13.6 - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-controller-load-id-agent-module.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-controller-load-id-agent-module.patch deleted file mode 100644 index f44786a36..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-controller-load-id-agent-module.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 26f2f7ce78ba2002809048b227ad9c35921a9cd8 Mon Sep 17 00:00:00 2001 -From: Emre Ucan <eucan@de.adit-jv.com> -Date: Fri, 24 Nov 2017 16:27:01 +0100 -Subject: [PATCH 2/2] ivi-controller: load id-agent module - -Signed-off-by: Emre Ucan <eucan@de.adit-jv.com> ---- - weston-ivi-shell/src/ivi-controller.c | 39 +++++++++++++++++++++++++++++++++++ - 1 file changed, 39 insertions(+) - -diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c -index 312a978..47b6de2 100644 ---- a/weston-ivi-shell/src/ivi-controller.c -+++ b/weston-ivi-shell/src/ivi-controller.c -@@ -1518,6 +1518,40 @@ load_input_module(struct weston_compositor *ec, - return 0; - } - -+static int load_id_agent_module(struct weston_compositor *ec, -+ const struct ivi_layout_interface *interface, -+ size_t interface_version) -+{ -+ struct weston_config *config = wet_get_config(ec); -+ struct weston_config_section *section; -+ char *id_agent_module = NULL; -+ -+ int (*id_agent_module_init)(struct weston_compositor *ec, -+ const struct ivi_layout_interface *interface, -+ size_t interface_version); -+ -+ section = weston_config_get_section(config, "ivi-shell", NULL, NULL); -+ -+ if (weston_config_section_get_string(section, "id-agent-module", -+ &id_agent_module, NULL) < 0) { -+ weston_log("ivi-controller: No id-agent-module set\n"); -+ return 0; -+ } -+ -+ id_agent_module_init = wet_load_module_entrypoint(id_agent_module, "id_agent_module_init"); -+ if (!id_agent_module_init) -+ return -1; -+ -+ if (id_agent_module_init(ec, interface, -+ sizeof(struct ivi_layout_interface)) != 0) { -+ weston_log("ivi-controller: Initialization of id agent module fails\n"); -+ return -1; -+ } -+ -+ free(id_agent_module); -+ return 0; -+} -+ - WL_EXPORT int - controller_module_init(struct weston_compositor *compositor, - int *argc, char *argv[], -@@ -1555,5 +1589,10 @@ controller_module_init(struct weston_compositor *compositor, - return -1; - } - -+ if (load_id_agent_module(compositor, interface, interface_version) < 0) { -+ free(shell); -+ return -1; -+ } -+ - return 0; - } --- -2.13.6 - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch deleted file mode 100644 index d2d027256..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 525b5bf65303d661f44c01b11bafd5ba90976850 Mon Sep 17 00:00:00 2001 -From: Wataru Mizuno <wmizuno@jp.adit-jv.com> -Date: Wed, 6 Dec 2017 19:35:51 +0900 -Subject: [PATCH] ivi-controller: add resize setting suit to surface size - -The ivi-controller resizes surface size like desktop usecase. - -When window manager swicths the half size window to full size, -resize was not working correctly. -This patch fixs this issue by changing surface source region at -the same timing of destination region is changed. - -This patch is not necessary later version of wayland-ivi-extension -2.0 since this resize function has already been implemented by -appropriate manner. - -Signed-off-by: Wataru Mizuno <wmizuno@jp.adit-jv.com> ---- - weston-ivi-shell/src/ivi-controller.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c -index 312a978..9450cf2 100644 ---- a/weston-ivi-shell/src/ivi-controller.c -+++ b/weston-ivi-shell/src/ivi-controller.c -@@ -1334,7 +1334,7 @@ surface_event_configure(struct wl_listener *listener, void *data) - struct ivisurface *ivisurf = NULL; - struct ivi_layout_surface *layout_surface = - (struct ivi_layout_surface *) data; -- const struct ivi_layout_surface_properties *prop; -+ struct weston_surface *w_surface; - - ivisurf = get_surface(&shell->list_surface, layout_surface); - if (ivisurf == NULL) { -@@ -1342,11 +1342,22 @@ surface_event_configure(struct wl_listener *listener, void *data) - return; - } - -- prop = lyt->get_properties_of_surface(layout_surface); -+ w_surface = lyt->surface_get_weston_surface(layout_surface); -+ lyt->surface_set_destination_rectangle(layout_surface, -+ ivisurf->prop->dest_x, -+ ivisurf->prop->dest_y, -+ w_surface->width, -+ w_surface->height); -+ lyt->surface_set_source_rectangle(layout_surface, -+ 0, -+ 0, -+ w_surface->width, -+ w_surface->height); -+ lyt->commit_changes(); - - wl_resource_for_each(resource, &ivisurf->resource_list) { - send_surface_event(resource, ivisurf, -- prop, IVI_NOTIFICATION_CONFIGURE); -+ ivisurf->prop, IVI_NOTIFICATION_CONFIGURE); - } - } - --- -2.7.4 - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch deleted file mode 100644 index 5371174d5..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur old/ivi-input-api/test/CMakeLists.txt new/ivi-input-api/test/CMakeLists.txt ---- old/ivi-input-api/test/CMakeLists.txt 2015-10-19 23:31:13.000000000 +1000 -+++ new/ivi-input-api/test/CMakeLists.txt 2015-10-19 23:30:32.000000000 +1000 -@@ -18,6 +18,7 @@ - ############################################################################ - - CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules) - - FIND_PACKAGE(gtest) - -diff -Naur old/ivi-layermanagement-api/test/CMakeLists.txt new/ivi-layermanagement-api/test/CMakeLists.txt ---- old/ivi-layermanagement-api/test/CMakeLists.txt 2015-10-19 23:31:20.000000000 +1000 -+++ new/ivi-layermanagement-api/test/CMakeLists.txt 2015-10-19 23:30:48.000000000 +1000 -@@ -18,6 +18,7 @@ - ############################################################################ - - CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules) - - FIND_PACKAGE(gtest) - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/disable-sanitizer-tests.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/disable-sanitizer-tests.patch deleted file mode 100644 index df5d616fd..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/disable-sanitizer-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/ivi-layermanagement-api/test/CMakeLists.txt -=================================================================== ---- git.orig/ivi-layermanagement-api/test/CMakeLists.txt -+++ git/ivi-layermanagement-api/test/CMakeLists.txt -@@ -58,7 +58,7 @@ IF(BUILD_ILM_API_TESTS) - ) - - SET(GCC_SANITIZER_COMPILE_FLAGS "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover -fstack-protector-all") -- SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_SANITIZER_COMPILE_FLAGS}" ) -+ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) - SET( CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -static-libasan -static-libubsan" ) - - ADD_EXECUTABLE(${PROJECT_NAME} ${SRC_FILES}) diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch deleted file mode 100644 index 251bc58f0..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch +++ /dev/null @@ -1,55 +0,0 @@ -From fbe0d0fd35ff79561dc2da853f1b0903bfde428d Mon Sep 17 00:00:00 2001 -From: Changhyeok Bae <changhyeok.bae@gmail.com> -Date: Thu, 1 Jun 2017 07:45:20 +0000 -Subject: [PATCH] test patch - ---- - ivi-input-api/test/CMakeLists.txt | 9 +++++---- - ivi-layermanagement-api/test/CMakeLists.txt | 7 ++++--- - 2 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/ivi-input-api/test/CMakeLists.txt b/ivi-input-api/test/CMakeLists.txt -index db05d0f..db3b745 100644 ---- a/ivi-input-api/test/CMakeLists.txt -+++ b/ivi-input-api/test/CMakeLists.txt -@@ -65,12 +65,13 @@ IF(BUILD_ILM_API_TESTS) - - ADD_DEPENDENCIES(${PROJECT_NAME} ${LIBS}) - -- INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -+ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test/ivi-layermanagement-api) - - # use CTest - ENABLE_TESTING() -- ADD_TEST(ilmCommon ${PROJECT_NAME}) -- ADD_TEST(ilmControl ${PROJECT_NAME}) -- ADD_TEST(ilmInput ${PROJECT_NAME}) -+ ADD_TEST(ilmCommon {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmControl {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmInput {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) - - ENDIF() -diff --git a/ivi-layermanagement-api/test/CMakeLists.txt b/ivi-layermanagement-api/test/CMakeLists.txt -index fe9a0a4..090d734 100644 ---- a/ivi-layermanagement-api/test/CMakeLists.txt -+++ b/ivi-layermanagement-api/test/CMakeLists.txt -@@ -63,11 +63,12 @@ IF(BUILD_ILM_API_TESTS) - - ADD_DEPENDENCIES(${PROJECT_NAME} ${LIBS}) - -- INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -+ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test/ivi-layermanagement-api) - - # use CTest - ENABLE_TESTING() -- ADD_TEST(ilmCommon ${PROJECT_NAME}) -- ADD_TEST(ilmControl ${PROJECT_NAME}) -+ ADD_TEST(ilmCommon ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmControl ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) - - ENDIF() --- -2.7.4 - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch deleted file mode 100644 index 86b448be1..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/wandboard_fix_build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3610fa9..8b4614d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,7 +34,7 @@ add_subdirectory(ivi-layermanagement-api/ilmCommon) - add_subdirectory(ivi-layermanagement-api/ilmClient) - add_subdirectory(ivi-layermanagement-api/ilmControl) - add_subdirectory(ivi-layermanagement-api/test) --add_subdirectory(ivi-layermanagement-examples) -+#add_subdirectory(ivi-layermanagement-examples) - - if(WITH_ILM_INPUT) - add_subdirectory(ivi-input-api/ilmInput) diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.1%.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.1%.bbappend deleted file mode 100644 index 9c29dee47..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.1%.bbappend +++ /dev/null @@ -1,27 +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://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" diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.13.0.bb b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.13.0.bb deleted file mode 100644 index 68e92adb5..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.13.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 = "ede33c1c898eeaf673dd2c275e92763a5aabd066" -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \ - file://0001-simple-id-agent-initial-commit.patch;patch=1 \ - file://0002-ivi-controller-load-id-agent-module.patch;patch=1 \ - file://0003-ivi-controller-add-resize-setting-suit-to-surface-si.patch \ - file://0001-Resolve-weston-crush-when-repeat-touching-very-quick.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', '')}" - -FILESEXTRAPATHS_prepend := ":${THISDIR}/wayland-ivi-extension:" - -SRC_URI_append_wandboard = " file://wandboard_fix_build.patch" - -# workaround paralellism issue: -PARALLEL_MAKE = "" diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb deleted file mode 100644 index ea74e384c..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb +++ /dev/null @@ -1,31 +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 = "ff067a640451de46836200624ece7ac777977c30" -SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=2.0;protocol=http \ - " -SRC_URI_append_wandboard = " file://wandboard_fix_build.patch" - -S = "${WORKDIR}/git" - -DEPENDS = "weston virtual/libgles2 pixman wayland-native" - -FILESEXTRAPATHS_prepend := ":${THISDIR}/wayland-ivi-extension:" - -# workaround paralellism issue: -PARALLEL_MAKE = "" - -inherit cmake - -EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1" - -FILES_${PN} += "${libdir}/weston/*" -FILES_${PN} += "${datadir}/wayland-protocols/stable/ivi-application/*" - -FILES_${PN}-dbg += "${libdir}/weston/.debug/*" - -EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bb deleted file mode 100644 index 4628f96f8..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRC_URI = "file://core.cfg \ - file://ivishell.cfg \ - file://id-agent.cfg \ - file://shell.cfg \ - file://hdmi-a-1-270.cfg \ - " - -S = "${WORKDIR}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_compile() { - # Put all of our cfg files together. - rm -f ${WORKDIR}/weston.ini - for F in ${WORKDIR}/*.cfg; do - cat $F >> ${WORKDIR}/weston.ini - echo >> ${WORKDIR}/weston.ini - done - sed -i -e '$ d' ${WORKDIR}/weston.ini -} - -do_install_append() { - WESTON_INI_CONFIG=${sysconfdir}/xdg/weston - install -d ${D}${WESTON_INI_CONFIG} - install -m 0644 ${WORKDIR}/weston.ini ${D}${WESTON_INI_CONFIG}/weston.ini -} diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend deleted file mode 100644 index d778459f2..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# -SRC_URI += "${@bb.utils.contains("DISTRO_FEATURES", "virtual-display", "file://virtualoutput.cfg", "",d)}" - -do_configure_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'virtual-display', 'true', 'false', d)}; then - echo virtual=1 >> ${WORKDIR}/core.cfg - fi - - if ${@bb.utils.contains('DISTRO_FEATURES', 'gst-record', 'true', 'false', d)}; then - echo recorder=true >> ${WORKDIR}/virtualoutput.cfg - fi -} - diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/core.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/core.cfg deleted file mode 100644 index a0ec1e181..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/core.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[core] -shell=ivi-shell.so -backend=drm-backend.so -require-input=false diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg deleted file mode 100644 index dffc2b6dd..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-270.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# A display is connected to HDMI-A-1 and needs to be rotated 270 degrees -# to have a proper orientation of the homescreen. For example the various sizes -# of the GeChic display or the Dell display. -[output] -name=HDMI-A-1 -transform=270 diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg deleted file mode 100644 index 88a692a1b..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-90.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# A display is connected to HDMI-A-1 and needs to be rotated 90 degrees -# to have a proper orientation of the homescreen. For example, the 'eGalax' -# display used in some instances. -[output] -name=HDMI-A-1 -transform=90 diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg deleted file mode 100644 index 726fca5f1..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[id-agent] -default-id-offset=1000 diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg deleted file mode 100644 index f0548f291..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ivi-shell] -ivi-input-module=ivi-input-controller.so -ivi-module=ivi-controller.so -id-agent-module=simple-id-agent.so diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/shell.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/shell.cfg deleted file mode 100644 index 056770427..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/shell.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[shell] -locking=true -panel-location=none diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg deleted file mode 100644 index 76f536ff8..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[output] -name=virtual1 -mode=1920x1080@30 -ip=192.168.20.99 -port=5005 -bitrate=3000000 -crop=384x368@0x0 diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_%.bbappend deleted file mode 100644 index 38590dcdb..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -DEPENDS_append_ulcb = " gstreamer1.0-plugins-base" |