deleted file mode 100644
@@ -1,38 +0,0 @@
-From 2ac6b6b084a877adde64db7faff2ed22eb3ea97a Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniels@collabora.com>
-Date: Tue, 8 Feb 2022 22:39:42 +0000
-Subject: [PATCH] tests: Add dependency on screenshooter client protocol
-
-Given that the test-helper code relies on the screenshooter protocol,
-make sure it's available for us to build, and the dependency ensures we
-build in order.
-
-Fixes: #588
-
-Signed-off-by: Daniel Stone <daniels@collabora.com>
-
-[Retrieved from:
-https://gitlab.freedesktop.org/wayland/weston/-/commit/2ac6b6b084a877adde64db7faff2ed22eb3ea97a]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- tests/meson.build | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 2d464ddcc..222091cd1 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -29,8 +29,9 @@ lib_test_client = static_library(
- 'weston-test-client-helper.c',
- 'weston-test-fixture-compositor.c',
- weston_test_client_protocol_h,
-- weston_screenshooter_protocol_c,
- weston_test_protocol_c,
-+ weston_screenshooter_client_protocol_h,
-+ weston_screenshooter_protocol_c,
- viewporter_client_protocol_h,
- viewporter_protocol_c,
- 'color_util.h',
-GitLab
-
@@ -42,6 +42,14 @@ config BR2_PACKAGE_WESTON_DEFAULT_HEADLESS
bool "headless"
select BR2_PACKAGE_WESTON_HEADLESS
+config BR2_PACKAGE_WESTON_DEFAULT_RDP
+ bool "rdp"
+ depends on BR2_USE_MMU # freerdp, libglib2
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on BR2_USE_WCHAR # freerdp
+ depends on BR2_INSTALL_LIBSTDCPP # freerdp
+ select BR2_PACKAGE_WESTON_RDP
+
config BR2_PACKAGE_WESTON_DEFAULT_WAYLAND
bool "wayland (nested)"
select BR2_PACKAGE_WESTON_WAYLAND
@@ -60,6 +68,7 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR
string
default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM
default "headless" if BR2_PACKAGE_WESTON_DEFAULT_HEADLESS
+ default "rdp" if BR2_PACKAGE_WESTON_DEFAULT_RDP
default "wayland" if BR2_PACKAGE_WESTON_DEFAULT_WAYLAND
default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11
@@ -74,6 +83,7 @@ config BR2_PACKAGE_WESTON_RDP
depends on BR2_USE_WCHAR # freerdp
depends on BR2_INSTALL_LIBSTDCPP # freerdp
select BR2_PACKAGE_FREERDP
+ select BR2_PACKAGE_FREERDP_SERVER
help
This enables the RDP backend, which allows accessing weston
through the network with any RDP-compliant client.
@@ -143,6 +153,10 @@ config BR2_PACKAGE_WESTON_SHELL_KIOSK
default y
select BR2_PACKAGE_WESTON_HAS_SHELL
+config BR2_PACKAGE_WESTON_SCREENSHARE
+ bool "screenshare"
+ default y
+
config BR2_PACKAGE_WESTON_DEMO_CLIENTS
bool "demo clients"
depends on BR2_USE_MMU # pango
@@ -1,4 +1,4 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2022-June/042260.html
-sha256 8a9e52506a865a7410981b04f8341b89b84106db8531ab1f9fdd37b5dc034115 weston-10.0.1.tar.xz
-sha512 688d843096a95b463161b98e85ca3443b31ba2ee49fc8d456a2780cc96f576e9d097054e9f361997a66e9cc8373cf29e406a742dae3884b3b50b26acf1710c8c weston-10.0.1.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2022-September/042410.html
+sha256 a6138d4dc9554560ac304312df456019f4be025ec79130f05fb5f2e41c091e1d weston-11.0.0.tar.xz
+sha512 71554dc870e9c6832fdfb8f0e8dbcd7ad01c3827041c2f7fe4b7679df33b242fd00e7f0c8728d1aeecc648f8296a9d3fc502a66c91ec662f03086d9a28aab3ea weston-11.0.0.tar.xz
sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING
@@ -4,7 +4,7 @@
#
################################################################################
-WESTON_VERSION = 10.0.1
+WESTON_VERSION = 11.0.0
WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads
WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
WESTON_LICENSE = MIT
@@ -16,8 +16,6 @@ WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
libxkbcommon pixman libpng udev cairo libinput libdrm
WESTON_CONF_OPTS = \
- -Dbackend-headless=false \
- -Dcolor-management-colord=false \
-Ddoc=false \
-Dremoting=false \
-Dtools=calibrator,debug,info,terminal,touch-calibrator
@@ -57,23 +55,9 @@ else
WESTON_CONF_OPTS += -Dimage-webp=false
endif
-# weston-launch must be u+s root in order to work properly
-ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
-define WESTON_PERMISSIONS
- /usr/bin/weston-launch f 4755 0 0 - - - - -
-endef
-define WESTON_USERS
- - - weston-launch -1 - - - - Weston launcher group
-endef
-WESTON_CONF_OPTS += -Ddeprecated-weston-launch=true
-WESTON_DEPENDENCIES += linux-pam
-else
-WESTON_CONF_OPTS += -Ddeprecated-weston-launch=false
-endif
-
-ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy)
+ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGBM)$(BR2_PACKAGE_HAS_LIBGLES),yyy)
WESTON_CONF_OPTS += -Drenderer-gl=true
-WESTON_DEPENDENCIES += libegl libgles
+WESTON_DEPENDENCIES += libegl libgbm libgles
ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy)
WESTON_CONF_OPTS += -Dpipewire=true
WESTON_DEPENDENCIES += pipewire
@@ -180,6 +164,12 @@ else
WESTON_CONF_OPTS += -Dshell-kiosk=false
endif
+ifeq ($(BR2_PACKAGE_WESTON_SCREENSHARE),y)
+WESTON_CONF_OPTS += -Dscreenshare=true
+else
+WESTON_CONF_OPTS += -Dscreenshare=false
+endif
+
ifeq ($(BR2_PACKAGE_WESTON_DEMO_CLIENTS),y)
WESTON_CONF_OPTS += -Ddemo-clients=true
WESTON_DEPENDENCIES += pango
Drop patch which is now upstream. Drop no longer supported weston-launch. Drop no longer supported color-management-colord config option. Remove duplicate backend-headless config option. Add new libgbm requirement for renderer-gl. Add new freerdp server requirement for backend-rdp. Add support for new screenshare feature. Add support for new rdp as backend default feature. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- ...ncy-on-screenshooter-client-protocol.patch | 38 ------------------- package/weston/Config.in | 14 +++++++ package/weston/weston.hash | 6 +-- package/weston/weston.mk | 28 +++++--------- 4 files changed, 26 insertions(+), 60 deletions(-) delete mode 100644 package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch