Re: [Dri-devel] DRI/Xfree86 Merge
On Sun, Apr 18, 2004 at 01:33:41PM +0200, Michel Dänzer wrote: > On Sun, 2004-04-18 at 04:19, Donnie Berkholz wrote: > > On Sat, 2004-04-17 at 07:54, Alan Hourihane wrote: > > > On Sat, Apr 17, 2004 at 01:18:49AM +0200, Michel Dänzer wrote: > > > > On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote: > > > > > > > > > > I could merge in XFree86 4.3.99.902 which is before the license change > > > > > > > > Are you sure? AFAIK David applied the new license (or at least a > > > > similarly controversial one) to some files before it was publicly > > > > announced. > > > > > > Yes, I'm positive that 4.3.99.902 is unencumbered. > > > > I'm pretty sure the autoconfig work, under the X-Oz license (nearly > > identical to the problematic one), was in at that point. > > Right, that's what I was thinking of. Mmmm, things hotted up after the 4.3.99.902 release, but your right the file xf86AutoConfig.c does have the new license in that release. So that means dropping back to 4.3.99.901 or just let the individuals merge in DDX changes of their own accord, which may be the simpler approach. Alan. --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id70&alloc_id638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] DRI/Xfree86 Merge
On Sun, 2004-04-18 at 04:19, Donnie Berkholz wrote: > On Sat, 2004-04-17 at 07:54, Alan Hourihane wrote: > > On Sat, Apr 17, 2004 at 01:18:49AM +0200, Michel DÃnzer wrote: > > > On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote: > > > > > > > > I could merge in XFree86 4.3.99.902 which is before the license change > > > > > > Are you sure? AFAIK David applied the new license (or at least a > > > similarly controversial one) to some files before it was publicly > > > announced. > > > > Yes, I'm positive that 4.3.99.902 is unencumbered. > > I'm pretty sure the autoconfig work, under the X-Oz license (nearly > identical to the problematic one), was in at that point. Right, that's what I was thinking of. -- Earthling Michel DÃnzer | Debian (powerpc), X and DRI developer Libre software enthusiast| http://svcs.affero.net/rm.php?r=daenzer --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] DRI/Xfree86 Merge
On Sat, 2004-04-17 at 07:54, Alan Hourihane wrote: > On Sat, Apr 17, 2004 at 01:18:49AM +0200, Michel Dänzer wrote: > > On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote: > > > > > > I could merge in XFree86 4.3.99.902 which is before the license change > > > > Are you sure? AFAIK David applied the new license (or at least a > > similarly controversial one) to some files before it was publicly > > announced. > > Yes, I'm positive that 4.3.99.902 is unencumbered. I'm pretty sure the autoconfig work, under the X-Oz license (nearly identical to the problematic one), was in at that point. -- Donnie Berkholz Gentoo Linux signature.asc Description: This is a digitally signed message part
Re: [Dri-devel] DRI/Xfree86 Merge
On Sat, Apr 17, 2004 at 01:18:49AM +0200, Michel Dänzer wrote: > On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote: > > > > I could merge in XFree86 4.3.99.902 which is before the license change > > Are you sure? AFAIK David applied the new license (or at least a > similarly controversial one) to some files before it was publicly > announced. Yes, I'm positive that 4.3.99.902 is unencumbered. > > and closer to what X.Org went with for now. > > > > That will bring us closer to both trees. And then we can delay a > > decision until things have settled on both sides of the pond, and see > > where the land lies. > > Assuming it's really clear, I'm fine with your proposal, although I > don't see XFree86 suddenly changing their mind... I'm not talking about them changing their mind, just on how things are panning out. Alan. --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id70&alloc_id638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] DRI/Xfree86 Merge
> AFAIK X.org also imported 4.3.99.902 for their version (at least the release > notes indicates that 4.3.99.902 was merged unconditionally, > http://freedesktop.org/cgi-bin/viewcvs.cgi/xc/RELNOTES?root=xorg), so if > indeed some files would be covered under the new license even for this version > then merging to that wouldn't help neither. > That's of course in no way, shape or form a legal advice ;-). X.org actually contains most of 4.4.0 a lot of changes were either to files under the old licenses (drivers etc..) or made by people who are also members of X.org.. Dave. -- David Airlie, Software Engineer http://www.skynet.ie/~airlied / airlied at skynet.ie pam_smb / Linux DECstation / Linux VAX / ILUG person --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] DRI/Xfree86 Merge
Michel DÃnzer wrote: On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote: I could merge in XFree86 4.3.99.902 which is before the license change Are you sure? AFAIK David applied the new license (or at least a similarly controversial one) to some files before it was publicly announced. This page http://www.xfree86.org/legal/licenses.html at least tells that the old license applies to 4.3.99.902. AFAIK X.org also imported 4.3.99.902 for their version (at least the release notes indicates that 4.3.99.902 was merged unconditionally, http://freedesktop.org/cgi-bin/viewcvs.cgi/xc/RELNOTES?root=xorg), so if indeed some files would be covered under the new license even for this version then merging to that wouldn't help neither. That's of course in no way, shape or form a legal advice ;-). Roland --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id70&alloc_id638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] DRI/Xfree86 Merge
On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote: > > I could merge in XFree86 4.3.99.902 which is before the license change Are you sure? AFAIK David applied the new license (or at least a similarly controversial one) to some files before it was publicly announced. > and closer to what X.Org went with for now. > > That will bring us closer to both trees. And then we can delay a > decision until things have settled on both sides of the pond, and see > where the land lies. Assuming it's really clear, I'm fine with your proposal, although I don't see XFree86 suddenly changing their mind... -- Earthling Michel DÃnzer | Debian (powerpc), X and DRI developer Libre software enthusiast| http://svcs.affero.net/rm.php?r=daenzer --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] DRI/Xfree86 Merge
Alan Hourihane wrote: I could merge in XFree86 4.3.99.902 which is before the license change and closer to what X.Org went with for now. That will bring us closer to both trees. And then we can delay a decision until things have settled on both sides of the pond, and see where the land lies. What do people think of that? I second that suggestion. --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] DRI/Xfree86 Merge
I was under the impresion that several bugs where found in 4.3.99.902 that need patching. This work has allready been done twice I shuder to think any one would bother a third. --- Alan Hourihane <[EMAIL PROTECTED]> wrote: > On Thu, Apr 15, 2004 at 08:13:53AM -0700, Alex Deucher wrote: > > Speaking of merging, what are everyone's thoughts on merging the DDX > > trees (drivers at least, I don't know about the rest, especially with > > the licensing)? I was thinking mostly DRI<->xfree86 but I suppose we > > could look at gatos too. Specifically the radeon driver has some new > > fixes in the xfree86 tree and there is MergedFB and IGP 3D support in > > the DRI tree. There are probably some things in other drivers that > > could go both ways as well. Thoughts? > > I could merge in XFree86 4.3.99.902 which is before the license change > and closer to what X.Org went with for now. > > That will bring us closer to both trees. And then we can delay a > decision until things have settled on both sides of the pond, and see > where the land lies. > > What do people think of that? > > Alan. > __ Do you Yahoo!? Yahoo! Tax Center - File online by April 15th http://taxes.yahoo.com/filing.html --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] DRI/Xfree86 Merge
On Thu, Apr 15, 2004 at 08:13:53AM -0700, Alex Deucher wrote: > Speaking of merging, what are everyone's thoughts on merging the DDX > trees (drivers at least, I don't know about the rest, especially with > the licensing)? I was thinking mostly DRI<->xfree86 but I suppose we > could look at gatos too. Specifically the radeon driver has some new > fixes in the xfree86 tree and there is MergedFB and IGP 3D support in > the DRI tree. There are probably some things in other drivers that > could go both ways as well. Thoughts? I could merge in XFree86 4.3.99.902 which is before the license change and closer to what X.Org went with for now. That will bring us closer to both trees. And then we can delay a decision until things have settled on both sides of the pond, and see where the land lies. What do people think of that? Alan. --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] DRI/Xfree86 Merge
--- Michel Dänzer <[EMAIL PROTECTED]> wrote: > On Thu, 2004-04-15 at 17:13, Alex Deucher wrote: > > Speaking of merging, what are everyone's thoughts on merging the > DDX > > trees (drivers at least, I don't know about the rest, especially > with > > the licensing)? I was thinking mostly DRI<->xfree86 but I suppose > we > > could look at gatos too. Specifically the radeon driver has some > new > > fixes in the xfree86 tree and there is MergedFB and IGP 3D support > in > > the DRI tree. > > Does the XFree86 tree have anything important the X.Org tree doesn't? > If > not, I'd prefer going with the latter. I'd prefer XORG as well. I haven't checked to see the current state of the XORG radeon driver. I think the only thing that may be missing is Hui's last patch to turn off the DACs on DPMS events. Alex > > > -- > Earthling Michel Dänzer | Debian (powerpc), X and DRI > developer > Libre software enthusiast| > http://svcs.affero.net/rm.php?r=daenzer > __ Do you Yahoo!? Yahoo! Tax Center - File online by April 15th http://taxes.yahoo.com/filing.html --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] DRI/Xfree86 Merge
On Thu, 2004-04-15 at 17:13, Alex Deucher wrote: > Speaking of merging, what are everyone's thoughts on merging the DDX > trees (drivers at least, I don't know about the rest, especially with > the licensing)? I was thinking mostly DRI<->xfree86 but I suppose we > could look at gatos too. Specifically the radeon driver has some new > fixes in the xfree86 tree and there is MergedFB and IGP 3D support in > the DRI tree. Does the XFree86 tree have anything important the X.Org tree doesn't? If not, I'd prefer going with the latter. -- Earthling Michel DÃnzer | Debian (powerpc), X and DRI developer Libre software enthusiast| http://svcs.affero.net/rm.php?r=daenzer --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
[Dri-devel] DRI/Xfree86 Merge
Speaking of merging, what are everyone's thoughts on merging the DDX trees (drivers at least, I don't know about the rest, especially with the licensing)? I was thinking mostly DRI<->xfree86 but I suppose we could look at gatos too. Specifically the radeon driver has some new fixes in the xfree86 tree and there is MergedFB and IGP 3D support in the DRI tree. There are probably some things in other drivers that could go both ways as well. Thoughts? Alex __ Do you Yahoo!? Yahoo! Tax Center - File online by April 15th http://taxes.yahoo.com/filing.html --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
