From 4ac99c3a1447119363935fb986f5d9c05f032362 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Tue, 24 Apr 2018 15:13:18 +0200 Subject: 2nd part of the layer/profile rework [1/2] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Main goal of this is to move the agl-service-* bindings into the core and to unify common recipes like wayland/weston into meta-agl-profile-graphical. As a placeholder for recipes is meta-agl-profile-demo which are being reshuffled. TLDR: agl-service move to meta-agl-profile-core. wayland/weston moves to meta-agl-profile-graphical. This patchset needs the 2nd patchset of the series to build (meta-agl-demo). Bug-AGL: SPEC-145 , SPEC-876 , SPEC-877 v2: rebase including udiscs patches from meta-agl-demo Change-Id: I5e33f72d01707fa8b826d382bccaca3addcbbc47 Signed-off-by: Jan-Simon Möller --- .../wayland-ivi-extension/cmake-find-gtest.patch | 22 +++++++++ .../wayland/wayland-ivi-extension/test-path.patch | 55 ++++++++++++++++++++++ .../wayland/wayland-ivi-extension_1.1%.bbappend | 27 +++++++++++ .../wayland/weston-ini-conf.bbappend | 15 ++++++ .../wayland/weston-ini-conf/virtualoutput.cfg | 7 +++ .../recipes-graphics/wayland/weston_%.bbappend | 1 + .../packagegroup-agl-smartdevicelink.bb | 17 +++++++ 7 files changed, 144 insertions(+) create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.1%.bbappend create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston_%.bbappend create mode 100644 meta-agl-profile-graphical/recipes-sdl/packagegroups/packagegroup-agl-smartdevicelink.bb (limited to 'meta-agl-profile-graphical') 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 new file mode 100644 index 000000000..5371174d5 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch @@ -0,0 +1,22 @@ +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/test-path.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch new file mode 100644 index 000000000..251bc58f0 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch @@ -0,0 +1,55 @@ +From fbe0d0fd35ff79561dc2da853f1b0903bfde428d Mon Sep 17 00:00:00 2001 +From: Changhyeok Bae +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_1.1%.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.1%.bbappend new file mode 100644 index 000000000..9c29dee47 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_1.1%.bbappend @@ -0,0 +1,27 @@ +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/weston-ini-conf.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend new file mode 100644 index 000000000..d778459f2 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -0,0 +1,15 @@ +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/virtualoutput.cfg b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg new file mode 100644 index 000000000..76f536ff8 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg @@ -0,0 +1,7 @@ +[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 new file mode 100644 index 000000000..38590dcdb --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_%.bbappend @@ -0,0 +1 @@ +DEPENDS_append_ulcb = " gstreamer1.0-plugins-base" diff --git a/meta-agl-profile-graphical/recipes-sdl/packagegroups/packagegroup-agl-smartdevicelink.bb b/meta-agl-profile-graphical/recipes-sdl/packagegroups/packagegroup-agl-smartdevicelink.bb new file mode 100644 index 000000000..7d135356a --- /dev/null +++ b/meta-agl-profile-graphical/recipes-sdl/packagegroups/packagegroup-agl-smartdevicelink.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Set of packages for SmartDeviceLink" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-smartdevicelink \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ + sdl-core \ + " + +# Porter does not have the required gstreamer version +RDEPENDS_${PN}_porter := "" -- cgit 1.2.3-korg