commit: 3af42813666a5a5a9a9dfb4368bcb93c6cc1314c
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Mar 6 00:42:39 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Mar 6 00:42:39 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3af42813
dev-libs/weston: sync with upstream
update patch.
dev-libs/weston/Manifest | 4 +-
dev-libs/weston/files/1.11.0-musl.patch | 289 ++++----------------------------
dev-libs/weston/weston-1.11.0.ebuild | 10 +-
3 files changed, 39 insertions(+), 264 deletions(-)
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 08a2abf..4c33fa3 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,5 +1,5 @@
-AUX 1.11.0-musl.patch 6945 SHA256
c328fffeeb5e5c8ad1b5198c62ba0da415fb0c0ac003070d83c11cde5057b5dc SHA512
6c798b7dad8f81c1cd550b9aa30e11729881dff09141cd811d90e2ad06da7f756542d8844b1a2a2948b247935cd4261d46aa9b991aaaeada226c418512734b2f
WHIRLPOOL
719cf3a43ee54c4ab2fd3f3500560a3c10bb974d897cd07c501afe85ee37ab1235ffc5583bbfd3015ecfbe7d9745e6350f9ef9cf78913346bb9f8e4659a0108c
+AUX 1.11.0-musl.patch 1127 SHA256
51e3abf15fbeaf908febecfd5ede898760c2ae5325db60a2b11c4bca3b56503d SHA512
29866a9b22ddc7050467738b98b956df3906299a547edd74d2a861ba3367ca159d3747ffa3df5e9fbdba4e17966f47f33b56b7697418cf9f7f1f2bea62dd9f2f
WHIRLPOOL
0eed5a00eb4495b3c3667d0019b99adf60fa9f54d2cc3436628e696729e9195dd4b1545112161edd0bd4f069734c687ae3da23d79fb07c79b3ba84fca1d23779
AUX README.gentoo 383 SHA256
ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478618def88cee85 SHA512
e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
WHIRLPOOL
8bc2485d91a399eb9d283ec3363546852be9a1a3e69214b3c7cc9a6427c4e10355dc8732de0d8b688f9df8a4bc03df25c3ce7b33c19773b7a47616c93f82bd81
DIST weston-1.11.0.tar.xz 1242244 SHA256
05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125 SHA512
30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5
WHIRLPOOL
5e76484c1413ddc14c426c80845790e6b636bb2d827188563ca9b41f23ca4afd6cf20c8a743c0ff1b6c09d371c3e6988d0e9765333660aeb8723ddf62208b876
-EBUILD weston-1.11.0.ebuild 3671 SHA256
1961ced3c29cdae326f21323f8404ca56ac4880c791bfc35bb781a239bd21a13 SHA512
88de8968e3ca286cbea8df932225619cb000cbfadf591174b8f687fe67831b8e17ca2c4a1c9a0b3d200ebd6b18fdb08789115a914e1df284ce534a4139c24be0
WHIRLPOOL
a7a68946e418bbfe6e32a65512e5b5a9fcaecb6ea1b5abe0072767f736b3c77f6be33f4ea681612e081681ba636041fafb694d6ae95939571dd2f72eccfea624
+EBUILD weston-1.11.0.ebuild 3549 SHA256
b77d4422dd25616e2ff0a4f3ab71a8f6625e5e2b21c9d87afb41697932de2594 SHA512
69d14b889daff658079e0a187cac5ba3059d583a4ea572bb725ec8df0386e45f7e6fffeb8d6b80579260828e838821ec6ef1e872383325ba20b73f739dd83817
WHIRLPOOL
01a31df9ed78a148508e48f6a7727e7c5b72199616c72dec529197409a6075f04a8d87dc6afccd0f969da7e7e93f83cd8a598f78c8de96d0d8d024cec4a3ab8b
MISC metadata.xml 1346 SHA256
2710b274618784eb36f2c67fa8778b95c49ff2eeb3b52757bca963a363f455e4 SHA512
27e5e3fde5db5d9e04138b1abdeb77a09a3a0c726c28b1ba63db4aec44c1be8804cfc171893573ac2b4365dc94c725129843267cb0ab938bc5599aa186f26094
WHIRLPOOL
70f1a3c35da4948698ab39fc95d3b433d50b9170090050a0b8f4f1c2669011f2bd0d0f177414ae4744fcebdf7728174339578666b26d1508c56720cdb530fbfe
diff --git a/dev-libs/weston/files/1.11.0-musl.patch
b/dev-libs/weston/files/1.11.0-musl.patch
index b568b47..05123ad 100644
--- a/dev-libs/weston/files/1.11.0-musl.patch
+++ b/dev-libs/weston/files/1.11.0-musl.patch
@@ -1,6 +1,6 @@
diff -Naur weston-1.11.0.orig/shared/xalloc.h weston-1.11.0/shared/xalloc.h
---- weston-1.11.0.orig/shared/xalloc.h 2016-06-21 10:44:19.589264446 -0700
-+++ weston-1.11.0/shared/xalloc.h 2016-06-21 10:44:32.790394210 -0700
+--- weston-1.11.0.orig/shared/xalloc.h 2017-03-05 16:35:25.816193000 -0800
++++ weston-1.11.0/shared/xalloc.h 2017-03-05 16:38:16.043363715 -0800
@@ -30,6 +30,7 @@
extern "C" {
#endif
@@ -9,257 +9,34 @@ diff -Naur weston-1.11.0.orig/shared/xalloc.h
weston-1.11.0/shared/xalloc.h
#include <stdlib.h>
#include <string.h>
-diff -Naur weston-1.11.0.orig/src/weston-launch.c
weston-1.11.0/src/weston-launch.c
---- weston-1.11.0.orig/src/weston-launch.c 2016-06-21 10:44:19.613264682
-0700
-+++ weston-1.11.0/src/weston-launch.c 2016-06-21 10:54:33.890366803 -0700
-@@ -33,7 +33,7 @@
- #include <poll.h>
- #include <errno.h>
-
--#include <error.h>
-+#include <err.h>
- #include <getopt.h>
-
- #include <sys/types.h>
-@@ -225,11 +225,15 @@
- static int
- setup_launcher_socket(struct weston_launch *wl)
- {
-- if (socketpair(AF_LOCAL, SOCK_SEQPACKET, 0, wl->sock) < 0)
-- error(1, errno, "socketpair failed");
-+ if (socketpair(AF_LOCAL, SOCK_SEQPACKET, 0, wl->sock) < 0) {
-+ err(errno, "socketpair failed");
-+ exit(1);
-+ }
-
-- if (fcntl(wl->sock[0], F_SETFD, FD_CLOEXEC) < 0)
-- error(1, errno, "fcntl failed");
-+ if (fcntl(wl->sock[0], F_SETFD, FD_CLOEXEC) < 0) {
-+ err(errno, "fcntl failed");
-+ exit(1);
-+ }
-
- return 0;
- }
-@@ -464,7 +468,7 @@
- int pid, status, ret;
-
- if (read(wl->signalfd, &sig, sizeof sig) != sizeof sig) {
-- error(0, errno, "reading signalfd failed");
-+ err(errno, "reading signalfd failed");
- return -1;
- }
-
-@@ -530,49 +534,69 @@
- int tty0 = open("/dev/tty0", O_WRONLY | O_CLOEXEC);
- char filename[16];
-
-- if (tty0 < 0)
-- error(1, errno, "could not open tty0");
-+ if (tty0 < 0) {
-+ err(errno, "could not open tty0");
-+ exit(1);
-+ }
-
-- if (ioctl(tty0, VT_OPENQRY, &wl->ttynr) < 0 || wl->ttynr == -1)
-- error(1, errno, "failed to find non-opened console");
-+ if (ioctl(tty0, VT_OPENQRY, &wl->ttynr) < 0 || wl->ttynr == -1)
{
-+ err(errno, "failed to find non-opened console");
-+ exit(1);
-+ }
-
- snprintf(filename, sizeof filename, "/dev/tty%d", wl->ttynr);
- wl->tty = open(filename, O_RDWR | O_NOCTTY);
- close(tty0);
- }
-
-- if (wl->tty < 0)
-- error(1, errno, "failed to open tty");
-+ if (wl->tty < 0) {
-+ err(errno, "failed to open tty");
-+ exit(1);
-+ }
-
- if (fstat(wl->tty, &buf) == -1 ||
-- major(buf.st_rdev) != TTY_MAJOR || minor(buf.st_rdev) == 0)
-- error(1, 0, "weston-launch must be run from a virtual
terminal");
-+ major(buf.st_rdev) != TTY_MAJOR || minor(buf.st_rdev) == 0) {
-+ err(0, "weston-launch must be run from a virtual terminal");
-+ exit(1);
-+ }
-
- if (tty) {
-- if (fstat(wl->tty, &buf) < 0)
-- error(1, errno, "stat %s failed", tty);
-+ if (fstat(wl->tty, &buf) < 0) {
-+ err(errno, "stat %s failed", tty);
-+ exit(1);
-+ }
-
-- if (major(buf.st_rdev) != TTY_MAJOR)
-- error(1, 0, "invalid tty device: %s", tty);
-+ if (major(buf.st_rdev) != TTY_MAJOR) {
-+ err(0, "invalid tty device: %s", tty);
-+ exit(1);
-+ }
-
- wl->ttynr = minor(buf.st_rdev);
- }
-
-- if (ioctl(wl->tty, KDGKBMODE, &wl->kb_mode))
-- error(1, errno, "failed to get current keyboard mode: %m\n");
-+ if (ioctl(wl->tty, KDGKBMODE, &wl->kb_mode)) {
-+ err(errno, "failed to get current keyboard mode: %m\n");
-+ exit(1);
-+ }
-
- if (ioctl(wl->tty, KDSKBMUTE, 1) &&
-- ioctl(wl->tty, KDSKBMODE, K_OFF))
-- error(1, errno, "failed to set K_OFF keyboard mode: %m\n");
-+ ioctl(wl->tty, KDSKBMODE, K_OFF)) {
-+ err(errno, "failed to set K_OFF keyboard mode: %m\n");
-+ exit(1);
-+ }
-
-- if (ioctl(wl->tty, KDSETMODE, KD_GRAPHICS))
-- error(1, errno, "failed to set KD_GRAPHICS mode on tty: %m\n");
-+ if (ioctl(wl->tty, KDSETMODE, KD_GRAPHICS)) {
-+ err(errno, "failed to set KD_GRAPHICS mode on tty: %m\n");
-+ exit(1);
-+ }
-
- mode.mode = VT_PROCESS;
- mode.relsig = SIGUSR1;
- mode.acqsig = SIGUSR2;
-- if (ioctl(wl->tty, VT_SETMODE, &mode) < 0)
-- error(1, errno, "failed to take control of vt handling\n");
-+ if (ioctl(wl->tty, VT_SETMODE, &mode) < 0) {
-+ err(errno, "failed to take control of vt handling\n");
-+ exit(1);
-+ }
-
- return 0;
- }
-@@ -585,10 +609,14 @@
- int i;
-
- if (wl->tty != STDIN_FILENO) {
-- if (setsid() < 0)
-- error(1, errno, "setsid failed");
-- if (ioctl(wl->tty, TIOCSCTTY, 0) < 0)
-- error(1, errno, "TIOCSCTTY failed - tty is in use");
-+ if (setsid() < 0) {
-+ err(errno, "setsid failed");
-+ exit(1);
-+ }
-+ if (ioctl(wl->tty, TIOCSCTTY, 0) < 0) {
-+ err(errno, "TIOCSCTTY failed - tty is in use");
-+ exit(1);
-+ }
- }
-
- term = getenv("TERM");
-@@ -604,7 +632,7 @@
- if (env) {
- for (i = 0; env[i]; ++i) {
- if (putenv(env[i]) != 0)
-- error(0, 0, "putenv %s failed", env[i]);
-+ err(0, "putenv %s failed", env[i]);
- }
- free(env);
- }
-@@ -617,8 +645,10 @@
- #ifdef HAVE_INITGROUPS
- initgroups(wl->pw->pw_name, wl->pw->pw_gid) < 0 ||
- #endif
-- setuid(wl->pw->pw_uid) < 0)
-- error(1, errno, "dropping privileges failed");
-+ setuid(wl->pw->pw_uid) < 0) {
-+ err(errno, "dropping privileges failed");
-+ exit(1);
-+ }
- }
-
- static void
-@@ -658,7 +688,8 @@
- child_argv[5 + i] = NULL;
-
- execv(child_argv[0], child_argv);
-- error(1, errno, "exec failed");
-+ err(errno, "exec failed");
-+ exit(1);
- }
-
- static void
-@@ -691,8 +722,10 @@
- switch (c) {
- case 'u':
- wl.new_user = optarg;
-- if (getuid() != 0)
-- error(1, 0, "Permission denied. -u allowed for
root only");
-+ if (getuid() != 0) {
-+ err(0, "Permission denied. -u allowed for root
only");
-+ exit(1);
-+ }
- break;
- case 't':
- tty = optarg;
-@@ -706,24 +739,30 @@
- }
- }
-
-- if ((argc - optind) > (MAX_ARGV_SIZE - 6))
-- error(1, E2BIG, "Too many arguments to pass to weston");
-+ if ((argc - optind) > (MAX_ARGV_SIZE - 6)) {
-+ err(E2BIG, "Too many arguments to pass to weston");
-+ exit(1);
-+ }
-
- if (wl.new_user)
- wl.pw = getpwnam(wl.new_user);
- else
- wl.pw = getpwuid(getuid());
-- if (wl.pw == NULL)
-- error(1, errno, "failed to get username");
-+ if (wl.pw == NULL) {
-+ err(errno, "failed to get username");
-+ exit(1);
-+ }
-
-- if (!weston_launch_allowed(&wl))
-- error(1, 0, "Permission denied. You should either:\n"
-+ if (!weston_launch_allowed(&wl)) {
-+ err(0, "Permission denied. You should either:\n"
- #ifdef HAVE_SYSTEMD_LOGIN
- " - run from an active and local (systemd) session.\n"
- #else
- " - enable systemd session support for weston-launch.\n"
- #endif
- " - or add yourself to the 'weston-launch' group.");
-+ exit(1);
-+ }
-
- if (setup_tty(&wl, tty) < 0)
- exit(EXIT_FAILURE);
-@@ -738,8 +777,10 @@
- exit(EXIT_FAILURE);
-
- wl.child = fork();
-- if (wl.child == -1)
-- error(EXIT_FAILURE, errno, "fork failed");
-+ if (wl.child == -1) {
-+ err(errno, "fork failed");
-+ exit(EXIT_FAILURE);
-+ }
-
- if (wl.child == 0)
- launch_compositor(&wl, argc - optind, argv + optind);
-@@ -759,7 +800,7 @@
-
- n = poll(fds, 2, -1);
- if (n < 0)
-- error(0, errno, "poll failed");
-+ err(errno, "poll failed");
- if (fds[0].revents & POLLIN)
- handle_socket_msg(&wl);
- if (fds[1].revents)
+diff -Naur weston-1.11.0.orig/src/error.h weston-1.11.0/src/error.h
+--- weston-1.11.0.orig/src/error.h 1969-12-31 16:00:00.000000000 -0800
++++ weston-1.11.0/src/error.h 2017-03-05 16:37:51.441046969 -0800
+@@ -0,0 +1,27 @@
++#ifndef _ERROR_H_
++#define _ERROR_H_
++
++#include <stdarg.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++
++static unsigned int error_message_count = 0;
++
++static inline void error(int status, int errnum, const char* format, ...)
++{
++ va_list ap;
++ fprintf(stderr, "%s: ", program_invocation_name);
++ va_start(ap, format);
++ vfprintf(stderr, format, ap);
++ va_end(ap);
++ if (errnum)
++ fprintf(stderr, ": %s", strerror(errnum));
++ fprintf(stderr, "\n");
++ error_message_count++;
++ if (status)
++ exit(status);
++}
++
++#endif /* _ERROR_H_ */
diff --git a/dev-libs/weston/weston-1.11.0.ebuild
b/dev-libs/weston/weston-1.11.0.ebuild
index 8af796a..19a648d 100644
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ b/dev-libs/weston/weston-1.11.0.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
@@ -28,8 +27,7 @@ fi
LICENSE="MIT CC-BY-SA-3.0"
SLOT="0"
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_v4l"
-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}"
+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"
REQUIRED_USE="
drm? ( gles2 )
@@ -135,10 +133,10 @@ src_configure() {
$(use_enable systemd systemd-notify) \
$(use_enable xwayland) \
$(use_enable xwayland xwayland-test) \
- $(use_enable video_cards_intel simple-dmabuf-intel-client) \
- $(use_enable video_cards_v4l simple-dmabuf-v4l-client) \
$(use_with jpeg) \
$(use_with webp) \
+ --disable-simple-dmabuf-intel-client \
+ --disable-simple-dmabuf-v4l-client \
${myconf}
}
