[PATCH weston v0 07/11] compositor: Document options for headless compositor

[Marek Chalupa]

Hi,

This patch doesn't apply to me. Even with 3-way merge:

Applying: compositor: Document options for headless compositor
fatal: sha1 information is lacking or useless (src/compositor.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.

The last patch does not apply as well.

I tried it even with clean repository.
Could you please try it with a clean repository and rebase if you'll get
the error too?

Thanks,
Marek


On 9 November 2014 22:41, Bryce Harrington <bryce at osg.samsung.com> wrote:

> Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
> ---
>  src/compositor.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/src/compositor.c b/src/compositor.c
> index cbc814b..019d256 100644
> --- a/src/compositor.c
> +++ b/src/compositor.c
> @@ -4556,6 +4556,16 @@ usage(int error_code)
>         "\n");
>  #endif
>
> +#if defined(BUILD_HEADLESS_COMPOSITOR)
> +       fprintf(stderr,
> +               "Options for headless-backend.so:\n\n"
> +               "  --width=WIDTH\t\tWidth of Wayland surface\n"
> +               "  --height=HEIGHT\tHeight of Wayland surface\n"
> +               "  --transform=TR\tThe output transformation, TR is one
> of:\n"
> +               "\tnormal 90 180 270 flipped flipped-90 flipped-180
> flipped-270\n"
> +               "  --use-pixman\t\tUse the pixman (CPU) renderer\n\n");
> +#endif
> +
>         exit(error_code);
>  }
>
> --
> 1.9.1
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20141119/1806fb8a/attachment.html>