summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-Add-configuration-option-for-no-input-device.patch112
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch9
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch24
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch7
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch19
-rw-r--r--meta/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch33
-rw-r--r--meta/recipes-graphics/wayland/weston_1.11.1.bb (renamed from meta/recipes-graphics/wayland/weston_1.11.0.bb)6
7 files changed, 131 insertions, 79 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-Add-configuration-option-for-no-input-device.patch b/meta/recipes-graphics/wayland/weston/0001-Add-configuration-option-for-no-input-device.patch
new file mode 100644
index 0000000000..c45f3addfc
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-Add-configuration-option-for-no-input-device.patch
@@ -0,0 +1,112 @@
1From 75b7197f4e072a4e2de124ddbe93b85cffb1c0f8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
3Date: Fri, 21 Oct 2016 14:03:13 -0500
4Subject: [PATCH] Add configuration option for no input device.
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9As it has been discussed in the past [1], running Weston
10without any input device at launch might be beneficial for
11some use cases.
12
13Certainly, it's best for the vast majority of users (and
14the project) to require an input device to be present, as
15to avoid frustration and hassle, but for those brave souls
16that so prefer, this patch lets them run without any input
17device at all.
18
19This introduces a simple configuration in weston.ini:
20 [core]
21 require-input=true
22
23True is the default, so no behavioral change is introduced.
24
25[1] https://lists.freedesktop.org/archives/wayland-devel/2015-November/025193.html
26
27Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
28Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
29Reviewed-by: Daniel Stone <daniels@collabora.com>
30
31Upstream-Status: backport from
32https://cgit.freedesktop.org/wayland/weston/commit/?id=75b7197f
33---
34 man/weston.ini.man | 5 +++++
35 src/compositor.h | 3 +++
36 src/libinput-seat.c | 6 ++++++
37 src/main.c | 5 +++++
38 weston.ini.in | 1 +
39 5 files changed, 20 insertions(+)
40
41--- a/src/main.c
42+++ b/src/main.c
43@@ -1298,6 +1298,7 @@ int main(int argc, char *argv[])
44 struct wl_client *primary_client;
45 struct wl_listener primary_client_destroyed;
46 struct weston_seat *seat;
47+ int require_input;
48
49 const struct weston_option core_options[] = {
50 { WESTON_OPTION_STRING, "backend", 'B', &backend },
51@@ -1373,6 +1374,10 @@ int main(int argc, char *argv[])
52 if (weston_compositor_init_config(ec, config) < 0)
53 goto out;
54
55+ weston_config_section_get_bool(section, "require-input",
56+ &require_input, true);
57+ ec->require_input = require_input;
58+
59 if (load_backend(ec, backend, &argc, argv, config) < 0) {
60 weston_log("fatal: failed to create compositor backend\n");
61 goto out;
62--- a/src/compositor.h
63+++ b/src/compositor.h
64@@ -803,6 +803,9 @@ struct weston_compositor {
65
66 void *user_data;
67 void (*exit)(struct weston_compositor *c);
68+
69+ /* Whether to let the compositor run without any input device. */
70+ bool require_input;
71 };
72
73 struct weston_buffer {
74--- a/src/libinput-seat.c
75+++ b/src/libinput-seat.c
76@@ -255,6 +255,12 @@ udev_input_enable(struct udev_input *inp
77 devices_found = 1;
78 }
79
80+ if (devices_found == 0 && !c->require_input) {
81+ weston_log("warning: no input devices found, but none required "
82+ "as per configuration.\n");
83+ return 0;
84+ }
85+
86 if (devices_found == 0) {
87 weston_log(
88 "warning: no input devices on entering Weston. "
89--- a/man/weston.ini.man
90+++ b/man/weston.ini.man
91@@ -169,6 +169,11 @@ time, the one specified in the command-l
92 hand, if none of these sets the value, default idle timeout will be
93 set to 300 seconds.
94 .RS
95+.PP
96+.RE
97+.TP 7
98+.BI "require-input=" true
99+require an input device for launch
100
101 .SH "LIBINPUT SECTION"
102 The
103--- a/weston.ini.in
104+++ b/weston.ini.in
105@@ -2,6 +2,7 @@
106 #modules=xwayland.so,cms-colord.so
107 #shell=desktop-shell.so
108 #gbm-format=xrgb2101010
109+#require-input=true
110
111 [shell]
112 background-image=/usr/share/backgrounds/gnome/Aqua.jpg
diff --git a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
index 00118d78bb..edd3b918f6 100644
--- a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
@@ -13,14 +13,12 @@ breaks multilib weston as it would point to multilib sysroot when the
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14Upstream-Status: Inappropriate [embedded specific] 14Upstream-Status: Inappropriate [embedded specific]
15--- 15---
16 configure.ac | 2 +- 16 configure.ac | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/configure.ac b/configure.ac
20index bc7c329..15a05d3 100644
21--- a/configure.ac 19--- a/configure.ac
22+++ b/configure.ac 20+++ b/configure.ac
23@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0]) 21@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib
24 PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) 22 PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
25 23
26 PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2], 24 PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2],
@@ -29,6 +27,3 @@ index bc7c329..15a05d3 100644
29 AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) 27 AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
30 28
31 AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, 29 AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],,
32--
332.1.4
34
diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
index 148848d8d2..f7b52843d9 100644
--- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
@@ -10,17 +10,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 10---
11Upstream-Status: Submitted 11Upstream-Status: Submitted
12 12
13 configure.ac | 2 ++ 13 configure.ac | 2 ++
14 src/weston-error.h | 20 ++++++++++++++++++++ 14 src/weston-error.h | 20 ++++++++++++++++++++
15 src/weston-launch.c | 2 +- 15 src/weston-launch.c | 2 +-
16 3 files changed, 23 insertions(+), 1 deletion(-) 16 3 files changed, 23 insertions(+), 1 deletion(-)
17 create mode 100644 src/weston-error.h 17 create mode 100644 src/weston-error.h
18 18
19diff --git a/configure.ac b/configure.ac
20index 263fc22..f52cd62 100644
21--- a/configure.ac 19--- a/configure.ac
22+++ b/configure.ac 20+++ b/configure.ac
23@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], 21@@ -60,6 +60,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
24 [[#include <time.h>]]) 22 [[#include <time.h>]])
25 AC_CHECK_HEADERS([execinfo.h]) 23 AC_CHECK_HEADERS([execinfo.h])
26 24
@@ -28,10 +26,7 @@ index 263fc22..f52cd62 100644
28+ 26+
29 AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) 27 AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
30 28
31 COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2" 29 COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2"
32diff --git a/src/weston-error.h b/src/weston-error.h
33new file mode 100644
34index 0000000..2089d02
35--- /dev/null 30--- /dev/null
36+++ b/src/weston-error.h 31+++ b/src/weston-error.h
37@@ -0,0 +1,20 @@ 32@@ -0,0 +1,20 @@
@@ -55,11 +50,9 @@ index 0000000..2089d02
55+ 50+
56+#endif 51+#endif
57+ 52+
58diff --git a/src/weston-launch.c b/src/weston-launch.c
59index 10c66de..3e6d30a 100644
60--- a/src/weston-launch.c 53--- a/src/weston-launch.c
61+++ b/src/weston-launch.c 54+++ b/src/weston-launch.c
62@@ -30,7 +30,6 @@ 55@@ -33,7 +33,6 @@
63 #include <poll.h> 56 #include <poll.h>
64 #include <errno.h> 57 #include <errno.h>
65 58
@@ -67,7 +60,7 @@ index 10c66de..3e6d30a 100644
67 #include <getopt.h> 60 #include <getopt.h>
68 61
69 #include <sys/types.h> 62 #include <sys/types.h>
70@@ -56,6 +55,7 @@ 63@@ -59,6 +58,7 @@
71 #endif 64 #endif
72 65
73 #include "weston-launch.h" 66 #include "weston-launch.h"
@@ -75,6 +68,3 @@ index 10c66de..3e6d30a 100644
75 68
76 #define DRM_MAJOR 226 69 #define DRM_MAJOR 226
77 70
78--
792.1.4
80
diff --git a/meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch b/meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch
index 91ef727d32..ee66c20aa8 100644
--- a/meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch
@@ -8,11 +8,9 @@ This fixes build on musl.
8Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 8Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
9Upstream-Status: Submitted 9Upstream-Status: Submitted
10--- 10---
11 shared/xalloc.h | 1 + 11 shared/xalloc.h | 1 +
12 1 file changed, 1 insertion(+) 12 1 file changed, 1 insertion(+)
13 13
14diff --git a/shared/xalloc.h b/shared/xalloc.h
15index 85fccb4..484de2d 100644
16--- a/shared/xalloc.h 14--- a/shared/xalloc.h
17+++ b/shared/xalloc.h 15+++ b/shared/xalloc.h
18@@ -30,6 +30,7 @@ 16@@ -30,6 +30,7 @@
@@ -23,6 +21,3 @@ index 85fccb4..484de2d 100644
23 #include <stdlib.h> 21 #include <stdlib.h>
24 #include <string.h> 22 #include <string.h>
25 23
26--
272.1.4
28
diff --git a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
index 5542036be2..d684b1c1bc 100644
--- a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -14,12 +14,10 @@ Upstream-Status: Pending
14 14
15Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> 15Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
16--- 16---
17 configure.ac | 9 +++++++-- 17 configure.ac | 9 +++++++--
18 src/weston-launch.c | 20 ++++++++++++++++++++ 18 src/weston-launch.c | 20 ++++++++++++++++++++
19 2 files changed, 27 insertions(+), 2 deletions(-) 19 2 files changed, 27 insertions(+), 2 deletions(-)
20 20
21diff --git a/configure.ac b/configure.ac
22index 32fdde7..240966f 100644
23--- a/configure.ac 21--- a/configure.ac
24+++ b/configure.ac 22+++ b/configure.ac
25@@ -416,13 +416,17 @@ AC_ARG_ENABLE(resize-optimization, 23@@ -416,13 +416,17 @@ AC_ARG_ENABLE(resize-optimization,
@@ -50,8 +48,6 @@ index 32fdde7..240966f 100644
50 systemd-login support ${have_systemd_login} 48 systemd-login support ${have_systemd_login}
51 systemd notify support ${enable_systemd_notify} 49 systemd notify support ${enable_systemd_notify}
52 50
53diff --git a/src/weston-launch.c b/src/weston-launch.c
54index b8b2ba0..a865061 100644
55--- a/src/weston-launch.c 51--- a/src/weston-launch.c
56+++ b/src/weston-launch.c 52+++ b/src/weston-launch.c
57@@ -51,7 +51,9 @@ 53@@ -51,7 +51,9 @@
@@ -75,7 +71,7 @@ index b8b2ba0..a865061 100644
75 int tty; 71 int tty;
76 int ttynr; 72 int ttynr;
77 int sock[2]; 73 int sock[2];
78@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_launch *wl) 74@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_laun
79 return false; 75 return false;
80 } 76 }
81 77
@@ -91,7 +87,7 @@ index b8b2ba0..a865061 100644
91 87
92 static int 88 static int
93 setup_launcher_socket(struct weston_launch *wl) 89 setup_launcher_socket(struct weston_launch *wl)
94@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int status) 90@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int statu
95 close(wl->signalfd); 91 close(wl->signalfd);
96 close(wl->sock[0]); 92 close(wl->sock[0]);
97 93
@@ -99,7 +95,7 @@ index b8b2ba0..a865061 100644
99 if (wl->new_user) { 95 if (wl->new_user) {
100 err = pam_close_session(wl->ph, 0); 96 err = pam_close_session(wl->ph, 0);
101 if (err) 97 if (err)
102@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int status) 98@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int statu
103 err, pam_strerror(wl->ph, err)); 99 err, pam_strerror(wl->ph, err));
104 pam_end(wl->ph, err); 100 pam_end(wl->ph, err);
105 } 101 }
@@ -157,7 +153,7 @@ index b8b2ba0..a865061 100644
157 break; 153 break;
158 case 't': 154 case 't':
159 tty = optarg; 155 tty = optarg;
160@@ -730,8 +748,10 @@ main(int argc, char *argv[]) 156@@ -732,8 +750,10 @@ main(int argc, char *argv[])
161 if (setup_tty(&wl, tty) < 0) 157 if (setup_tty(&wl, tty) < 0)
162 exit(EXIT_FAILURE); 158 exit(EXIT_FAILURE);
163 159
@@ -168,6 +164,3 @@ index b8b2ba0..a865061 100644
168 164
169 if (setup_launcher_socket(&wl) < 0) 165 if (setup_launcher_socket(&wl) < 0)
170 exit(EXIT_FAILURE); 166 exit(EXIT_FAILURE);
171--
1722.1.4
173
diff --git a/meta/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch b/meta/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch
deleted file mode 100644
index 0c408a43d6..0000000000
--- a/meta/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From e8b615250f700f7854b423aaaf0a0aeea92c05a9 Mon Sep 17 00:00:00 2001
2From: Tom Hochstein <tom.hochstein@nxp.com>
3Date: Sat, 7 May 2016 08:51:58 -0300
4Subject: [PATCH] weston-launch: Handle invalid command line options
5Organization: O.S. Systems Software LTDA.
6
7Exit the program if an unrecognized command line option is found.
8
9Upstream-Status: Submitted
10
11Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
12Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
13---
14
15 src/weston-launch.c | 2 ++
16 1 file changed, 2 insertions(+)
17
18diff --git a/src/weston-launch.c b/src/weston-launch.c
19index b8dfb17..9987d8e 100644
20--- a/src/weston-launch.c
21+++ b/src/weston-launch.c
22@@ -703,6 +703,8 @@ main(int argc, char *argv[])
23 case 'h':
24 help("weston-launch");
25 exit(EXIT_FAILURE);
26+ default:
27+ exit(EXIT_FAILURE);
28 }
29 }
30
31--
322.8.2
33
diff --git a/meta/recipes-graphics/wayland/weston_1.11.0.bb b/meta/recipes-graphics/wayland/weston_1.11.1.bb
index 3ad309dab6..7e75cf7a0d 100644
--- a/meta/recipes-graphics/wayland/weston_1.11.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.11.1.bb
@@ -12,11 +12,11 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
12 file://0001-configure.ac-Fix-wayland-protocols-path.patch \ 12 file://0001-configure.ac-Fix-wayland-protocols-path.patch \
13 file://0001-shared-include-stdint.h-for-int32_t.patch \ 13 file://0001-shared-include-stdint.h-for-int32_t.patch \
14 file://xwayland.weston-start \ 14 file://xwayland.weston-start \
15 file://make-weston-launch-exit-for-unrecognized-option.patch \
16 file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ 15 file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
16 file://0001-Add-configuration-option-for-no-input-device.patch \
17" 17"
18SRC_URI[md5sum] = "bc6f90a2039163804aecfa663b69c4c2" 18SRC_URI[md5sum] = "c5fdc02ab67d33c0fca8f72d341facdf"
19SRC_URI[sha256sum] = "05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125" 19SRC_URI[sha256sum] = "548973496a5c8613d6690f9120f21066946a544df65ce4fe0ef153a8dc0bf6de"
20 20
21inherit autotools pkgconfig useradd distro_features_check 21inherit autotools pkgconfig useradd distro_features_check
22# depends on virtual/egl 22# depends on virtual/egl