From 1b4def3c480c6b4eadf0e8991c8ca827eb9de5c4 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Thu, 30 Jun 2022 12:59:45 +0300 Subject: [PATCH] libweston/desktop: Migrate libweston-desktop/libweston-desktop.h With commit 'Move libweston-desktop into libweston' we've moved out libweston-desktop DSO into libweston. Move also the header to libweston/desktop. This removes removes the libweston-desktop pc file and bumps libweston major version to 12. Signed-off-by: Marius Vlad --- desktop-shell/shell.c | 2 +- .../libweston-desktop.h => libweston/desktop.h} | 0 include/libweston/meson.build | 1 + include/meson.build | 5 ----- ivi-shell/ivi-layout-private.h | 2 +- ivi-shell/ivi-shell.h | 2 +- kiosk-shell/kiosk-shell.h | 2 +- libweston/desktop/client.c | 2 +- libweston/desktop/libweston-desktop.c | 2 +- libweston/desktop/seat.c | 2 +- libweston/desktop/surface.c | 2 +- libweston/desktop/xdg-shell-v6.c | 2 +- libweston/desktop/xdg-shell.c | 2 +- libweston/desktop/xwayland.c | 2 +- libweston/meson.build | 14 -------------- meson.build | 2 +- shell-utils/shell-utils.c | 2 +- tests/weston-test-desktop-shell.c | 2 +- 18 files changed, 15 insertions(+), 33 deletions(-) rename include/{libweston-desktop/libweston-desktop.h => libweston/desktop.h} (100%) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 9da08aef..40f3b8c3 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -43,7 +43,7 @@ #include "shared/helpers.h" #include "shared/timespec-util.h" #include "shell-utils.h" -#include +#include #define DEFAULT_NUM_WORKSPACES 1 #define DEFAULT_WORKSPACE_CHANGE_ANIMATION_LENGTH 200 diff --git a/include/libweston-desktop/libweston-desktop.h b/include/libweston/desktop.h similarity index 100% rename from include/libweston-desktop/libweston-desktop.h rename to include/libweston/desktop.h diff --git a/include/libweston/meson.build b/include/libweston/meson.build index 8ae10011..25451c14 100644 --- a/include/libweston/meson.build +++ b/include/libweston/meson.build @@ -1,6 +1,7 @@ install_headers( 'config-parser.h', 'libweston.h', + 'desktop.h', 'matrix.h', 'plugin-registry.h', 'windowed-output-api.h', diff --git a/include/meson.build b/include/meson.build index 1ea6dd3d..ef8298fb 100644 --- a/include/meson.build +++ b/include/meson.build @@ -1,6 +1 @@ subdir('libweston') - -install_headers( - 'libweston-desktop/libweston-desktop.h', - subdir: join_paths(dir_include_libweston, 'libweston-desktop') -) diff --git a/ivi-shell/ivi-layout-private.h b/ivi-shell/ivi-layout-private.h index 5a0119c6..3e5ae8e0 100644 --- a/ivi-shell/ivi-layout-private.h +++ b/ivi-shell/ivi-layout-private.h @@ -30,7 +30,7 @@ #include #include "ivi-layout-export.h" -#include +#include struct ivi_layout_view { struct wl_list link; /* ivi_layout::view_list */ diff --git a/ivi-shell/ivi-shell.h b/ivi-shell/ivi-shell.h index d7f1cdbd..64a36d2d 100644 --- a/ivi-shell/ivi-shell.h +++ b/ivi-shell/ivi-shell.h @@ -30,7 +30,7 @@ #include #include -#include +#include struct ivi_shell { diff --git a/kiosk-shell/kiosk-shell.h b/kiosk-shell/kiosk-shell.h index 3eb82cd9..99e78308 100644 --- a/kiosk-shell/kiosk-shell.h +++ b/kiosk-shell/kiosk-shell.h @@ -24,7 +24,7 @@ #ifndef WESTON_KIOSK_SHELL_H #define WESTON_KIOSK_SHELL_H -#include +#include #include #include diff --git a/libweston/desktop/client.c b/libweston/desktop/client.c index 44718e2d..f79bde6f 100644 --- a/libweston/desktop/client.c +++ b/libweston/desktop/client.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "internal.h" struct weston_desktop_client { diff --git a/libweston/desktop/libweston-desktop.c b/libweston/desktop/libweston-desktop.c index 0be9d717..05240cfb 100644 --- a/libweston/desktop/libweston-desktop.c +++ b/libweston/desktop/libweston-desktop.c @@ -32,7 +32,7 @@ #include #include "shared/helpers.h" -#include +#include #include "internal.h" diff --git a/libweston/desktop/seat.c b/libweston/desktop/seat.c index b92546df..398f8543 100644 --- a/libweston/desktop/seat.c +++ b/libweston/desktop/seat.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include "internal.h" #include "shared/timespec-util.h" diff --git a/libweston/desktop/surface.c b/libweston/desktop/surface.c index 6b3f4aeb..30b9cdce 100644 --- a/libweston/desktop/surface.c +++ b/libweston/desktop/surface.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include "internal.h" struct weston_desktop_view { diff --git a/libweston/desktop/xdg-shell-v6.c b/libweston/desktop/xdg-shell-v6.c index 13f4213d..8aacc53a 100644 --- a/libweston/desktop/xdg-shell-v6.c +++ b/libweston/desktop/xdg-shell-v6.c @@ -35,7 +35,7 @@ #include #include "xdg-shell-unstable-v6-server-protocol.h" -#include +#include #include "internal.h" #define WD_XDG_SHELL_PROTOCOL_VERSION 1 diff --git a/libweston/desktop/xdg-shell.c b/libweston/desktop/xdg-shell.c index ca9862c1..88b9f72b 100644 --- a/libweston/desktop/xdg-shell.c +++ b/libweston/desktop/xdg-shell.c @@ -35,7 +35,7 @@ #include #include "xdg-shell-server-protocol.h" -#include +#include #include "internal.h" #include "shared/helpers.h" diff --git a/libweston/desktop/xwayland.c b/libweston/desktop/xwayland.c index 0b795648..c622c21f 100644 --- a/libweston/desktop/xwayland.c +++ b/libweston/desktop/xwayland.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include "internal.h" #include "xwayland/xwayland-internal-interface.h" diff --git a/libweston/meson.build b/libweston/meson.build index 313a84f6..6bcfe037 100644 --- a/libweston/meson.build +++ b/libweston/meson.build @@ -134,20 +134,6 @@ pkgconfig.generate( subdirs: dir_include_libweston ) -if version_weston.version_compare('>= 11.0.90') - error('Remove libweston-desktop.pc for Weston 12.x') -endif - -pkgconfig.generate( - lib_weston, - filebase: 'libweston-desktop-@0@'.format(libweston_major), - name: 'libweston-desktop', - version: version_weston, - description: 'Desktop shell abstraction library for libweston compositors', - requires_private: deps_for_libweston_users, - subdirs: dir_include_libweston -) - pkgconfig.generate( filebase: 'libweston-@0@-protocols'.format(libweston_major), name: 'libWeston Protocols', diff --git a/meson.build b/meson.build index 7604faf9..5a552ef7 100644 --- a/meson.build +++ b/meson.build @@ -10,7 +10,7 @@ project('weston', license: 'MIT/Expat', ) -libweston_major = 11 +libweston_major = 12 # libweston_revision is manufactured to follow the autotools build's # library file naming, thanks to libtool diff --git a/shell-utils/shell-utils.c b/shell-utils/shell-utils.c index 25978734..99a56626 100644 --- a/shell-utils/shell-utils.c +++ b/shell-utils/shell-utils.c @@ -26,7 +26,7 @@ #include "config.h" #include "shell-utils.h" -#include +#include struct weston_output * get_default_output(struct weston_compositor *compositor) diff --git a/tests/weston-test-desktop-shell.c b/tests/weston-test-desktop-shell.c index eb231e0d..eaa0ad26 100644 --- a/tests/weston-test-desktop-shell.c +++ b/tests/weston-test-desktop-shell.c @@ -40,7 +40,7 @@ #include #include "shared/helpers.h" #include "shell-utils.h" -#include +#include struct desktest_shell { struct wl_listener compositor_destroy_listener;