d548cc3d52
* weston: upgrade to 3.0.0 * removed no_0hz_refresh_rate patch, as this is upstreamed now * fix regression in compositor-fbdev * weston: compile with weston-launch enabled The following patch is required in order to replace GNU's error() https://lists.freedesktop.org/archives/wayland-devel/2016-September/031179.html
40 lines
791 B
Diff
40 lines
791 B
Diff
diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
|
|
index 140fde1..84f7d60 100644
|
|
--- a/libweston/weston-launch.c
|
|
+++ b/libweston/weston-launch.c
|
|
@@ -33,7 +33,6 @@
|
|
#include <poll.h>
|
|
#include <errno.h>
|
|
|
|
-#include <error.h>
|
|
#include <getopt.h>
|
|
|
|
#include <sys/types.h>
|
|
@@ -112,6 +111,25 @@ struct weston_launch {
|
|
|
|
union cmsg_data { unsigned char b[4]; int fd; };
|
|
|
|
+static void
|
|
+error(int status, int errnum, const char *msg, ...)
|
|
+{
|
|
+ va_list args;
|
|
+
|
|
+ fputs("weston-launch: ", stderr);
|
|
+ va_start(args, msg);
|
|
+ vfprintf(stderr, msg, args);
|
|
+ va_end(args);
|
|
+
|
|
+ if (errnum)
|
|
+ fprintf(stderr, ": %s\n", strerror(errnum));
|
|
+ else
|
|
+ fputc('\n', stderr);
|
|
+
|
|
+ if (status)
|
|
+ exit(status);
|
|
+}
|
|
+
|
|
static gid_t *
|
|
read_groups(void)
|
|
{
|
|
--
|
|
2.10.0
|