[yocto] [meta-raspberrypi][PATCH V3 2/5] userland: Add wayland support

Andrei Gherzan andrei at gherzan.ro
Wed Sep 23 15:58:39 PDT 2015


On Mon, Aug 24, 2015 at 12:51:38AM -0700, Khem Raj wrote:
> backport and fix needed patches for supporting wayland-egl
> use PACKAGECONFIG for wayland so we can add proper DEPENDS on wayland
> Fix QA warnings about dev-so
>
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  ...-applications-to-set-next-resource-handle.patch |  210 +++
>  ...ayland-Add-support-for-the-Wayland-winsys.patch | 1847 ++++++++++++++++++++
>  .../0006-wayland-Add-Wayland-example.patch         |  864 +++++++++
>  ...-wayland-egl-Add-bcm_host-to-dependencies.patch |   30 +
>  recipes-graphics/userland/userland_git.bb          |   13 +-
>  5 files changed, 2963 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-graphics/userland/userland/0004-Allow-applications-to-set-next-resource-handle.patch
>  create mode 100644 recipes-graphics/userland/userland/0005-wayland-Add-support-for-the-Wayland-winsys.patch
>  create mode 100644 recipes-graphics/userland/userland/0006-wayland-Add-Wayland-example.patch
>  create mode 100644 recipes-graphics/userland/userland/0007-wayland-egl-Add-bcm_host-to-dependencies.patch
>

Hello,

Any ideas why I encounter difficulties while applying this patch?

---
Applying: userland: Add wayland support
/home/andrei/work/raspberrypi/meta-raspberrypi/.git/rebase-apply/patch:48:
trailing whitespace.
/home/andrei/work/raspberrypi/meta-raspberrypi/.git/rebase-apply/patch:55:
trailing whitespace.
/home/andrei/work/raspberrypi/meta-raspberrypi/.git/rebase-apply/patch:64:
/home/andrei/work/raspberrypi/meta-raspberrypi/.git/rebase-apply/patch:85:
trailing whitespace.
/home/andrei/work/raspberrypi/meta-raspberrypi/.git/rebase-apply/patch:87:
trailing whitespace.  +/**HACKHACK - give us the ability to inject a
DispmanX fatal: corrupt patch at line 2943
Patch failed at 0001 userland: Add wayland support The copy of the patch
that failed is found in:
/home/andrei/work/raspberrypi/meta-raspberrypi/.git/rebase-apply/patch When
you have resolved this problem, run "git am --continue".  If you prefer to
skip this patch, run "git am --skip" instead.  To restore the original
branch and stop patching, run "git am --abort".
---

--
Andrei Gherzan



More information about the yocto mailing list