summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics')
-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.patch2
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch12
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch23
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch52
-rw-r--r--meta/recipes-graphics/wayland/weston_2.0.0.bb (renamed from meta/recipes-graphics/wayland/weston_1.11.1.bb)21
6 files changed, 48 insertions, 174 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
deleted file mode 100644
index c45f3addfc..0000000000
--- a/meta/recipes-graphics/wayland/weston/0001-Add-configuration-option-for-no-input-device.patch
+++ /dev/null
@@ -1,112 +0,0 @@
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 edd3b918f6..5f4d79c38c 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
@@ -21,7 +21,7 @@ Upstream-Status: Inappropriate [embedded specific]
21@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib 21@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib
22 PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) 22 PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
23 23
24 PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2], 24 PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.7],
25- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) 25- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
26+ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) 26+ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
27 AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) 27 AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
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 f7b52843d9..e2213aca60 100644
--- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
@@ -10,9 +10,9 @@ 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 libweston/weston-error.h | 20 ++++++++++++++++++++
15 src/weston-launch.c | 2 +- 15 libweston/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
@@ -28,7 +28,7 @@ Upstream-Status: Submitted
28 28
29 COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2" 29 COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2"
30--- /dev/null 30--- /dev/null
31+++ b/src/weston-error.h 31+++ b/libweston/weston-error.h
32@@ -0,0 +1,20 @@ 32@@ -0,0 +1,20 @@
33+#ifndef _WESTON_ERROR_H 33+#ifndef _WESTON_ERROR_H
34+#define _WESTON_ERROR_H 34+#define _WESTON_ERROR_H
@@ -50,8 +50,8 @@ Upstream-Status: Submitted
50+ 50+
51+#endif 51+#endif
52+ 52+
53--- a/src/weston-launch.c 53--- a/libweston/weston-launch.c
54+++ b/src/weston-launch.c 54+++ b/libweston/weston-launch.c
55@@ -33,7 +33,6 @@ 55@@ -33,7 +33,6 @@
56 #include <poll.h> 56 #include <poll.h>
57 #include <errno.h> 57 #include <errno.h>
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
deleted file mode 100644
index ee66c20aa8..0000000000
--- a/meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From ba02b8abe4e2afac2bfbf2559972d5059d75a041 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Sat, 16 Jul 2016 22:50:19 +0300
4Subject: [PATCH weston] shared: include stdint.h for int32_t
5
6This fixes build on musl.
7
8Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
9Upstream-Status: Submitted
10---
11 shared/xalloc.h | 1 +
12 1 file changed, 1 insertion(+)
13
14--- a/shared/xalloc.h
15+++ b/shared/xalloc.h
16@@ -30,6 +30,7 @@
17 extern "C" {
18 #endif
19
20+#include <stdint.h>
21 #include <stdlib.h>
22 #include <string.h>
23
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 d684b1c1bc..70b988898c 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
@@ -1,6 +1,6 @@
1From d02226b3d5872b184c1d50c7f4706ac9467ffb81 Mon Sep 17 00:00:00 2001 1From 8ff6ed03ec4079f32e9b34085414e57be4730e04 Mon Sep 17 00:00:00 2001
2From: Tom Hochstein <tom.hochstein@nxp.com> 2From: Tom Hochstein <tom.hochstein@nxp.com>
3Date: Fri, 15 Jul 2016 11:00:15 +0300 3Date: Wed, 22 Feb 2017 15:53:30 +0200
4Subject: [PATCH] weston-launch: Provide a default version that doesn't require 4Subject: [PATCH] weston-launch: Provide a default version that doesn't require
5 PAM 5 PAM
6 6
@@ -13,14 +13,17 @@ without non-root-user support.
13Upstream-Status: Pending 13Upstream-Status: Pending
14 14
15Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> 15Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
16Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16--- 17---
17 configure.ac | 9 +++++++-- 18 configure.ac | 9 +++++++--
18 src/weston-launch.c | 20 ++++++++++++++++++++ 19 libweston/weston-launch.c | 20 ++++++++++++++++++++
19 2 files changed, 27 insertions(+), 2 deletions(-) 20 2 files changed, 27 insertions(+), 2 deletions(-)
20 21
22diff --git a/configure.ac b/configure.ac
23index 46cb2c7..bb45f46 100644
21--- a/configure.ac 24--- a/configure.ac
22+++ b/configure.ac 25+++ b/configure.ac
23@@ -416,13 +416,17 @@ AC_ARG_ENABLE(resize-optimization, 26@@ -435,13 +435,17 @@ AC_ARG_ENABLE(resize-optimization,
24 AS_IF([test "x$enable_resize_optimization" = "xyes"], 27 AS_IF([test "x$enable_resize_optimization" = "xyes"],
25 [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) 28 [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
26 29
@@ -28,11 +31,11 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
28+ AS_HELP_STRING([--with-pam], [Use PAM]), 31+ AS_HELP_STRING([--with-pam], [Use PAM]),
29+ [use_pam=$withval], [use_pam=yes]) 32+ [use_pam=$withval], [use_pam=yes])
30 AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],, enable_weston_launch=yes) 33 AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],, enable_weston_launch=yes)
31 AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch == xyes) 34 AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch = xyes)
32-if test x$enable_weston_launch == xyes; then 35-if test x$enable_weston_launch = xyes; then
33+if test x$enable_weston_launch = xyes -a x$use_pam = xyes; then 36+if test x$enable_weston_launch = xyes -a x$use_pam = xyes; then
34 WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no]) 37 WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no])
35 if test x$have_pam == xno; then 38 if test x$have_pam = xno; then
36- AC_ERROR([weston-launch requires pam]) 39- AC_ERROR([weston-launch requires pam])
37+ AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found]) 40+ AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found])
38 fi 41 fi
@@ -40,7 +43,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
40 fi 43 fi
41 44
42 AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes") 45 AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
43@@ -673,6 +677,7 @@ AC_MSG_RESULT([ 46@@ -701,6 +705,7 @@ AC_MSG_RESULT([
44 Enable developer documentation ${enable_devdocs} 47 Enable developer documentation ${enable_devdocs}
45 48
46 weston-launch utility ${enable_weston_launch} 49 weston-launch utility ${enable_weston_launch}
@@ -48,8 +51,10 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
48 systemd-login support ${have_systemd_login} 51 systemd-login support ${have_systemd_login}
49 systemd notify support ${enable_systemd_notify} 52 systemd notify support ${enable_systemd_notify}
50 53
51--- a/src/weston-launch.c 54diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
52+++ b/src/weston-launch.c 55index 0491896..07e7469 100644
56--- a/libweston/weston-launch.c
57+++ b/libweston/weston-launch.c
53@@ -51,7 +51,9 @@ 58@@ -51,7 +51,9 @@
54 59
55 #include <pwd.h> 60 #include <pwd.h>
@@ -71,7 +76,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
71 int tty; 76 int tty;
72 int ttynr; 77 int ttynr;
73 int sock[2]; 78 int sock[2];
74@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_laun 79@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_launch *wl)
75 return false; 80 return false;
76 } 81 }
77 82
@@ -87,7 +92,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
87 92
88 static int 93 static int
89 setup_launcher_socket(struct weston_launch *wl) 94 setup_launcher_socket(struct weston_launch *wl)
90@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int statu 95@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int status)
91 close(wl->signalfd); 96 close(wl->signalfd);
92 close(wl->sock[0]); 97 close(wl->sock[0]);
93 98
@@ -95,7 +100,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
95 if (wl->new_user) { 100 if (wl->new_user) {
96 err = pam_close_session(wl->ph, 0); 101 err = pam_close_session(wl->ph, 0);
97 if (err) 102 if (err)
98@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int statu 103@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int status)
99 err, pam_strerror(wl->ph, err)); 104 err, pam_strerror(wl->ph, err));
100 pam_end(wl->ph, err); 105 pam_end(wl->ph, err);
101 } 106 }
@@ -103,7 +108,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
103 108
104 if (ioctl(wl->tty, KDSKBMUTE, 0) && 109 if (ioctl(wl->tty, KDSKBMUTE, 0) &&
105 ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) 110 ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
106@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl) 111@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
107 setenv("HOME", wl->pw->pw_dir, 1); 112 setenv("HOME", wl->pw->pw_dir, 1);
108 setenv("SHELL", wl->pw->pw_shell, 1); 113 setenv("SHELL", wl->pw->pw_shell, 1);
109 114
@@ -111,15 +116,15 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
111 env = pam_getenvlist(wl->ph); 116 env = pam_getenvlist(wl->ph);
112 if (env) { 117 if (env) {
113 for (i = 0; env[i]; ++i) { 118 for (i = 0; env[i]; ++i) {
114@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl) 119@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
115 } 120 }
116 free(env); 121 free(env);
117 } 122 }
118+#endif 123+#endif
119 }
120 124
121 static void 125 /*
122@@ -665,7 +675,9 @@ static void 126 * We open a new session, so it makes sense
127@@ -675,7 +685,9 @@ static void
123 help(const char *name) 128 help(const char *name)
124 { 129 {
125 fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); 130 fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
@@ -129,7 +134,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
129 fprintf(stderr, " -t, --tty Start session on alternative tty\n"); 134 fprintf(stderr, " -t, --tty Start session on alternative tty\n");
130 fprintf(stderr, " -v, --verbose Be verbose\n"); 135 fprintf(stderr, " -v, --verbose Be verbose\n");
131 fprintf(stderr, " -h, --help Display this help message\n"); 136 fprintf(stderr, " -h, --help Display this help message\n");
132@@ -678,7 +690,9 @@ main(int argc, char *argv[]) 137@@ -688,7 +700,9 @@ main(int argc, char *argv[])
133 int i, c; 138 int i, c;
134 char *tty = NULL; 139 char *tty = NULL;
135 struct option opts[] = { 140 struct option opts[] = {
@@ -139,7 +144,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
139 { "tty", required_argument, NULL, 't' }, 144 { "tty", required_argument, NULL, 't' },
140 { "verbose", no_argument, NULL, 'v' }, 145 { "verbose", no_argument, NULL, 'v' },
141 { "help", no_argument, NULL, 'h' }, 146 { "help", no_argument, NULL, 'h' },
142@@ -690,9 +704,13 @@ main(int argc, char *argv[]) 147@@ -700,9 +714,13 @@ main(int argc, char *argv[])
143 while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) { 148 while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) {
144 switch (c) { 149 switch (c) {
145 case 'u': 150 case 'u':
@@ -153,7 +158,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
153 break; 158 break;
154 case 't': 159 case 't':
155 tty = optarg; 160 tty = optarg;
156@@ -732,8 +750,10 @@ main(int argc, char *argv[]) 161@@ -740,8 +758,10 @@ main(int argc, char *argv[])
157 if (setup_tty(&wl, tty) < 0) 162 if (setup_tty(&wl, tty) < 0)
158 exit(EXIT_FAILURE); 163 exit(EXIT_FAILURE);
159 164
@@ -164,3 +169,6 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
164 169
165 if (setup_launcher_socket(&wl) < 0) 170 if (setup_launcher_socket(&wl) < 0)
166 exit(EXIT_FAILURE); 171 exit(EXIT_FAILURE);
172--
1732.1.4
174
diff --git a/meta/recipes-graphics/wayland/weston_1.11.1.bb b/meta/recipes-graphics/wayland/weston_2.0.0.bb
index 22b30ad2d3..54b07bd6b9 100644
--- a/meta/recipes-graphics/wayland/weston_1.11.1.bb
+++ b/meta/recipes-graphics/wayland/weston_2.0.0.bb
@@ -3,20 +3,18 @@ DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
3HOMEPAGE = "http://wayland.freedesktop.org" 3HOMEPAGE = "http://wayland.freedesktop.org"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
6 file://src/compositor.c;endline=26;md5=e342df749174a8ee11065583157c7a38" 6 file://libweston/compositor.c;endline=26;md5=e342df749174a8ee11065583157c7a38"
7 7
8SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 8SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
9 file://weston.png \ 9 file://weston.png \
10 file://weston.desktop \ 10 file://weston.desktop \
11 file://0001-make-error-portable.patch \ 11 file://0001-make-error-portable.patch \
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 \
14 file://xwayland.weston-start \ 13 file://xwayland.weston-start \
15 file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ 14 file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
16 file://0001-Add-configuration-option-for-no-input-device.patch \
17" 15"
18SRC_URI[md5sum] = "c5fdc02ab67d33c0fca8f72d341facdf" 16SRC_URI[md5sum] = "15f38945942bf2a91fe2687145fb4c7d"
19SRC_URI[sha256sum] = "548973496a5c8613d6690f9120f21066946a544df65ce4fe0ef153a8dc0bf6de" 17SRC_URI[sha256sum] = "b4e446ac27f118196f1609dab89bb3cb3e81652d981414ad860e733b355365d8"
20 18
21inherit autotools pkgconfig useradd distro_features_check 19inherit autotools pkgconfig useradd distro_features_check
22# depends on virtual/egl 20# depends on virtual/egl
@@ -26,7 +24,6 @@ DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
26DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" 24DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
27 25
28EXTRA_OECONF = "--enable-setuid-install \ 26EXTRA_OECONF = "--enable-setuid-install \
29 --disable-rpi-compositor \
30 --disable-rdp-compositor \ 27 --disable-rdp-compositor \
31 WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \ 28 WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \
32 " 29 "
@@ -80,7 +77,7 @@ PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
80 77
81do_install_append() { 78do_install_append() {
82 # Weston doesn't need the .la files to load modules, so wipe them 79 # Weston doesn't need the .la files to load modules, so wipe them
83 rm -f ${D}/${libdir}/weston/*.la 80 rm -f ${D}/${libdir}/libweston-2/*.la
84 81
85 # If X11, ship a desktop file to launch it 82 # If X11, ship a desktop file to launch it
86 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then 83 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
@@ -96,13 +93,17 @@ do_install_append() {
96 fi 93 fi
97} 94}
98 95
99PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)}" 96PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
100PACKAGES += "${PN}-examples" 97 libweston-2 ${PN}-examples"
101 98
102FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" 99FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}"
100
101FILES_libweston-2 = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-2/*.so"
102SUMMARY_libweston-2 = "Helper library for implementing 'wayland window managers'."
103
103FILES_${PN}-examples = "${bindir}/*" 104FILES_${PN}-examples = "${bindir}/*"
104 105
105FILES_${PN}-xwayland = "${libdir}/${BPN}/xwayland.so" 106FILES_${PN}-xwayland = "${libdir}/libweston-2/xwayland.so"
106RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland" 107RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland"
107 108
108RDEPENDS_${PN} += "xkeyboard-config" 109RDEPENDS_${PN} += "xkeyboard-config"