diff options
| author | Eugen Friedrich <efriedrich@de.adit-jv.com> | 2023-01-07 21:44:39 +0100 |
|---|---|---|
| committer | Eugen Friedrich <efriedrich@de.adit-jv.com> | 2023-01-07 21:47:07 +0100 |
| commit | a5bba8b5c629ecbe786dd21cbe30b7b4e63f0700 (patch) | |
| tree | 6403b38e6f9cc87718deefdc28713d13e2ffa52e | |
| parent | 2c3d20a8afca05eddb85e72334a3bbafa7f81d31 (diff) | |
| parent | 010d53961b866891b9ec946053a3e3bfc0adbc2c (diff) | |
| download | wayland-ivi-extension-a5bba8b5c629ecbe786dd21cbe30b7b4e63f0700.tar.gz | |
Merge remote-tracking branch 'upstream/pull/110'
* upstream/pull/110
simple-weston-client: update dependencies to build on weston 7
ivi-id-agent: update dependencies to build on weston 7
ivi-id-agent: update to weston 7 header files
ivi-input-controller: update to weston 7 header files
Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com>
Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com>
Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
solved merged onflicts:
ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c
4 files changed, 7 insertions, 7 deletions
diff --git a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt index d4fc24c..d5834f3 100644 --- a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt +++ b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt @@ -25,7 +25,7 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(WAYLAND_SERVER wayland-server REQUIRED) pkg_check_modules(WESTON weston>=6.0.0 REQUIRED) pkg_check_modules(PIXMAN pixman-1 REQUIRED) -pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-6 REQUIRED) +pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-7 REQUIRED) find_package(Threads REQUIRED) diff --git a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c index 0c8b532..0ec5943 100644 --- a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c +++ b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c @@ -26,9 +26,9 @@ #include <limits.h> #include <weston.h> -#include <libweston-6/libweston-desktop.h> -#include "config-parser.h" -#include <ivi-layout-export.h> +#include <libweston-desktop/libweston-desktop.h> +#include <libweston/config-parser.h> +#include <weston/ivi-layout-export.h> #ifndef INVALID_ID #define INVALID_ID 0xFFFFFFFF 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 52fc6ab..826ee47 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 @@ -31,7 +31,7 @@ #include <fcntl.h> #include <unistd.h> -#include "plugin-registry.h" +#include <libweston/plugin-registry.h> #include "ilm_types.h" #include "ivi-input-server-protocol.h" diff --git a/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt b/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt index a324c84..847c9a1 100644 --- a/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt +++ b/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt @@ -22,14 +22,14 @@ project (simple-weston-client) find_package(PkgConfig) pkg_check_modules(WAYLAND_CLIENT wayland-client REQUIRED) pkg_check_modules(WAYLAND_CURSOR wayland-cursor REQUIRED) -pkg_check_modules(LIBWESTON_PROTOCOLS libweston-6-protocols QUIET) +pkg_check_modules(LIBWESTON_PROTOCOLS libweston-7-protocols QUIET) if(${LIBWESTON_PROTOCOLS_FOUND}) #check for DLT pkg_check_modules(DLT automotive-dlt QUIET) #import the pkgdatadir from libweston-protocols pkgconfig file - execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir libweston-6-protocols + execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir libweston-7-protocols OUTPUT_VARIABLE WestonProtocols_PKGDATADIR) string(REGEX REPLACE "[\r\n]" "" WestonProtocols_PKGDATADIR "${WestonProtocols_PKGDATADIR}") SET(LIBWESTON_PROTOCOLS_PKGDATADIR ${WestonProtocols_PKGDATADIR}) |