diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-libs/weston/files | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'dev-libs/weston/files')
| -rw-r--r-- | dev-libs/weston/files/weston-10.0.0-backend-default.patch | 27 | ||||
| -rw-r--r-- | dev-libs/weston/files/weston-10.0.0-test-deps.patch | 34 |
2 files changed, 61 insertions, 0 deletions
diff --git a/dev-libs/weston/files/weston-10.0.0-backend-default.patch b/dev-libs/weston/files/weston-10.0.0-backend-default.patch new file mode 100644 index 000000000000..710639e7e9c5 --- /dev/null +++ b/dev-libs/weston/files/weston-10.0.0-backend-default.patch @@ -0,0 +1,27 @@ +From 35e3fb72ac28af628aa1d2b7ee804a3f81720c47 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Fri, 4 Feb 2022 23:43:50 +0000 +Subject: [PATCH] meson.build: Fix -Dbackend-default=auto following fbdev + deprecation + +Signed-off-by: James Le Cuirot <chewi@gentoo.org> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1c73e130..d761903e 100644 +--- a/meson.build ++++ b/meson.build +@@ -121,7 +121,7 @@ config_h.set10('TEST_GL_RENDERER', get_option('test-gl-renderer')) + + backend_default = get_option('backend-default') + if backend_default == 'auto' +- foreach b : [ 'headless', 'fbdev', 'x11', 'wayland', 'drm' ] ++ foreach b : [ 'headless', 'x11', 'wayland', 'drm' ] + if get_option('backend-' + b) + backend_default = b + endif +-- +2.34.1 + diff --git a/dev-libs/weston/files/weston-10.0.0-test-deps.patch b/dev-libs/weston/files/weston-10.0.0-test-deps.patch new file mode 100644 index 000000000000..cc6ad8c6e130 --- /dev/null +++ b/dev-libs/weston/files/weston-10.0.0-test-deps.patch @@ -0,0 +1,34 @@ +From 9516859b9fdb2899a37116b55200fb04f7726b45 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> +--- + tests/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index d8e96e77d..955c4226c 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 + |