<html> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> </head> <body text="#000000" bgcolor="#FFFFFF"> <div class="moz-cite-prefix">On 02/29/2016 04:39 PM, Fabio Fantoni wrote: </div> <blockquote cite="mid:56D4664F.5050408@m2r.biz" type="cite"> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> Il 29/02/2016 16:01, Yury Shvedov ha scritto: <blockquote cite="mid:56D45D54.4010504@lvk.cs.msu.su" type="cite"> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> Unfortunately, it is bit complex for me, to understand what are you trying to do and why do you dancing with diff's instead of just simple merge. </blockquote> Sorry for my bad english. </blockquote> Don't worry, your English is pretty good. Not worse then my =). You didn't fully explain what are you trying to do. Can you? <blockquote cite="mid:56D4664F.5050408@m2r.biz" type="cite"> As you not rebase all your commits on top is difficult find all your changes from upstream, so I did a quick diff from your branch to the last upstream commit corresponding. </blockquote> git diff master spice will show you all the changes. <blockquote cite="mid:56D4664F.5050408@m2r.biz" type="cite"> Usually I keep do rebase of my patches (with git rebase -i) and other patches in development to test always queued to upstream commits to make it easier and faster update them, have it ready to post upstream for review any version and add the new upstream commits until my patches are accepted upstream. For example: <a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://github.com/Fantu/Xen/commits/rebase/m2r-testing-4.6">https://github.com/Fantu/Xen/commits/rebase/m2r-testing-4.6</a> Probably will be good also for your project (I can do it in newer branch). </blockquote> I don't suppose myself the master of git but in my opinion using git rebase is a bad practice: <ul> <li>rebase can rewrite the history. It can take the part of chain and move fully in another place. While merge doesn't changes history. It simply creates new commit on top of two branches</li> <li>with rebase in case of conflict you have to resolve them in many commits, while with merge you need to resolve conflict once at the top</li> <li>sometimes you need to perform code changing while action. In rebase you have to do it in several commits, while with merge - only in one</li> <li>rolling back the rebase could be really painful </li> <li>I already had problems with rebase, so now I use it only when it is realy needed and when I can't use merge (never). </li> </ul> <blockquote cite="mid:56D4664F.5050408@m2r.biz" type="cite"> Look other answer/questions below please. <blockquote cite="mid:56D45D54.4010504@lvk.cs.msu.su" type="cite"> Anyway, I gave you an edit-access to my repository. If you want, you can work with it directly on your own branch. I hope, this will make things simpler for you. See answers in quote. <div class="moz-cite-prefix">On 02/29/2016 03:32 PM, Fabio Fantoni wrote: </div> <blockquote cite="mid:56D45660.60101@m2r.biz" type="cite"> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> Il 29/02/2016 12:26, Yury Shvedov ha scritto: <blockquote cite="mid:56D42AE1.3030003@lvk.cs.msu.su" type="cite">Hi, Fabio! Take look at my latest commit It now merged with latest master version and successfully compiles with ./configure --enable-spice-compositor. But unfortunately it doesn't work due to new spice API. I hope, this evening it will!. </blockquote> Thanks for your work about it. I make the new diff in other test branch: <a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://github.com/Fantu/compositor-spice/tree/test2">https://github.com/Fantu/compositor-spice/tree/test2</a> And I have some questions: <meta name="qrichtext" content="1"> - src/Makefile.am was removed in newer weston and now unused, I suppose to be removed </blockquote> Did I fogot to do it in my repo? Oh yes! My bad! I will! <blockquote cite="mid:56D45660.60101@m2r.biz" type="cite"> - Makefile.am missed monitor renderer additions, must be added or monitor renderer is not needed anymore? </blockquote> Its doesn't used by spice, so if there no monitor renderer additions in original weston repo, then it is not needed anymore. </blockquote> Monitor renderer seems something added by you with this project: <a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://github.com/ein-shved/compositor-spice/commit/72072ed2671dd400068d48b4f5048855fb066938">https://github.com/ein-shved/compositor-spice/commit/72072ed2671dd400068d48b4f5048855fb066938</a> There isn't a commit description about, I not understand if it something additional for sharing monitor like a new weston plugin I saw (screen sharing) or it is different and required for spice compositor. Can you do a small little explanation if possible please? </blockquote> Ouch! I remembered now! I developed this instrument to spy on wayland clients in developing purposes. I shell move its code to another branch. <blockquote cite="mid:56D4664F.5050408@m2r.biz" type="cite"> <blockquote cite="mid:56D45D54.4010504@lvk.cs.msu.su" type="cite"> <blockquote cite="mid:56D45660.60101@m2r.biz" type="cite"> - src/compositor-rdp.c: I suppose is not needed and not related changes to be removed, right? </blockquote> Why? It is just another part of weston. If you don't need it just don't pass --enable-rd-compositor to configure. </blockquote> I talked only about few lines changed by one of your commit. </blockquote> Sorry for misunderstanding. Will take a look. <blockquote cite="mid:56D4664F.5050408@m2r.biz" type="cite"> <blockquote cite="mid:56D45D54.4010504@lvk.cs.msu.su" type="cite"> <blockquote cite="mid:56D45660.60101@m2r.biz" type="cite"> - src/spice/Makefile.am: I suppose is unused now that thing are added in Makefile.am, to be removed, right? </blockquote> Yes, the same as src/Makefile.am <blockquote cite="mid:56D45660.60101@m2r.biz" type="cite"> Can be the monitor renderer missed/incomplete the cause of "run test" failed? </blockquote> I didn't try tests, so can't answer. Will look at evening. <blockquote cite="mid:56D45660.60101@m2r.biz" type="cite"> About spice-server api I did't found good docs to make update simply and fast but with a fast search I found this xspice (similar project for xorg instead) commit that probably can be faster update some deprecrated spice functions: <a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=70884bd353c34c0be23c2b21eec320cd8c637f4f">https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=70884bd353c34c0be23c2b21eec320cd8c637f4f</a> I don't have sufficent free time for try to change it and test build/use today. </blockquote> I spend much time for reading spice source code to understand its API far in 2013. To understand it you have to read sources as I. I remember that in fact spice protocol is - to say simple - drawing API. You can draw stuff from spice-server on spice-client's screen. Anyway we need to learn new api, reading example source code as I did. I did simple <a moz-do-not-send="true" href="https://github.com/ein-shved/qxl-test">example</a> then to practice on spice API. <blockquote cite="mid:56D45660.60101@m2r.biz" type="cite"> After update to newer api I suppose will be good add also a required spice-server version check in configure based on newer api, I found this that seems will make fast see at what version was added any api: <a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://cgit.freedesktop.org/spice/spice/tree/server/spice-server.syms">https://cgit.freedesktop.org/spice/spice/tree/server/spice-server.syms</a> </blockquote> Yes of course we will! <blockquote cite="mid:56D45660.60101@m2r.biz" type="cite"> Another important note if you don't know it, spice-server recently is under heavy changes, latest version (0.13.0) is like a "devel snapshot". Latest stable version that I think is good to use also with this project for now is 0.12.6. </blockquote> Yes, I don't. Is it possible for you to assemble all documents and links on this topic, you found? <blockquote cite="mid:56D45660.60101@m2r.biz" type="cite"> Thanks for any reply and sorry for my bad english.  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <style type="text/css"> p, li { white-space: pre-wrap; } </style> <blockquote cite="mid:56D42AE1.3030003@lvk.cs.msu.su" type="cite"> On 02/29/2016 12:22 PM, Daniel Stone wrote: <blockquote type="cite">Hi Fabio, On 27 February 2016 at 18:02, Fabio Fantoni <a moz-do-not-send="true" class="moz-txt-link-rfc2396E" href="mailto:fabio.fantoni@m2r.biz"><a class="moz-txt-link-rfc2396E" href="mailto:fabio.fantoni@m2r.biz"><fabio.fantoni@m2r.biz></a></a> wrote: <blockquote type="cite">Hi, long time ago I saw an interesting project for weston, the spice compositor: <a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://github.com/ein-shved/compositor-spice">https://github.com/ein-shved/compositor-spice</a> It is now abandoned because the developer has been involved in another project. As no other has continued it, despite my low knowledge and time I would try to update, test and possibly improve it. </blockquote> Great! <blockquote type="cite">I did a new branch with only 2 commit on top of latest upstream commit: <a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://github.com/Fantu/compositor-spice/commits/test">https://github.com/Fantu/compositor-spice/commits/test</a> and I tried to do a fast rebase on latest upstream commit (1.10) instead of master (development branch) for decrease the risk regression on first build/use tests: <a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://github.com/Fantu/compositor-spice/commits/rebase/spice-1.10">https://github.com/Fantu/compositor-spice/commits/rebase/spice-1.10</a> Solving conflict about configure and makefile parts I have some doubts (as also reported in the description of each commit): About first commit (Add Spice compositor) <a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://github.com/Fantu/compositor-spice/commit/f589ab264e80d43fa0853770481b6ddcadf5505b">https://github.com/Fantu/compositor-spice/commit/f589ab264e80d43fa0853770481b6ddcadf5505b</a> - in configure.ac some changes seems strange, including LIBS and CFLAGS that seems "double" </blockquote> I think this can be removed. Usually setting LIBS/CFLAGS and foo_save_LIBS/foo_save_CFLAGS is used for an AC_CHECK_* call, which relies on LIBS and CFLAGS already being set. I guess there may have been a call here which has since been removed. <blockquote type="cite">About the second commit (Monitor renderer) <a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://github.com/Fantu/compositor-spice/commit/2632b8b8067e46ac69b5ad1bc2164d90ced5e19f">https://github.com/Fantu/compositor-spice/commit/2632b8b8067e46ac69b5ad1bc2164d90ced5e19f</a> - Makefile things seems fully changed, tried to adapt them but I'm not sure if I did it correct. - Add -g to AM_CPPFLAGS in Makefile.am is really needed? not added for now </blockquote> No, this is a debugging feature only. <blockquote type="cite">- add of "-Wl,--wrap=pixman_renderer_init" to LDFLAGS of many other backend is really needed? not added for now, if needed is good understand why to add it also to new things added since this start commit done 3 years ago </blockquote> This should be solved in a different way if required. <blockquote type="cite">- src/compositor-rdp.c changes is really needed? if not I'll remove them I also searched documentation about api and/or internal weston functions changed any versions but I not found them. </blockquote> There is no documentation on the change, no. As you can see, several functions have changed: - weston_output_finish_frame now takes a struct timespec rather than an integer number of milliseconds (trivial conversion) - the output repaint function now returns an integer marking success or failure - the compositor interface has now changed to weston_backend, and you can see examples of the changes required in commit 954f183e Hope this helps: just pick out the warnings and errors one by one, and try to figure them out - searching git commits for anything relevant always helps - until you get something that builds. Cheers, Daniel </blockquote> -- Kind Regards, Yury Shvedov </blockquote> </blockquote> <div class="moz-signature">-- Kind Regards, Yury Shvedov </div> </blockquote> </blockquote> <pre class="moz-signature" cols="72">-- Kind Regards, Yury Shvedov </pre> </body> </html>