mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad 2022-06-30 12:59:45 +03:00
parent 7d6dd013fb
commit 1b4def3c48
18 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop-shell/shell.c
View File

@ -43,7 +43,7 @@
#include "shared/helpers.h"
#include "shared/timespec-util.h"
#include "shell-utils.h"
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
#define DEFAULT_NUM_WORKSPACES 1
#define DEFAULT_WORKSPACE_CHANGE_ANIMATION_LENGTH 200

0
include/libweston-desktop/libweston-desktop.h → include/libweston/desktop.h
View File

1
include/libweston/meson.build
View File

@ -1,6 +1,7 @@
install_headers(
'config-parser.h',
'libweston.h',
'desktop.h',
'matrix.h',
'plugin-registry.h',
'windowed-output-api.h',

5
include/meson.build
View File

@ -1,6 +1 @@
subdir('libweston')
install_headers(
'libweston-desktop/libweston-desktop.h',
subdir: join_paths(dir_include_libweston, 'libweston-desktop')
)

2
ivi-shell/ivi-layout-private.h
View File

@ -30,7 +30,7 @@
#include <libweston/libweston.h>
#include "ivi-layout-export.h"
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
struct ivi_layout_view {
struct wl_list link; /* ivi_layout::view_list */

2
ivi-shell/ivi-shell.h
View File

@ -30,7 +30,7 @@
#include <stdint.h>
#include <libweston/libweston.h>
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
struct ivi_shell
{

2
kiosk-shell/kiosk-shell.h
View File

@ -24,7 +24,7 @@
#ifndef WESTON_KIOSK_SHELL_H
#define WESTON_KIOSK_SHELL_H
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
#include <libweston/libweston.h>
#include <libweston/config-parser.h>

2
libweston/desktop/client.c
View File

@ -29,7 +29,7 @@
#include <libweston/libweston.h>
#include <libweston/zalloc.h>
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
#include "internal.h"
struct weston_desktop_client {

2
libweston/desktop/libweston-desktop.c
View File

@ -32,7 +32,7 @@
#include <libweston/zalloc.h>
#include "shared/helpers.h"
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
#include "internal.h"

2
libweston/desktop/seat.c
View File

@ -33,7 +33,7 @@
#include <libweston/libweston.h>
#include <libweston/zalloc.h>
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
#include "internal.h"
#include "shared/timespec-util.h"

2
libweston/desktop/surface.c
View File

@ -31,7 +31,7 @@
#include <libweston/libweston.h>
#include <libweston/zalloc.h>
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
#include "internal.h"
struct weston_desktop_view {

2
libweston/desktop/xdg-shell-v6.c
View File

@ -35,7 +35,7 @@
#include <libweston/zalloc.h>
#include "xdg-shell-unstable-v6-server-protocol.h"
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
#include "internal.h"
#define WD_XDG_SHELL_PROTOCOL_VERSION 1

2
libweston/desktop/xdg-shell.c
View File

@ -35,7 +35,7 @@
#include <libweston/zalloc.h>
#include "xdg-shell-server-protocol.h"
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
#include "internal.h"
#include "shared/helpers.h"

2
libweston/desktop/xwayland.c
View File

@ -33,7 +33,7 @@
#include <libweston/libweston.h>
#include <libweston/zalloc.h>
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
#include "internal.h"
#include "xwayland/xwayland-internal-interface.h"

14
libweston/meson.build
View File

@ -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',

2
meson.build
View File

@ -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

2
shell-utils/shell-utils.c
View File

@ -26,7 +26,7 @@
#include "config.h"
#include "shell-utils.h"
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
struct weston_output *
get_default_output(struct weston_compositor *compositor)

2
tests/weston-test-desktop-shell.c
View File

@ -40,7 +40,7 @@
#include <libweston/config-parser.h>
#include "shared/helpers.h"
#include "shell-utils.h"
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/desktop.h>
struct desktest_shell {
struct wl_listener compositor_destroy_listener;