From 9336263d9bc90955e7c91b5443e87666bd2209c7 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 21 Jun 2022 17:48:46 +0100 Subject: [PATCH] Move libweston-desktop into libweston It's not really useful to have libweston without libweston-desktop. It's also very little code. Merging both into the same DSO will allow us to cut out a bunch of indirection and pain. Signed-off-by: Daniel Stone --- desktop-shell/meson.build | 1 - ivi-shell/meson.build | 1 - kiosk-shell/meson.build | 1 - libweston-desktop/meson.build | 35 ------------------- .../desktop}/client.c | 0 .../desktop}/internal.h | 0 .../desktop}/libweston-desktop.c | 0 libweston/desktop/meson.build | 16 +++++++++ .../desktop}/seat.c | 0 .../desktop}/surface.c | 0 .../desktop}/xdg-shell-v6.c | 0 .../desktop}/xdg-shell.c | 0 .../desktop}/xwayland.c | 0 libweston/meson.build | 16 +++++++++ meson.build | 1 - shell-utils/meson.build | 2 +- tests/meson.build | 4 +-- 17 files changed, 35 insertions(+), 42 deletions(-) delete mode 100644 libweston-desktop/meson.build rename {libweston-desktop => libweston/desktop}/client.c (100%) rename {libweston-desktop => libweston/desktop}/internal.h (100%) rename {libweston-desktop => libweston/desktop}/libweston-desktop.c (100%) create mode 100644 libweston/desktop/meson.build rename {libweston-desktop => libweston/desktop}/seat.c (100%) rename {libweston-desktop => libweston/desktop}/surface.c (100%) rename {libweston-desktop => libweston/desktop}/xdg-shell-v6.c (100%) rename {libweston-desktop => libweston/desktop}/xdg-shell.c (100%) rename {libweston-desktop => libweston/desktop}/xwayland.c (100%) diff --git a/desktop-shell/meson.build b/desktop-shell/meson.build index 8c9754e4..c00d4a8d 100644 --- a/desktop-shell/meson.build +++ b/desktop-shell/meson.build @@ -13,7 +13,6 @@ if get_option('shell-desktop') dep_libm, dep_libexec_weston, dep_libshared, - dep_lib_desktop, dep_libweston_public, dep_shell_utils, ] diff --git a/ivi-shell/meson.build b/ivi-shell/meson.build index b071ca63..8e064fb7 100644 --- a/ivi-shell/meson.build +++ b/ivi-shell/meson.build @@ -15,7 +15,6 @@ if get_option('shell-ivi') dependencies: [ dep_libm, dep_libexec_weston, - dep_lib_desktop, dep_libweston_public ], name_prefix: '', diff --git a/kiosk-shell/meson.build b/kiosk-shell/meson.build index 22d5cafa..0ebea621 100644 --- a/kiosk-shell/meson.build +++ b/kiosk-shell/meson.build @@ -9,7 +9,6 @@ if get_option('shell-kiosk') dep_libm, dep_libexec_weston, dep_libshared, - dep_lib_desktop, dep_libweston_public, dep_shell_utils, ] diff --git a/libweston-desktop/meson.build b/libweston-desktop/meson.build deleted file mode 100644 index 72e77a06..00000000 --- a/libweston-desktop/meson.build +++ /dev/null @@ -1,35 +0,0 @@ -srcs_libdesktop = [ - 'libweston-desktop.c', - 'client.c', - 'seat.c', - 'surface.c', - 'xwayland.c', - 'xdg-shell.c', - 'xdg-shell-v6.c', - xdg_shell_unstable_v6_server_protocol_h, - xdg_shell_unstable_v6_protocol_c, - xdg_shell_server_protocol_h, - xdg_shell_protocol_c, -] -lib_desktop = shared_library( - 'weston-desktop-@0@'.format(libweston_major), - srcs_libdesktop, - include_directories: common_inc, - install: true, - version: '0.0.@0@'.format(libweston_revision), - dependencies: dep_libweston_public -) -dep_lib_desktop = declare_dependency( - link_with: lib_desktop, - dependencies: dep_libweston_public -) - -pkgconfig.generate( - lib_desktop, - filebase: 'libweston-desktop-@0@'.format(libweston_major), - name: 'libweston-desktop', - version: version_weston, - description: 'Desktop shells abstraction library for libweston compositors', - requires_private: [ lib_weston, dep_wayland_server ], - subdirs: dir_include_libweston -) diff --git a/libweston-desktop/client.c b/libweston/desktop/client.c similarity index 100% rename from libweston-desktop/client.c rename to libweston/desktop/client.c diff --git a/libweston-desktop/internal.h b/libweston/desktop/internal.h similarity index 100% rename from libweston-desktop/internal.h rename to libweston/desktop/internal.h diff --git a/libweston-desktop/libweston-desktop.c b/libweston/desktop/libweston-desktop.c similarity index 100% rename from libweston-desktop/libweston-desktop.c rename to libweston/desktop/libweston-desktop.c diff --git a/libweston/desktop/meson.build b/libweston/desktop/meson.build new file mode 100644 index 00000000..4588ad10 --- /dev/null +++ b/libweston/desktop/meson.build @@ -0,0 +1,16 @@ +srcs_libweston += files([ + 'libweston-desktop.c', + 'client.c', + 'seat.c', + 'surface.c', + 'xwayland.c', + 'xdg-shell.c', + 'xdg-shell-v6.c', +]) + +srcs_libweston += [ + xdg_shell_unstable_v6_server_protocol_h, + xdg_shell_unstable_v6_protocol_c, + xdg_shell_server_protocol_h, + xdg_shell_protocol_c, +] diff --git a/libweston-desktop/seat.c b/libweston/desktop/seat.c similarity index 100% rename from libweston-desktop/seat.c rename to libweston/desktop/seat.c diff --git a/libweston-desktop/surface.c b/libweston/desktop/surface.c similarity index 100% rename from libweston-desktop/surface.c rename to libweston/desktop/surface.c diff --git a/libweston-desktop/xdg-shell-v6.c b/libweston/desktop/xdg-shell-v6.c similarity index 100% rename from libweston-desktop/xdg-shell-v6.c rename to libweston/desktop/xdg-shell-v6.c diff --git a/libweston-desktop/xdg-shell.c b/libweston/desktop/xdg-shell.c similarity index 100% rename from libweston-desktop/xdg-shell.c rename to libweston/desktop/xdg-shell.c diff --git a/libweston-desktop/xwayland.c b/libweston/desktop/xwayland.c similarity index 100% rename from libweston-desktop/xwayland.c rename to libweston/desktop/xwayland.c diff --git a/libweston/meson.build b/libweston/meson.build index 7638b1c1..82f81466 100644 --- a/libweston/meson.build +++ b/libweston/meson.build @@ -69,6 +69,8 @@ srcs_libweston = [ weston_direct_display_server_protocol_h, ] +subdir('desktop') + if get_option('renderer-gl') dep_egl = dependency('egl', required: false) if not dep_egl.found() @@ -130,6 +132,20 @@ 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 cc266b5c..780d6b04 100644 --- a/meson.build +++ b/meson.build @@ -162,7 +162,6 @@ subdir('include') subdir('protocol') subdir('shared') subdir('libweston') -subdir('libweston-desktop') subdir('xwayland') subdir('shell-utils') subdir('compositor') diff --git a/shell-utils/meson.build b/shell-utils/meson.build index 02ae9001..88aaca8c 100644 --- a/shell-utils/meson.build +++ b/shell-utils/meson.build @@ -1,5 +1,5 @@ dep_shell_utils = declare_dependency( sources: 'shell-utils.c', include_directories: include_directories('.'), - dependencies: dep_lib_desktop + dependencies: dep_libweston_public, ) diff --git a/tests/meson.build b/tests/meson.build index 920eb9d7..6a5dea41 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -2,7 +2,7 @@ plugin_test_shell_desktop = shared_library( 'weston-test-desktop-shell', 'weston-test-desktop-shell.c', include_directories: common_inc, - dependencies: [ dep_lib_desktop, dep_libweston_public, dep_libexec_weston, dep_shell_utils ], + dependencies: [ dep_libweston_public, dep_libexec_weston, dep_shell_utils ], name_prefix: '', install: false ) @@ -241,7 +241,7 @@ tests = [ 'sources': [ 'safe-signal-output-removal-test.c', ], - 'dep_objs': [ dep_lib_desktop, dep_shell_utils ] + 'dep_objs': [ dep_shell_utils ] }, ]