diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2020-02-11 20:48:05 +0200 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2020-03-04 12:13:17 +0200 |
| commit | a17bac48464b5f2b6359856a75caae882d9a48f6 (patch) | |
| tree | 135818c3b6b1d89519363cfd435c8dbeb5b57b91 | |
| parent | 357c5a034a89dc227d671e63e8c10c4c62f9201e (diff) | |
meson.build: Upgrade build and headers to libweston7
Bug-AGL: SPEC-3180
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Ifa74b658307ee40d789f90882d210ea2d65c2898
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | shared/option-parser.c | 2 | ||||
| -rw-r--r-- | shared/os-compatibility.c | 2 | ||||
| -rw-r--r-- | src/desktop.c | 4 | ||||
| -rw-r--r-- | src/ivi-compositor.h | 8 | ||||
| -rw-r--r-- | src/layout.c | 4 | ||||
| -rw-r--r-- | src/main.c | 12 | ||||
| -rw-r--r-- | src/shell.c | 4 |
8 files changed, 20 insertions, 20 deletions
diff --git a/meson.build b/meson.build index e3a6631..d79ea33 100644 --- a/meson.build +++ b/meson.build @@ -108,8 +108,8 @@ dir_data_pc = join_paths(dir_data, 'pkgconfig') deps_libweston = [ dependency('wayland-server'), - dependency('libweston-6'), - dependency('libweston-desktop-6'), + dependency('libweston-7'), + dependency('libweston-desktop-7'), local_dep, ] diff --git a/shared/option-parser.c b/shared/option-parser.c index 81222f3..0c6dc2d 100644 --- a/shared/option-parser.c +++ b/shared/option-parser.c @@ -31,7 +31,7 @@ #include <assert.h> #include <errno.h> -#include <libweston-6/config-parser.h> +#include <libweston/config-parser.h> #include "shared/string-helpers.h" static bool diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c index 3013f1f..4bf7d81 100644 --- a/shared/os-compatibility.c +++ b/shared/os-compatibility.c @@ -31,7 +31,7 @@ #include <sys/epoll.h> #include <string.h> #include <stdlib.h> -#include <libweston-6/zalloc.h> +#include <libweston/zalloc.h> #ifdef HAVE_MEMFD_CREATE #include <sys/mman.h> diff --git a/src/desktop.c b/src/desktop.c index 8c6437d..eaace19 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -25,8 +25,8 @@ #include "ivi-compositor.h" -#include <libweston-6/compositor.h> -#include <libweston-6/libweston-desktop.h> +#include <libweston/libweston.h> +#include <libweston-desktop/libweston-desktop.h> #if 0 static struct weston_output * diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h index 5d210fb..a01c617 100644 --- a/src/ivi-compositor.h +++ b/src/ivi-compositor.h @@ -29,10 +29,10 @@ #include <stdbool.h> #include "config.h" -#include <libweston-6/compositor-drm.h> -#include <libweston-6/compositor.h> -#include <libweston-6/windowed-output-api.h> -#include <libweston-6/libweston-desktop.h> +#include <libweston/backend-drm.h> +#include <libweston/libweston.h> +#include <libweston/windowed-output-api.h> +#include <libweston-desktop/libweston-desktop.h> #include "agl-shell-server-protocol.h" diff --git a/src/layout.c b/src/layout.c index b5bafe3..0c65b6d 100644 --- a/src/layout.c +++ b/src/layout.c @@ -28,8 +28,8 @@ #include <assert.h> #include <string.h> -#include <libweston-6/compositor.h> -#include <libweston-6/libweston-desktop.h> +#include <libweston/libweston.h> +#include <libweston-desktop/libweston-desktop.h> #define AGL_COMP_DEBUG @@ -36,12 +36,12 @@ #include <unistd.h> #include <linux/input.h> -#include <libweston-6/compositor-drm.h> -#include <libweston-6/compositor-wayland.h> -#include <libweston-6/compositor-x11.h> -#include <libweston-6/compositor.h> -#include <libweston-6/windowed-output-api.h> -#include <libweston-6/config-parser.h> +#include <libweston/backend-drm.h> +#include <libweston/backend-wayland.h> +#include <libweston/backend-x11.h> +#include <libweston/libweston.h> +#include <libweston/windowed-output-api.h> +#include <libweston/config-parser.h> #include "shared/os-compatibility.h" diff --git a/src/shell.c b/src/shell.c index 16b4146..0553f30 100644 --- a/src/shell.c +++ b/src/shell.c @@ -33,8 +33,8 @@ #include <sys/socket.h> #include <sys/types.h> #include <unistd.h> -#include <libweston-6/compositor.h> -#include <libweston-6/config-parser.h> +#include <libweston/libweston.h> +#include <libweston/config-parser.h> #include "shared/os-compatibility.h" |