Hello Boram, On ven, 2014-07-25 at 12:46 +0000, Boram Park wrote: > Hello José > Thank you for the information. > Yesterday, we pushed our works to the "tizen" branch of x11 git > repositories.
Yes I sew this few hours ago while checking differences between our respective works. A side remark on the way you did it: there branches devel/x11 and tizen are now separate in place of being the same, and, we now have a branch tizen that is not accepted. The last remark is the most strange because the states of this repositories left the tizen workflow. > If you have your own patches for above git repositories, could you > pull below git repositories and rebase your patches on latest tizen > branch? to avoid merge conflict? > > > platform/upstream/recordproto > platform/upstream/compositeproto > platform/adaptation/xf86-input-evdevmultitouch > platform/adaptation/xf86-module-xdbg > platform/upstream/videoproto > platform/adaptation/xf86-video-emulfb > platform/upstream/xvinfo > platform/upstream/renderproto > platform/upstream/xcmiscproto > platform/upstream/xcb-proto > platform/upstream/xwud > platform/upstream/xf86bigfontproto > platform/upstream/xeyes > platform/upstream/kbproto > platform/upstream/glproto > platform/upstream/fontsproto > platform/upstream/xorg-server > platform/upstream/bigreqsproto > platform/upstream/inputproto > platform/upstream/fixesproto > platform/upstream/libXdmcp > platform/upstream/xextproto > platform/upstream/scrnsaverproto > platform/upstream/resourceproto > platform/upstream/xf86vidmodeproto > platform/upstream/bdftopcf > platform/upstream/damageproto > platform/upstream/xf86dgaproto > platform/upstream/libXfont > platform/upstream/xev > platform/upstream/xkill > platform/upstream/xwininfo > platform/upstream/xtrans > platform/upstream/xwd > platform/upstream/libXau > platform/upstream/xineramaproto > platform/upstream/randrproto > platform/adaptation/xf86-input-gesture > I already stated that job. In most cases nothing have to be done: the tizen branch is just okay. I'll finalise it this afternoon. Then we have to determine how to re-catch the tizen workflow. I will be in vacation for 3 weeks from this evening. So I'll try to finish it and send you a report. > > And I saw "sandbox/jobol/devel" branch in mesa git repository. > > e9277ec6e74c43ea07697fe2059dbe5c8bf61439 packaging: Re-enable X11 > compiling > > > Is this your patch? Actually, I made a patch on "devel/x11" branch of > mesa to solve build issue. But I'm not sure it's correct or not. Yes its mine. And also the one we are using to compile. > Maybe I can use your patch to solve gl issue for arm-x11 repo. Let try. > And about rebase xorg-server to 1.16... Did you already rebase > xorg-server? Were there any merge issues when you rebased it? > > Because the "platform/upstream/xorg-server" repository has many > samsung patches in it, it can be a little bit hard to rebase it. I tried to do a rebase. I stopped because I had not easy result and an other priority. Yes it is not obvious. > If you don't rebase it yet, and If upgrading xorg-server is > not neccessary for your integration work to be done, our team can > rebase xorg-server to 1.16 after finishing integration work. > > We want to be very careful in case of xorg-server becuase it containes > many our important patches. I agree. Please do it. > > BTW, I also hope keep in touch each other with this dev mailist. > Best regards José > > > Regards > > Boram > > > > ------- Original Message ------- > > Sender : Jos� Bollo<[email protected]> > > Date : 2014-07-24 20:08 (GMT+09:00) > > Title : Re: [Dev] Common/X11 schedule > > > > Hello Boram, > > Sorry for this late answer. > > On gio, 2014-07-24 at 04:36 +0000, Boram Park wrote: > > Hello José > > > > > > > > Could you give me the more information of integration work? > > > > For example, if exists... > > > > - staging project > > On our local OBS because access rights! > Only x86(_64) builds > > > > > - branch name > > No normalisation, using sandboxs and HASH. > > > > > - git repositories > > > > - package list which you add to Tizen:Common > > Both can be found in the file > https://github.com/eurogiciel-oss/tizen-upstream-sync/blob/master/Tizen/Common/x11/manifest_fix.xml > > For Common, we tried to insert a minimal set. > > > - etc > > Currently our team is also trying to enable x11 for Tizen:Common. > > We currently have a build version that we still have to check. > Our schedule: > * build the image > * test the image > * to sync the repo that are temporarily on github to tizen.org > * push to tizen Common and reactivate x11 repos > > We are expecting to have finalized these tasks next week. > > > In our case, > > > > - we created "devel:x11:common" staging project on OBS. > > Yes I know. > You seem near to the success. The current build errors are mainly > coming > from Common problems. > > > - we uploaded all x11 pakcages to this staging project. > > > > - we are now trying to fix build errors for all pkgs for "arm-x11" > > repository by modifying spec files on "devel/x11" branch. > > We have to check what conflicts are existing. We will send you a > report. > > > - after fix all build errors, we are going to merge "devel/x11" > branch > > into "tizen" branch and send SRs. > > On some packages, we bumped the version. When bumping version, the > merge > strategy is not possible. > > > > > I concern that there could be a conflict between your work and our > > work. > > You are right. I propose to remain in contact. Staying also in the dev > mailist is good, IMHO. > > Best regards > José > > > > > Regards > > > > Boram > > > > > > > > ------- Original Message ------- > > > > Sender : Jos� Bollo > > > > Date : 2014-07-22 21:47 (GMT+09:00) > > > > Title : [Dev] Common/X11 schedule > > > > > > > > Hi all, > > > > We are currently working on the integration of X11 to Tizen:Common. > We > > intend to provide at least arm/x11 build (and x86_64/x11 for > testing). > > The repositories exist already on the OBS but we will unable them > only > > when we will be ready, probably this week. > > > > For the first step, we will focus on ARM/X11 and we dont intend to > > include Crosswalk or enlightenment. These inclusions will come > later, > > driven by their respective teams when the bases of X11 will be > ready. > > > > For the second step, we will rebase X server to its latest 1.16 > > version. > > > > Best regards > > José Bollo > > > > > > _______________________________________________ > > Dev mailing list > > [email protected] > > https://lists.tizen.org/listinfo/dev > > > > > > > > > > ------------------------------------------ > > > > Boram Park > > > > Senior engineer > > > > SAMSUNG ELECTRONICS CO.,LTD > > > > E-Mail : [email protected] > > > > > > > > > > > > > > > > > > > > > ------------------------------------------ > > Boram Park > > Senior engineer > > SAMSUNG ELECTRONICS CO.,LTD > > E-Mail : [email protected] > > > > > > > _______________________________________________ Dev mailing list [email protected] https://lists.tizen.org/listinfo/dev
