Re: patches for Darwin /MacOSX
On Thu, 05 Apr 2007 23:24:23 -0400, Yves de Champlain wrote: Le 07-04-05 à 20:29, SciFi a écrit : On Wed, 04 Apr 2007 12:56:32 -0600, Marc Aurele La France wrote: On Wed, 4 Apr 2007, Yves de Champlain wrote: I just posted many patches in bugzilla for Darwin/MacOSX. http://bugs.xfree86.org/show_bug.cgi?id=1680 http://bugs.xfree86.org/show_bug.cgi?id=1681 Some of the issues you address have already been resolved since 4.6.99.20, but I'll be going through these in the next little while. Thanks for the patches! Marc. +-- +--+ | Marc Aurele La France | work: 1-780-492-9310 | | Academic Information and| fax: 1-780-492-1729 | |Communications Technologies | email: [EMAIL PROTECTED] | | 352 General Services Building +--+ | University of Alberta | | | Edmonton, Alberta |Standard disclaimers apply | | T6G 2H1 | | | CANADA | | +-- +--+ XFree86 developer and VP. ATI driver and X server internals. Hello, We're not seeing any of these darwin changes in the CVS repo when following the directions at http://www.xfree86.org/cvs/ using the anoncvs/pserver method. I've been running the latest cvs client available at savannah.nongnu.org and much much more latest code (not Apple's backlevel stuff). We're just not seeing any of these changes coming thru a cvs up at all. These changes are not, as far as I know, in cvs. I just posted some patches in bugzilla. When some XFree86 committer review them, then maybesome will get through to cvs. If you want to try them already, fetch them from bugzilla and do the patchwork ;-) yves Thanks for replying. I did grab your patches from both bugreports and ran patch with --dry-run on them to see that some of them now fail: [...] |--- programs/Xserver/Imakefile.orig2007-04-04 00:55:28.0 -0400 |+++ programs/Xserver/Imakefile 2007-04-04 01:04:09.0 -0400 -- Patching file programs/Xserver/Imakefile using Plan A... Hunk #1 succeeded at 1603 (offset 7 lines). Hunk #2 succeeded at 1616 (offset 7 lines). Hunk #3 succeeded at 1627 (offset 7 lines). Hunk #4 succeeded at 1638 (offset 7 lines). Hunk #5 succeeded at 1646 (offset 7 lines). Hunk #6 FAILED at 1654. 1 out of 6 hunks FAILED -- saving rejects to file programs/Xserver/Imakefile.rej [...] |--- config/cf/darwin.cf.orig 2007-04-03 15:47:21.0 -0400 |+++ config/cf/darwin.cf2007-04-04 09:40:43.0 -0400 -- Patching file config/cf/darwin.cf using Plan A... Hunk #1 succeeded at 29. Hunk #2 succeeded at 107. Hunk #3 FAILED at 169. Hunk #4 succeeded at 316 (offset 18 lines). 1 out of 4 hunks FAILED -- saving rejects to file config/cf/darwin.cf.rej [...] |--- programs/Xserver/hw/darwin/darwinKeyboard.c.orig 2007-04-03 16:10:12.0 -0400 |+++ programs/Xserver/hw/darwin/darwinKeyboard.c2007-04-03 16:10:52.0 -0400 -- Patching file programs/Xserver/hw/darwin/darwinKeyboard.c using Plan A... Hunk #1 FAILED at 64. 1 out of 1 hunk FAILED -- saving rejects to file programs/Xserver/hw/darwin/darwinKeyboard.c.rej [...] |--- programs/Xserver/hw/darwin/Imakefile.orig 2007-04-03 16:19:32.0 -0400 |+++ programs/Xserver/hw/darwin/Imakefile 2007-04-03 16:20:10.0 -0400 -- Patching file programs/Xserver/hw/darwin/Imakefile using Plan A... Hunk #1 FAILED at 29. 1 out of 1 hunk FAILED -- saving rejects to file programs/Xserver/hw/darwin/Imakefile.rej [...] |--- programs/Xserver/hw/darwin/quartz/Imakefile.orig 2007-04-04 09:40:54.0 -0400 |+++ programs/Xserver/hw/darwin/quartz/Imakefile2007-04-04 09:41:55.0 -0400 -- Patching file programs/Xserver/hw/darwin/quartz/Imakefile using Plan A... Hunk #1 FAILED at 39. 1 out of 1 hunk FAILED -- saving rejects to file programs/Xserver/hw/darwin/quartz/Imakefile.rej [...] |--- programs/Xserver/hw/darwin/quartz/XServer.m.orig 2007-04-04 07:25:15.0 -0400 |+++ programs/Xserver/hw/darwin/quartz/XServer.m2007-04-04 07:26:04.0 -0400 -- Patching file programs/Xserver/hw/darwin/quartz/XServer.m using Plan A... Hunk #1 FAILED at 91. 1 out of 1 hunk FAILED -- saving rejects to file programs/Xserver/hw/darwin/quartz/XServer.m.rej [...] The failed patches are probably due to the cvs repo being changed in those areas since xf-4_6_99_20 came out, as Marc mentioned. I see that my local cvs copy has these already applied: CVSROOT: /home/x-cvs Module name: xc Changes by: [EMAIL PROTECTED] 07/04/02 17:21:15 Log message: 128. Update Darwin
Re: patches for Darwin /MacOSX
Hi again, If I did things right, three patches were no longer needed, cvs seems to have similar fixes. The others needed some matching done to the compare lines. One of the others had a hunk that was done better with the cvs changes. It might be better if I update your bugzilla reports, to keep track of the updated patches better? I've done more tweaks to my own host.def file, then will build it with your patches altered to match cvs. I want xf86 to use my own built freetype2-cvs, fontconfig-2.4.2, png-1.2.17beta, and expat-2.0.0 libs etc. instead of the old stuff in the xf86 tarball/cvs. ;) For one thing, the next freetype2-2.3.3 release will have some important ttf tweaks fixes, things should look much better. I turned on and/or up'd some freetype2 config parms, too, plus I want to try their new LCD pixel support (I have a 23 Cinema HD thing here ;) ). Crossing fingers... ah-oh, it already stopped while linking libXft: can't find a couple Fc symbols but the correct -L/-l parms are right there. ...grrr... Ain't xf86 keeping up with the latest APIs stuff being done to projects it depends on? ... :( ... maybe I'll switch to x.org ... ___ Devel mailing list Devel@XFree86.Org http://XFree86.Org/mailman/listinfo/devel
Re: patches for Darwin /MacOSX
On Fri, 6 Apr 2007, SciFi wrote: If I did things right, three patches were no longer needed, cvs seems to have similar fixes. The others needed some matching done to the compare lines. One of the others had a hunk that was done better with the cvs changes. It might be better if I update your bugzilla reports, to keep track of the updated patches better? I've done more tweaks to my own host.def file, then will build it with your patches altered to match cvs. I want xf86 to use my own built freetype2-cvs, fontconfig-2.4.2, png-1.2.17beta, and expat-2.0.0 libs etc. instead of the old stuff in the xf86 tarball/cvs. ;) For one thing, the next freetype2-2.3.3 release will have some important ttf tweaks fixes, things should look much better. I turned on and/or up'd some freetype2 config parms, too, plus I want to try their new LCD pixel support (I have a 23 Cinema HD thing here ;) ). Crossing fingers... ah-oh, it already stopped while linking libXft: can't find a couple Fc symbols but the correct -L/-l parms are right there. ...grrr... Ain't xf86 keeping up with the latest APIs stuff being done to projects it depends on? ... :( ... maybe I'll switch to x.org ... Well, you can do that. But, AFAICT there has been little to no activity on its Darwin port for the past two years either. A few more comments here ... XFree86 is strictly a volunteer organisation, not the 9-to-5 outfit you seem to imply it is. As such, it cannot be expected to follow your schedule. There are imake controls that allow building against external packages instead of the ones in the tree. The repository mirror you (and CVSWeb) have read access to is updated once a day. When exactly I never remember, but in any case, I have no access to affect it. Yves's changes are still under review (almost done), which means that they have yet to be integrated. Marc. +--+--+ | Marc Aurele La France | work: 1-780-492-9310 | | Academic Information and| fax:1-780-492-1729 | |Communications Technologies | email: [EMAIL PROTECTED] | | 352 General Services Building +--+ | University of Alberta | | | Edmonton, Alberta |Standard disclaimers apply| | T6G 2H1 | | | CANADA | | +--+--+ XFree86 developer and VP. ATI driver and X server internals. ___ Devel mailing list Devel@XFree86.Org http://XFree86.Org/mailman/listinfo/devel
Re: patches for Darwin /MacOSX
On Fri, 06 Apr 2007 09:55:22 -0600, Marc Aurele La France wrote: On Fri, 6 Apr 2007, SciFi wrote: If I did things right, three patches were no longer needed, cvs seems to have similar fixes. The others needed some matching done to the compare lines. One of the others had a hunk that was done better with the cvs changes. It might be better if I update your bugzilla reports, to keep track of the updated patches better? I've done more tweaks to my own host.def file, then will build it with your patches altered to match cvs. I want xf86 to use my own built freetype2-cvs, fontconfig-2.4.2, png-1.2.17beta, and expat-2.0.0 libs etc. instead of the old stuff in the xf86 tarball/cvs. ;) For one thing, the next freetype2-2.3.3 release will have some important ttf tweaks fixes, things should look much better. I turned on and/or up'd some freetype2 config parms, too, plus I want to try their new LCD pixel support (I have a 23 Cinema HD thing here ;) ). Crossing fingers... ah-oh, it already stopped while linking libXft: can't find a couple Fc symbols but the correct -L/-l parms are right there. ...grrr... Ain't xf86 keeping up with the latest APIs stuff being done to projects it depends on? ... :( ... maybe I'll switch to x.org ... Well, you can do that. But, AFAICT there has been little to no activity on its Darwin port for the past two years either. The darwin stuff wasn't my main concern. I was thinking freedesktop.org houses the fontconfig project these days, and together with x.org, they might have dealt with the changes in the freetype2 project, namely the extreme disuasion of using internal headers APIs etc. anymore. A few more comments here ... XFree86 is strictly a volunteer organisation, not the 9-to-5 outfit you seem to imply it is. As such, it cannot be expected to follow your schedule. What brought this on? I only wanted to make sure the cvs changes are made available so we'd have them before you-all left for holiday. I really thought something was wrong, since the schedule doesn't seem to be documented anywhere. And if something _was_ wrong, to please ask someone in charge to fix it before leaving for holiday. Good Friday is today, and I was awfully afraid my post was _already_ too late for anyone to help fix the public cvs server if it needed it. As for volunteers -- who else but volunteers (such as me) would spend holidays to work on this project? Do you see how your response seems twisted to me? ;) And 9-5 in _which_ timezone are you implying? ;) There are imake controls that allow building against external packages instead of the ones in the tree. Yes I know all about them. Guess what? We'll need more patches to coax the internal headers of freetype2-2.3.x to be usable by xfree86-cvs. The Freetype2 folks really don't want anyone doing that anymore, but they realise the deep-down nature of X11 needs to access those levels, so they left some holes that we could slip thru. I'm hoping the patches won't need #ifdef'ing too much, but the biggest problem is that freetype2-2.3.x no longer installs the internal headers, in fact their make install scripts will try forcibly deleting any that were installed in the past ... so someone will need to manually copy them over. I love this kind of in-fighting between projects. ~sigh~ ;) The repository mirror you (and CVSWeb) have read access to is updated once a day. When exactly I never remember, but in any case, I have no access to affect it. It'd be nice if someone would find out and document it on the aforementioned cvs instructional page. Gmane's history of these maillists goes quite a ways back, and I saw a few unanswered complaints about this very topic. So I had to ask again, again thinking something was actually wrong somewhere. ;) But since you imply this is _not_ a 9-5 operation in whatever timezone, please put a request thru to change the public cvs server's operation so it'd be in sync a whole lot more often during a 24-hour day, please? I'd say once an hour might be sufficient. Yves's changes are still under review (almost done), which means that they have yet to be integrated. I thought I said that already, by showing how parts of them failed against public cvs at the time of my post. ;) Marc. Anyway, I'm actually running with Yves' patches as I modified locally here to match cvs as I had it in the previous post. Together with what I was able to figure out to get xfree86-cvs to compile against freetype2-2.3.x (my cvs copy is effectively the released 2.3.3). The latest fontconfig expat versions didn't need anything tweaked. Yves' changes did not help getting stuck several times during the build here. I'll be documenting as best I can and send 'em thru bugzilla. I bet we'll be too late for Apple to put this into Leopard, I have no idea what they're doing since I can't afford a $pay-for$ ADC account there or get a 'sponsor'. :( Thanks for reading. I need
