<div dir="ltr"><div><div><div>Hi,<br><br></div>This patch doesn't apply to me. Even with 3-way merge:<br><br>Applying: compositor: Document options for headless compositor<br>fatal: sha1 information is lacking or useless (src/compositor.c).<br>Repository lacks necessary blobs to fall back on 3-way merge.<br>Cannot fall back to three-way merge.<br><br></div><div>The last patch does not apply as well.<br></div><div><br></div>I tried it even with clean repository.<br></div><div>Could you please try it with a clean repository and rebase if you'll get the error too?<br><br></div><div>Thanks,<br></div>Marek<br><div><div><div><br></div></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On 9 November 2014 22:41, Bryce Harrington <span dir="ltr"><<a href="mailto:bryce@osg.samsung.com" target="_blank">bryce@osg.samsung.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Bryce Harrington <<a href="mailto:bryce@osg.samsung.com">bryce@osg.samsung.com</a>><br>
---<br>
src/compositor.c | 10 ++++++++++<br>
1 file changed, 10 insertions(+)<br>
<br>
diff --git a/src/compositor.c b/src/compositor.c<br>
index cbc814b..019d256 100644<br>
--- a/src/compositor.c<br>
+++ b/src/compositor.c<br>
@@ -4556,6 +4556,16 @@ usage(int error_code)<br>
"\n");<br>
#endif<br>
<br>
+#if defined(BUILD_HEADLESS_COMPOSITOR)<br>
+ fprintf(stderr,<br>
+ "Options for headless-backend.so:\n\n"<br>
+ " --width=WIDTH\t\tWidth of Wayland surface\n"<br>
+ " --height=HEIGHT\tHeight of Wayland surface\n"<br>
+ " --transform=TR\tThe output transformation, TR is one of:\n"<br>
+ "\tnormal 90 180 270 flipped flipped-90 flipped-180 flipped-270\n"<br>
+ " --use-pixman\t\tUse the pixman (CPU) renderer\n\n");<br>
+#endif<br>
+<br>
exit(error_code);<br>
}<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.9.1<br>
<br>
_______________________________________________<br>
wayland-devel mailing list<br>
<a href="mailto:wayland-devel@lists.freedesktop.org">wayland-devel@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/wayland-devel" target="_blank">http://lists.freedesktop.org/mailman/listinfo/wayland-devel</a><br>
</font></span></blockquote></div><br></div>