mirror of
https://gitlab.freedesktop.org/wayland/weston.git
synced 2026-05-05 01:48:00 +02:00
frontend: Remove screen-share module
It was deprecated, and now it is gone. Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman
Pekka Paalanen
parent
7c3e3d7544
commit
3bd77f7817
6 changed files with 2 additions and 1331 deletions
|
|
@ -68,33 +68,6 @@ install_data(
|
|||
install_dir: dir_data / 'wayland-sessions'
|
||||
)
|
||||
|
||||
if get_option('deprecated-screenshare') and get_option('deprecated-shell-fullscreen')
|
||||
warning('deprecated-screenshare. This will go away, see https://gitlab.freedesktop.org/wayland/weston/-/issues/848. Consider using mirroring (see man page) for same functionality and better performance.')
|
||||
srcs_screenshare = [
|
||||
'screen-share.c',
|
||||
fullscreen_shell_unstable_v1_client_protocol_h,
|
||||
fullscreen_shell_unstable_v1_protocol_c,
|
||||
]
|
||||
deps_screenshare = [
|
||||
dep_libexec_weston,
|
||||
dep_libshared,
|
||||
dep_libweston_public,
|
||||
dep_libweston_private_h, # XXX: https://gitlab.freedesktop.org/wayland/weston/issues/292
|
||||
dep_wayland_client,
|
||||
]
|
||||
plugin_screenshare = shared_library(
|
||||
'screen-share',
|
||||
srcs_screenshare,
|
||||
include_directories: common_inc,
|
||||
dependencies: deps_screenshare,
|
||||
name_prefix: '',
|
||||
install: true,
|
||||
install_dir: dir_module_weston,
|
||||
install_rpath: '$ORIGIN'
|
||||
)
|
||||
env_modmap += 'screen-share.so=@0@;'.format(plugin_screenshare.full_path())
|
||||
endif
|
||||
|
||||
if get_option('systemd')
|
||||
dep_libsystemd = dependency('libsystemd', required: false)
|
||||
if not dep_libsystemd.found()
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -32,9 +32,8 @@
|
|||
* This is the internal (private) part of libweston. All symbols found here
|
||||
* are, and should be only (with a few exceptions) used within the internal
|
||||
* parts of libweston. Notable exception(s) include a few files in tests/ that
|
||||
* need access to these functions, screen-share file from compositor/ and those
|
||||
* remoting/. Those will require some further fixing as to avoid including this
|
||||
* private header.
|
||||
* need access to these functions, and those remoting/. Those will require some
|
||||
* further fixing as to avoid including this private header.
|
||||
*
|
||||
* Eventually, these symbols should reside naturally into their own scope. New
|
||||
* features should either provide their own (internal) header or use this one.
|
||||
|
|
|
|||
|
|
@ -80,7 +80,6 @@ The section headers are:
|
|||
.BR "keyboard " "Keyboard layouts"
|
||||
.BR "terminal " "Terminal application options"
|
||||
.BR "xwayland " "XWayland options"
|
||||
.BR "screen-share " "Screen sharing options (deprecated)"
|
||||
.BR "autolaunch " "Autolaunch options"
|
||||
.fi
|
||||
.RE
|
||||
|
|
@ -116,18 +115,6 @@ directory are:
|
|||
.BI "xwayland=" true
|
||||
ask Weston to load the XWayland module (boolean).
|
||||
.TP 7
|
||||
.BI "modules=" screen-share.so
|
||||
specifies the modules to load (string, comma separated). Available modules
|
||||
in the
|
||||
.IR "@weston_modules_dir@"
|
||||
directory are:
|
||||
.PP
|
||||
.RS 10
|
||||
.nf
|
||||
.BR screen-share.so (deprecated)
|
||||
.fi
|
||||
.RE
|
||||
.TP 7
|
||||
.BI "backend=" headless
|
||||
overrides defaults backend. Available backends are:
|
||||
.PP
|
||||
|
|
@ -895,28 +882,6 @@ The terminal shell (string). Sets the $TERM variable.
|
|||
.BI "path=" "@xserver_path@"
|
||||
sets the path to the xserver to run (string).
|
||||
.\"---------------------------------------------------------------------
|
||||
.SH "SCREEN-SHARE SECTION"
|
||||
.TP 7
|
||||
.SH "DEPRECATED: screen-share module is not built by default and has been deprecated, pending removal."
|
||||
Use deprecated-screenshare=true option to build it. Note that mirroring
|
||||
functionality has been added to replace this deprecated screen-share
|
||||
module. See mirror-of key entry in the output section for how to configure it.
|
||||
.TP 7
|
||||
.BI "command=" "@weston_bindir@/weston --backend=rdp \
|
||||
--shell=fullscreen --no-resizeable --no-config"
|
||||
sets the command to start a fullscreen-shell server for screen sharing (string).
|
||||
.TP 7
|
||||
.BI "start-on-startup=" "false"
|
||||
If set to true, start screen sharing of all outputs available on Weston startup.
|
||||
Set to false by default.
|
||||
.\"---------------------------------------------------------------------
|
||||
Set to false by default. When using this option make sure you enable --no-config
|
||||
to avoid re-loading the screen-share module and implictly trigger screen-sharing
|
||||
for the RDP output already performing the screen share. Alternatively, you could
|
||||
also supply a different configuration file, by using --config /path/to/config/file,
|
||||
and make sure that the configuration file doesn't load the screen-share module.
|
||||
.RE
|
||||
.RE
|
||||
.SH "AUTOLAUNCH SECTION"
|
||||
.TP 7
|
||||
.BI "path=" "/usr/bin/echo"
|
||||
|
|
|
|||
|
|
@ -26,12 +26,6 @@ option(
|
|||
value: true,
|
||||
description: 'Weston backend: RDP remote screensharing'
|
||||
)
|
||||
option(
|
||||
'deprecated-screenshare',
|
||||
type: 'boolean',
|
||||
value: false,
|
||||
description: 'DEPRECATED: Compositor: RDP screen-sharing support. Requires fullscreen-shell support'
|
||||
)
|
||||
option(
|
||||
'backend-vnc',
|
||||
type: 'boolean',
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
[core]
|
||||
#modules=screen-share.so
|
||||
#xwayland=true
|
||||
#shell=desktop
|
||||
#gbm-format=xrgb2101010
|
||||
|
|
@ -82,9 +81,5 @@ path=@libexecdir@/weston-keyboard
|
|||
#min_accel_factor = 0.16
|
||||
#max_accel_factor = 1.0
|
||||
|
||||
[screen-share]
|
||||
command=@bindir@/weston --backend=rdp --shell=fullscreen --no-resizeable
|
||||
#start-on-startup=false
|
||||
|
||||
#[xwayland]
|
||||
#path=@bindir@/Xwayland
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue