weston: refresh patch files to resolve hunks

Refresh patches in this layer so they could be cleanly applied, this has
been done via devtool.

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>

diff --git a/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/recipes-graphics/wayland/weston/0001-make-error-portable.patch
index c15e6928ed0ebccc9c549618af370bf1e37bf73e..4132d87130c7308668bd101ba9d6825843628d2a 100644 (file)
--- a/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ b/recipes-graphics/wayland/weston/0001-make-error-portable.patch
@@ -1,4 +1,4 @@
-From 6ef33e86557c59b31c9b731c0360ec1d404cc801 Mon Sep 17 00:00:00 2001
+From 74469d3a5965560a83f1d51c50d3cd1fa4e96fe6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 29 May 2015 20:56:00 -0700
 Subject: [PATCH] make error() portable
@@ -18,12 +18,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  create mode 100644 libweston/weston-error.h
 
 diff --git a/configure.ac b/configure.ac
-index 9d98e84..8f6b80d 100644
+index cdd0a87f..2396cba5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -109,6 +109,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
+@@ -126,6 +126,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
+             [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile weston")],
              [[#include <time.h>]])
- AC_CHECK_HEADERS([execinfo.h])
  
 +AC_CHECK_HEADERS([error.h])
 +
@@ -32,7 +32,7 @@ index 9d98e84..8f6b80d 100644
  # check for libdrm as a build-time dependency only
 diff --git a/libweston/weston-error.h b/libweston/weston-error.h
 new file mode 100644
-index 0000000..2089d02
+index 00000000..2089d02c
 --- /dev/null
 +++ b/libweston/weston-error.h
 @@ -0,0 +1,20 @@
@@ -57,7 +57,7 @@ index 0000000..2089d02
 +#endif
 +
 diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index bf73e0d..9064439 100644
+index dff83cca..bd0015e6 100644
 --- a/libweston/weston-launch.c
 +++ b/libweston/weston-launch.c
 @@ -33,7 +33,6 @@

diff --git a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
index 3e4e772b8f6f1045ab59714de98cc36305559fff..70f9fbd2339491f525305a1538e2abf6cbdd54b6 100644 (file)
--- a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -1,7 +1,8 @@
-From d5fb8567868866665502106def90017243a968a8 Mon Sep 17 00:00:00 2001
+From 124cdabedd4aa0836480942537f6eea67347e80e Mon Sep 17 00:00:00 2001
 From: Tom Hochstein <tom.hochstein@nxp.com>
 Date: Wed, 22 Feb 2017 15:53:30 +0200
-Subject: [PATCH] weston-launch: Provide a default version that doesn't require PAM
+Subject: [PATCH] weston-launch: Provide a default version that doesn't require
+ PAM
 
 weston-launch requires PAM for starting weston as a non-root user.
 
@@ -21,10 +22,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
  2 files changed, 27 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 8f6b80d..603fcb3 100644
+index 2396cba5..1f1242bb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -494,13 +494,17 @@ AC_ARG_ENABLE(resize-optimization,
+@@ -539,13 +539,17 @@ AC_ARG_ENABLE(resize-optimization,
  AS_IF([test "x$enable_resize_optimization" = "xyes"],
        [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
  
@@ -44,7 +45,7 @@ index 8f6b80d..603fcb3 100644
  fi
  
  AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
-@@ -748,6 +752,7 @@ AC_MSG_RESULT([
+@@ -794,6 +798,7 @@ AC_MSG_RESULT([
        Enable developer documentation  ${enable_devdocs}
  
        weston-launch utility           ${enable_weston_launch}
@@ -53,7 +54,7 @@ index 8f6b80d..603fcb3 100644
        systemd notify support          ${enable_systemd_notify}
  
 diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index 9064439..c6abe92 100644
+index bd0015e6..706b80fd 100644
 --- a/libweston/weston-launch.c
 +++ b/libweston/weston-launch.c
 @@ -51,7 +51,9 @@
@@ -77,7 +78,7 @@ index 9064439..c6abe92 100644
        int tty;
        int ttynr;
        int sock[2];
-@@ -191,6 +195,7 @@ weston_launch_allowed(struct weston_launch *wl)
+@@ -193,6 +197,7 @@ weston_launch_allowed(struct weston_launch *wl)
        return false;
  }
  
@@ -85,7 +86,7 @@ index 9064439..c6abe92 100644
  static int
  pam_conversation_fn(int msg_count,
                    const struct pam_message **messages,
-@@ -231,6 +236,7 @@ setup_pam(struct weston_launch *wl)
+@@ -233,6 +238,7 @@ setup_pam(struct weston_launch *wl)
  
        return 0;
  }
@@ -93,7 +94,7 @@ index 9064439..c6abe92 100644
  
  static int
  setup_launcher_socket(struct weston_launch *wl)
-@@ -424,6 +430,7 @@ quit(struct weston_launch *wl, int status)
+@@ -426,6 +432,7 @@ quit(struct weston_launch *wl, int status)
        close(wl->signalfd);
        close(wl->sock[0]);
  
@@ -101,7 +102,7 @@ index 9064439..c6abe92 100644
        if (wl->new_user) {
                err = pam_close_session(wl->ph, 0);
                if (err)
-@@ -431,6 +438,7 @@ quit(struct weston_launch *wl, int status)
+@@ -433,6 +440,7 @@ quit(struct weston_launch *wl, int status)
                                err, pam_strerror(wl->ph, err));
                pam_end(wl->ph, err);
        }
@@ -109,7 +110,7 @@ index 9064439..c6abe92 100644
  
        if (ioctl(wl->tty, KDSKBMUTE, 0) &&
            ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-@@ -610,6 +618,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+@@ -614,6 +622,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
        setenv("HOME", wl->pw->pw_dir, 1);
        setenv("SHELL", wl->pw->pw_shell, 1);
  
@@ -117,7 +118,7 @@ index 9064439..c6abe92 100644
        env = pam_getenvlist(wl->ph);
        if (env) {
                for (i = 0; env[i]; ++i) {
-@@ -618,6 +627,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+@@ -622,6 +631,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
                }
                free(env);
        }
@@ -125,7 +126,7 @@ index 9064439..c6abe92 100644
  
        /*
         * We open a new session, so it makes sense
-@@ -685,8 +695,10 @@ static void
+@@ -689,8 +699,10 @@ static void
  help(const char *name)
  {
        fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
@@ -136,7 +137,7 @@ index 9064439..c6abe92 100644
        fprintf(stderr, "  -t, --tty       Start session on alternative tty,\n"
                        "                  e.g. -t /dev/tty4, requires -u option.\n");
        fprintf(stderr, "  -v, --verbose   Be verbose\n");
-@@ -700,7 +712,9 @@ main(int argc, char *argv[])
+@@ -704,7 +716,9 @@ main(int argc, char *argv[])
        int i, c;
        char *tty = NULL;
        struct option opts[] = {
@@ -146,7 +147,7 @@ index 9064439..c6abe92 100644
                { "tty",     required_argument, NULL, 't' },
                { "verbose", no_argument,       NULL, 'v' },
                { "help",    no_argument,       NULL, 'h' },
-@@ -712,9 +726,13 @@ main(int argc, char *argv[])
+@@ -716,9 +730,13 @@ main(int argc, char *argv[])
        while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
                switch (c) {
                case 'u':
@@ -160,7 +161,7 @@ index 9064439..c6abe92 100644
                        break;
                case 't':
                        tty = optarg;
-@@ -755,8 +773,10 @@ main(int argc, char *argv[])
+@@ -759,8 +777,10 @@ main(int argc, char *argv[])
        if (setup_tty(&wl, tty) < 0)
                exit(EXIT_FAILURE);
  

diff --git a/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch b/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch
index 7ea07ed6427ef426f81e4e33241f08045a7af746..46c6ec174678228414dc79469965ee5bb8c9f962 100644 (file)
--- a/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch
+++ b/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch
@@ -1,4 +1,4 @@
-From 46843c8681ddafbea6f491b7af4de6529e93f5bd Mon Sep 17 00:00:00 2001
+From 1e848706739d3155e7cec07bf5af6ff4c3ff810c Mon Sep 17 00:00:00 2001
 From: Jun Zhu <junzhu@nxp.com>
 Date: Sun, 30 Sep 2018 15:31:26 +0800
 Subject: [PATCH] weston-touch-calibrator: Advertise the touchscreen calibrator
@@ -15,12 +15,12 @@ Signed-off-by: Jun Zhu <junzhu@nxp.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/weston.ini.in b/weston.ini.in
-index 83dd56e..6e20e11 100644
+index aa8666e1..9e8bde4d 100644
 --- a/weston.ini.in
 +++ b/weston.ini.in
-@@ -3,6 +3,9 @@
- idle-time=0
- #use-g2d=1
+@@ -8,6 +8,9 @@ idle-time=0
+ #[shell]
+ #size=1920x1080
  
 +[libinput]
 +touchscreen_calibrator=true