Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: dev-libs/weston/files/, dev-libs/weston/
Date: Mon, 06 Mar 2017 00:43:14
Message-Id: 1488760959.3af42813666a5a5a9a9dfb4368bcb93c6cc1314c.lluixhi@gentoo
1 commit: 3af42813666a5a5a9a9dfb4368bcb93c6cc1314c
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Mon Mar 6 00:42:39 2017 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Mon Mar 6 00:42:39 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3af42813
7
8 dev-libs/weston: sync with upstream
9
10 update patch.
11
12 dev-libs/weston/Manifest | 4 +-
13 dev-libs/weston/files/1.11.0-musl.patch | 289 ++++----------------------------
14 dev-libs/weston/weston-1.11.0.ebuild | 10 +-
15 3 files changed, 39 insertions(+), 264 deletions(-)
16
17 diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
18 index 08a2abf..4c33fa3 100644
19 --- a/dev-libs/weston/Manifest
20 +++ b/dev-libs/weston/Manifest
21 @@ -1,5 +1,5 @@
22 -AUX 1.11.0-musl.patch 6945 SHA256 c328fffeeb5e5c8ad1b5198c62ba0da415fb0c0ac003070d83c11cde5057b5dc SHA512 6c798b7dad8f81c1cd550b9aa30e11729881dff09141cd811d90e2ad06da7f756542d8844b1a2a2948b247935cd4261d46aa9b991aaaeada226c418512734b2f WHIRLPOOL 719cf3a43ee54c4ab2fd3f3500560a3c10bb974d897cd07c501afe85ee37ab1235ffc5583bbfd3015ecfbe7d9745e6350f9ef9cf78913346bb9f8e4659a0108c
23 +AUX 1.11.0-musl.patch 1127 SHA256 51e3abf15fbeaf908febecfd5ede898760c2ae5325db60a2b11c4bca3b56503d SHA512 29866a9b22ddc7050467738b98b956df3906299a547edd74d2a861ba3367ca159d3747ffa3df5e9fbdba4e17966f47f33b56b7697418cf9f7f1f2bea62dd9f2f WHIRLPOOL 0eed5a00eb4495b3c3667d0019b99adf60fa9f54d2cc3436628e696729e9195dd4b1545112161edd0bd4f069734c687ae3da23d79fb07c79b3ba84fca1d23779
24 AUX README.gentoo 383 SHA256 ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478618def88cee85 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 WHIRLPOOL 8bc2485d91a399eb9d283ec3363546852be9a1a3e69214b3c7cc9a6427c4e10355dc8732de0d8b688f9df8a4bc03df25c3ce7b33c19773b7a47616c93f82bd81
25 DIST weston-1.11.0.tar.xz 1242244 SHA256 05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125 SHA512 30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5 WHIRLPOOL 5e76484c1413ddc14c426c80845790e6b636bb2d827188563ca9b41f23ca4afd6cf20c8a743c0ff1b6c09d371c3e6988d0e9765333660aeb8723ddf62208b876
26 -EBUILD weston-1.11.0.ebuild 3671 SHA256 1961ced3c29cdae326f21323f8404ca56ac4880c791bfc35bb781a239bd21a13 SHA512 88de8968e3ca286cbea8df932225619cb000cbfadf591174b8f687fe67831b8e17ca2c4a1c9a0b3d200ebd6b18fdb08789115a914e1df284ce534a4139c24be0 WHIRLPOOL a7a68946e418bbfe6e32a65512e5b5a9fcaecb6ea1b5abe0072767f736b3c77f6be33f4ea681612e081681ba636041fafb694d6ae95939571dd2f72eccfea624
27 +EBUILD weston-1.11.0.ebuild 3549 SHA256 b77d4422dd25616e2ff0a4f3ab71a8f6625e5e2b21c9d87afb41697932de2594 SHA512 69d14b889daff658079e0a187cac5ba3059d583a4ea572bb725ec8df0386e45f7e6fffeb8d6b80579260828e838821ec6ef1e872383325ba20b73f739dd83817 WHIRLPOOL 01a31df9ed78a148508e48f6a7727e7c5b72199616c72dec529197409a6075f04a8d87dc6afccd0f969da7e7e93f83cd8a598f78c8de96d0d8d024cec4a3ab8b
28 MISC metadata.xml 1346 SHA256 2710b274618784eb36f2c67fa8778b95c49ff2eeb3b52757bca963a363f455e4 SHA512 27e5e3fde5db5d9e04138b1abdeb77a09a3a0c726c28b1ba63db4aec44c1be8804cfc171893573ac2b4365dc94c725129843267cb0ab938bc5599aa186f26094 WHIRLPOOL 70f1a3c35da4948698ab39fc95d3b433d50b9170090050a0b8f4f1c2669011f2bd0d0f177414ae4744fcebdf7728174339578666b26d1508c56720cdb530fbfe
29
30 diff --git a/dev-libs/weston/files/1.11.0-musl.patch b/dev-libs/weston/files/1.11.0-musl.patch
31 index b568b47..05123ad 100644
32 --- a/dev-libs/weston/files/1.11.0-musl.patch
33 +++ b/dev-libs/weston/files/1.11.0-musl.patch
34 @@ -1,6 +1,6 @@
35 diff -Naur weston-1.11.0.orig/shared/xalloc.h weston-1.11.0/shared/xalloc.h
36 ---- weston-1.11.0.orig/shared/xalloc.h 2016-06-21 10:44:19.589264446 -0700
37 -+++ weston-1.11.0/shared/xalloc.h 2016-06-21 10:44:32.790394210 -0700
38 +--- weston-1.11.0.orig/shared/xalloc.h 2017-03-05 16:35:25.816193000 -0800
39 ++++ weston-1.11.0/shared/xalloc.h 2017-03-05 16:38:16.043363715 -0800
40 @@ -30,6 +30,7 @@
41 extern "C" {
42 #endif
43 @@ -9,257 +9,34 @@ diff -Naur weston-1.11.0.orig/shared/xalloc.h weston-1.11.0/shared/xalloc.h
44 #include <stdlib.h>
45 #include <string.h>
46
47 -diff -Naur weston-1.11.0.orig/src/weston-launch.c weston-1.11.0/src/weston-launch.c
48 ---- weston-1.11.0.orig/src/weston-launch.c 2016-06-21 10:44:19.613264682 -0700
49 -+++ weston-1.11.0/src/weston-launch.c 2016-06-21 10:54:33.890366803 -0700
50 -@@ -33,7 +33,7 @@
51 - #include <poll.h>
52 - #include <errno.h>
53 -
54 --#include <error.h>
55 -+#include <err.h>
56 - #include <getopt.h>
57 -
58 - #include <sys/types.h>
59 -@@ -225,11 +225,15 @@
60 - static int
61 - setup_launcher_socket(struct weston_launch *wl)
62 - {
63 -- if (socketpair(AF_LOCAL, SOCK_SEQPACKET, 0, wl->sock) < 0)
64 -- error(1, errno, "socketpair failed");
65 -+ if (socketpair(AF_LOCAL, SOCK_SEQPACKET, 0, wl->sock) < 0) {
66 -+ err(errno, "socketpair failed");
67 -+ exit(1);
68 -+ }
69 -
70 -- if (fcntl(wl->sock[0], F_SETFD, FD_CLOEXEC) < 0)
71 -- error(1, errno, "fcntl failed");
72 -+ if (fcntl(wl->sock[0], F_SETFD, FD_CLOEXEC) < 0) {
73 -+ err(errno, "fcntl failed");
74 -+ exit(1);
75 -+ }
76 -
77 - return 0;
78 - }
79 -@@ -464,7 +468,7 @@
80 - int pid, status, ret;
81 -
82 - if (read(wl->signalfd, &sig, sizeof sig) != sizeof sig) {
83 -- error(0, errno, "reading signalfd failed");
84 -+ err(errno, "reading signalfd failed");
85 - return -1;
86 - }
87 -
88 -@@ -530,49 +534,69 @@
89 - int tty0 = open("/dev/tty0", O_WRONLY | O_CLOEXEC);
90 - char filename[16];
91 -
92 -- if (tty0 < 0)
93 -- error(1, errno, "could not open tty0");
94 -+ if (tty0 < 0) {
95 -+ err(errno, "could not open tty0");
96 -+ exit(1);
97 -+ }
98 -
99 -- if (ioctl(tty0, VT_OPENQRY, &wl->ttynr) < 0 || wl->ttynr == -1)
100 -- error(1, errno, "failed to find non-opened console");
101 -+ if (ioctl(tty0, VT_OPENQRY, &wl->ttynr) < 0 || wl->ttynr == -1) {
102 -+ err(errno, "failed to find non-opened console");
103 -+ exit(1);
104 -+ }
105 -
106 - snprintf(filename, sizeof filename, "/dev/tty%d", wl->ttynr);
107 - wl->tty = open(filename, O_RDWR | O_NOCTTY);
108 - close(tty0);
109 - }
110 -
111 -- if (wl->tty < 0)
112 -- error(1, errno, "failed to open tty");
113 -+ if (wl->tty < 0) {
114 -+ err(errno, "failed to open tty");
115 -+ exit(1);
116 -+ }
117 -
118 - if (fstat(wl->tty, &buf) == -1 ||
119 -- major(buf.st_rdev) != TTY_MAJOR || minor(buf.st_rdev) == 0)
120 -- error(1, 0, "weston-launch must be run from a virtual terminal");
121 -+ major(buf.st_rdev) != TTY_MAJOR || minor(buf.st_rdev) == 0) {
122 -+ err(0, "weston-launch must be run from a virtual terminal");
123 -+ exit(1);
124 -+ }
125 -
126 - if (tty) {
127 -- if (fstat(wl->tty, &buf) < 0)
128 -- error(1, errno, "stat %s failed", tty);
129 -+ if (fstat(wl->tty, &buf) < 0) {
130 -+ err(errno, "stat %s failed", tty);
131 -+ exit(1);
132 -+ }
133 -
134 -- if (major(buf.st_rdev) != TTY_MAJOR)
135 -- error(1, 0, "invalid tty device: %s", tty);
136 -+ if (major(buf.st_rdev) != TTY_MAJOR) {
137 -+ err(0, "invalid tty device: %s", tty);
138 -+ exit(1);
139 -+ }
140 -
141 - wl->ttynr = minor(buf.st_rdev);
142 - }
143 -
144 -- if (ioctl(wl->tty, KDGKBMODE, &wl->kb_mode))
145 -- error(1, errno, "failed to get current keyboard mode: %m\n");
146 -+ if (ioctl(wl->tty, KDGKBMODE, &wl->kb_mode)) {
147 -+ err(errno, "failed to get current keyboard mode: %m\n");
148 -+ exit(1);
149 -+ }
150 -
151 - if (ioctl(wl->tty, KDSKBMUTE, 1) &&
152 -- ioctl(wl->tty, KDSKBMODE, K_OFF))
153 -- error(1, errno, "failed to set K_OFF keyboard mode: %m\n");
154 -+ ioctl(wl->tty, KDSKBMODE, K_OFF)) {
155 -+ err(errno, "failed to set K_OFF keyboard mode: %m\n");
156 -+ exit(1);
157 -+ }
158 -
159 -- if (ioctl(wl->tty, KDSETMODE, KD_GRAPHICS))
160 -- error(1, errno, "failed to set KD_GRAPHICS mode on tty: %m\n");
161 -+ if (ioctl(wl->tty, KDSETMODE, KD_GRAPHICS)) {
162 -+ err(errno, "failed to set KD_GRAPHICS mode on tty: %m\n");
163 -+ exit(1);
164 -+ }
165 -
166 - mode.mode = VT_PROCESS;
167 - mode.relsig = SIGUSR1;
168 - mode.acqsig = SIGUSR2;
169 -- if (ioctl(wl->tty, VT_SETMODE, &mode) < 0)
170 -- error(1, errno, "failed to take control of vt handling\n");
171 -+ if (ioctl(wl->tty, VT_SETMODE, &mode) < 0) {
172 -+ err(errno, "failed to take control of vt handling\n");
173 -+ exit(1);
174 -+ }
175 -
176 - return 0;
177 - }
178 -@@ -585,10 +609,14 @@
179 - int i;
180 -
181 - if (wl->tty != STDIN_FILENO) {
182 -- if (setsid() < 0)
183 -- error(1, errno, "setsid failed");
184 -- if (ioctl(wl->tty, TIOCSCTTY, 0) < 0)
185 -- error(1, errno, "TIOCSCTTY failed - tty is in use");
186 -+ if (setsid() < 0) {
187 -+ err(errno, "setsid failed");
188 -+ exit(1);
189 -+ }
190 -+ if (ioctl(wl->tty, TIOCSCTTY, 0) < 0) {
191 -+ err(errno, "TIOCSCTTY failed - tty is in use");
192 -+ exit(1);
193 -+ }
194 - }
195 -
196 - term = getenv("TERM");
197 -@@ -604,7 +632,7 @@
198 - if (env) {
199 - for (i = 0; env[i]; ++i) {
200 - if (putenv(env[i]) != 0)
201 -- error(0, 0, "putenv %s failed", env[i]);
202 -+ err(0, "putenv %s failed", env[i]);
203 - }
204 - free(env);
205 - }
206 -@@ -617,8 +645,10 @@
207 - #ifdef HAVE_INITGROUPS
208 - initgroups(wl->pw->pw_name, wl->pw->pw_gid) < 0 ||
209 - #endif
210 -- setuid(wl->pw->pw_uid) < 0)
211 -- error(1, errno, "dropping privileges failed");
212 -+ setuid(wl->pw->pw_uid) < 0) {
213 -+ err(errno, "dropping privileges failed");
214 -+ exit(1);
215 -+ }
216 - }
217 -
218 - static void
219 -@@ -658,7 +688,8 @@
220 - child_argv[5 + i] = NULL;
221 -
222 - execv(child_argv[0], child_argv);
223 -- error(1, errno, "exec failed");
224 -+ err(errno, "exec failed");
225 -+ exit(1);
226 - }
227 -
228 - static void
229 -@@ -691,8 +722,10 @@
230 - switch (c) {
231 - case 'u':
232 - wl.new_user = optarg;
233 -- if (getuid() != 0)
234 -- error(1, 0, "Permission denied. -u allowed for root only");
235 -+ if (getuid() != 0) {
236 -+ err(0, "Permission denied. -u allowed for root only");
237 -+ exit(1);
238 -+ }
239 - break;
240 - case 't':
241 - tty = optarg;
242 -@@ -706,24 +739,30 @@
243 - }
244 - }
245 -
246 -- if ((argc - optind) > (MAX_ARGV_SIZE - 6))
247 -- error(1, E2BIG, "Too many arguments to pass to weston");
248 -+ if ((argc - optind) > (MAX_ARGV_SIZE - 6)) {
249 -+ err(E2BIG, "Too many arguments to pass to weston");
250 -+ exit(1);
251 -+ }
252 -
253 - if (wl.new_user)
254 - wl.pw = getpwnam(wl.new_user);
255 - else
256 - wl.pw = getpwuid(getuid());
257 -- if (wl.pw == NULL)
258 -- error(1, errno, "failed to get username");
259 -+ if (wl.pw == NULL) {
260 -+ err(errno, "failed to get username");
261 -+ exit(1);
262 -+ }
263 -
264 -- if (!weston_launch_allowed(&wl))
265 -- error(1, 0, "Permission denied. You should either:\n"
266 -+ if (!weston_launch_allowed(&wl)) {
267 -+ err(0, "Permission denied. You should either:\n"
268 - #ifdef HAVE_SYSTEMD_LOGIN
269 - " - run from an active and local (systemd) session.\n"
270 - #else
271 - " - enable systemd session support for weston-launch.\n"
272 - #endif
273 - " - or add yourself to the 'weston-launch' group.");
274 -+ exit(1);
275 -+ }
276 -
277 - if (setup_tty(&wl, tty) < 0)
278 - exit(EXIT_FAILURE);
279 -@@ -738,8 +777,10 @@
280 - exit(EXIT_FAILURE);
281 -
282 - wl.child = fork();
283 -- if (wl.child == -1)
284 -- error(EXIT_FAILURE, errno, "fork failed");
285 -+ if (wl.child == -1) {
286 -+ err(errno, "fork failed");
287 -+ exit(EXIT_FAILURE);
288 -+ }
289 -
290 - if (wl.child == 0)
291 - launch_compositor(&wl, argc - optind, argv + optind);
292 -@@ -759,7 +800,7 @@
293 -
294 - n = poll(fds, 2, -1);
295 - if (n < 0)
296 -- error(0, errno, "poll failed");
297 -+ err(errno, "poll failed");
298 - if (fds[0].revents & POLLIN)
299 - handle_socket_msg(&wl);
300 - if (fds[1].revents)
301 +diff -Naur weston-1.11.0.orig/src/error.h weston-1.11.0/src/error.h
302 +--- weston-1.11.0.orig/src/error.h 1969-12-31 16:00:00.000000000 -0800
303 ++++ weston-1.11.0/src/error.h 2017-03-05 16:37:51.441046969 -0800
304 +@@ -0,0 +1,27 @@
305 ++#ifndef _ERROR_H_
306 ++#define _ERROR_H_
307 ++
308 ++#include <stdarg.h>
309 ++#include <stdio.h>
310 ++#include <stdlib.h>
311 ++#include <string.h>
312 ++#include <errno.h>
313 ++
314 ++static unsigned int error_message_count = 0;
315 ++
316 ++static inline void error(int status, int errnum, const char* format, ...)
317 ++{
318 ++ va_list ap;
319 ++ fprintf(stderr, "%s: ", program_invocation_name);
320 ++ va_start(ap, format);
321 ++ vfprintf(stderr, format, ap);
322 ++ va_end(ap);
323 ++ if (errnum)
324 ++ fprintf(stderr, ": %s", strerror(errnum));
325 ++ fprintf(stderr, "\n");
326 ++ error_message_count++;
327 ++ if (status)
328 ++ exit(status);
329 ++}
330 ++
331 ++#endif /* _ERROR_H_ */
332
333 diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.11.0.ebuild
334 index 8af796a..19a648d 100644
335 --- a/dev-libs/weston/weston-1.11.0.ebuild
336 +++ b/dev-libs/weston/weston-1.11.0.ebuild
337 @@ -1,6 +1,5 @@
338 -# Copyright 1999-2016 Gentoo Foundation
339 +# Copyright 1999-2017 Gentoo Foundation
340 # Distributed under the terms of the GNU General Public License v2
341 -# $Id$
342
343 EAPI=5
344
345 @@ -28,8 +27,7 @@ fi
346 LICENSE="MIT CC-BY-SA-3.0"
347 SLOT="0"
348
349 -IUSE_VIDEO_CARDS="video_cards_intel video_cards_v4l"
350 -IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland ${IUSE_VIDEO_CARDS}"
351 +IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland"
352
353 REQUIRED_USE="
354 drm? ( gles2 )
355 @@ -135,10 +133,10 @@ src_configure() {
356 $(use_enable systemd systemd-notify) \
357 $(use_enable xwayland) \
358 $(use_enable xwayland xwayland-test) \
359 - $(use_enable video_cards_intel simple-dmabuf-intel-client) \
360 - $(use_enable video_cards_v4l simple-dmabuf-v4l-client) \
361 $(use_with jpeg) \
362 $(use_with webp) \
363 + --disable-simple-dmabuf-intel-client \
364 + --disable-simple-dmabuf-v4l-client \
365 ${myconf}
366 }