[HEADS UP/CFT] Xserver 1.6 + randr + intel

[Peter Jeremy]

On Sat, 2009-01-31 at 21:52 -0500, Robert Noland wrote:
> Ok, I'm expecting Xserver 1.6 final to release sometime on Monday.  I'm
> planning to commit this sometime next week.  This patch includes the
> following Xserver 1.6rc2, randrproto rc, libXrandr rc, xrandr rc, and
> the 2.6.1 release of the intel driver.

I notice that this timeline hasn't eventuated.  Given the ongoing
problems with the X.org 7.4 upgrade, could you please release the
patch you intend to commit and wait for people to test it before
committing it.  It is much easier to undo an uncommitted patch than
try to roll back the ports tree.

>> The patch is http://people.freebsd.org/~rnoland/xserver-1.6rc.patch
>
>I also failed to update my cvs on a couple of them when importing from
>git... So I have respun the patch, should apply cleanly now.

This patch has two failures against the current ports tree:

|Index: x11-servers/xorg-server/Makefile
|===================================================================
|RCS file: /home/ncvs/ports/x11-servers/xorg-server/Makefile,v
|retrieving revision 1.64
|diff -u -r1.64 Makefile
|--- x11-servers/xorg-server/Makefile   27 Jan 2009 09:31:22 -0000      1.64
|+++ x11-servers/xorg-server/Makefile   1 Feb 2009 05:47:52 -0000
--------------------------
Patching file x11-servers/xorg-server/Makefile using Plan A...
Hunk #1 failed at 6.
Hunk #2 succeeded at 36.
1 out of 2 hunks failed--saving rejects to x11-servers/xorg-server/Makefile.rej
...
|Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c
|===================================================================
|RCS file: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c
|diff -N x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c
|--- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c  15 Apr 2008 18:01:15 -0000      1.2
|+++ /dev/null  1 Jan 1970 00:00:00 -0000
--------------------------
Patching file x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c using Plan A...
Hunk #1 failed at 0.
1 out of 1 hunks failed--saving rejects to x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c.rej

The patch to Makefile is just a PORTREVISION mismatch and easy to fix.
The bsd_mouse.c patch is more problematic.  Your patch is intented to
completely remove the patch file but you have since updated the patchfile
to fix problems with multiple mouse opens and it's not clear whether
those changes are still required.

-- 
Peter Jeremy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-x11/attachments/20090207/368dc659/attachment.pgp