On Mon, 28 Oct 2002 23:18:33 +0000 Keith Whitwell <[EMAIL PROTECTED]> wrote:
> Felix Kühling wrote: > > On Mon, 28 Oct 2002 13:08:15 +0000 > > Keith Whitwell <[EMAIL PROTECTED]> wrote: > > > > > >>Felix Kühling wrote: > >> > > [snip] > > > >>Felix, do you have versions of these that apply cleanly to the trunk? R200 > >>in particular. > >> > > > > I suppose the applied cleanly two weeks ago ;) New versions are attached. > > Are you sure. Maybe I'm doing something wrong, but: Yes, I'm sure. With the r200 patch I attached to my last mail I get this output with your command sequence: felix@viking:~/dri/xc/xc/lib/GL/mesa/src/drv/r200$ rm r200_ioctl.c r200_context.[ch] felix@viking:~/dri/xc/xc/lib/GL/mesa/src/drv/r200$ cvs update r200_ioctl.c r200_context.c r200_context.h U r200_ioctl.c U r200_context.c U r200_context.h felix@viking:~/dri/xc/xc/lib/GL/mesa/src/drv/r200$ cvs status r200_ioctl.c r200_context.[ch] =================================================================== File: r200_ioctl.c Status: Up-to-date Working revision: 1.10 Repository revision: 1.10 /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/r200/r200_ioctl.c,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) =================================================================== File: r200_context.c Status: Up-to-date Working revision: 1.13 Repository revision: 1.13 /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/r200/r200_context.c,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) =================================================================== File: r200_context.h Status: Up-to-date Working revision: 1.7 Repository revision: 1.7 /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/r200/r200_context.h,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) felix@viking:~/dri/xc/xc/lib/GL/mesa/src/drv/r200$ patch < r200_smartwait.patch patching file r200_context.c patching file r200_context.h patching file r200_ioctl.c cvs status shows the same versions as on your system. So the only explanation is that you're not using the most recent patch or something's wrong with your version of patch. When I wrote that my previous patches applied cleanly two weeks ago I was implying that things may have changed during that time and attached new patches against the current trunk. I hope this clears things up. Best regards, Felix __\|/__ ___ ___ ___ __Tschüß_______\_6 6_/___/__ \___/__ \___/___\___You can do anything,___ _____Felix_______\Ä/\ \_____\ \_____\ \______U___just not everything____ [EMAIL PROTECTED] >o<__/ \___/ \___/ at the same time! ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel