Upgrade to pyro

[AGL/meta-agl.git] / meta-agl / recipes-graphics / wayland / weston / 0001-Allow-regular-users-to-launch-Weston_2.0.0.patch

diff --git a/meta-agl/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston.patch b/meta-agl/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston_2.0.0.patch
similarity index 62%
rename from meta-agl/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston.patch
rename to meta-agl/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston_2.0.0.patch
index 7b84a67..bd1a72b 100644 (file)
--- a/meta-agl/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston.patch
+++ b/meta-agl/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston_2.0.0.patch
@@ -1,20 +1,20 @@
-From f5555b045a64231d4beaba51cbbf5f5485173900 Mon Sep 17 00:00:00 2001
+From 6c145cea35f0b77613d6e3f48679c976b9839d7c Mon Sep 17 00:00:00 2001
 From: Ronan Le Martret <ronan.lemartret@iot.bzh>
-Date: Fri, 14 Apr 2017 19:04:32 +0200
+Date: Wed, 31 May 2017 22:48:18 +0000
 Subject: [PATCH] Allow regular users to launch Weston
 
 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
 ---
- configure.ac          | 6 ++++++
- src/launcher-direct.c | 2 ++
+ configure.ac                | 6 ++++++
+ libweston/launcher-direct.c | 2 ++
  2 files changed, 8 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 1d11864..4e48d52 100644
+index 7e84c14..8b3e17e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -131,6 +131,12 @@ if test x$enable_xkbcommon = xyes; then
-       COMPOSITOR_MODULES="$COMPOSITOR_MODULES xkbcommon >= 0.3.0"
+@@ -155,6 +155,12 @@ if test x$enable_xkbcommon = xyes; then
+                           true)
  fi
  
 +AC_ARG_ENABLE(sys-uid, [  --enable-sys-uid],,
@@ -26,11 +26,11 @@ index 1d11864..4e48d52 100644
  AC_ARG_ENABLE(setuid-install, [  --enable-setuid-install],,
              enable_setuid_install=yes)
  AM_CONDITIONAL(ENABLE_SETUID_INSTALL, test x$enable_setuid_install = xyes)
-diff --git a/src/launcher-direct.c b/src/launcher-direct.c
-index 29d9c28..1ac6651 100644
---- a/src/launcher-direct.c
-+++ b/src/launcher-direct.c
-@@ -272,8 +272,10 @@ launcher_direct_connect(struct weston_launcher **out, struct weston_compositor *
+diff --git a/libweston/launcher-direct.c b/libweston/launcher-direct.c
+index 4fc1c3c..8f16a69 100644
+--- a/libweston/launcher-direct.c
++++ b/libweston/launcher-direct.c
+@@ -275,8 +275,10 @@ launcher_direct_connect(struct weston_launcher **out, struct weston_compositor *
  {
        struct launcher_direct *launcher;
  
@@ -42,5 +42,5 @@ index 29d9c28..1ac6651 100644
        launcher = zalloc(sizeof(*launcher));
        if (launcher == NULL)
 -- 
-2.6.6
+2.7.4