Date: Sun, 8 Feb 2009 07:30:40 +1100 From: Peter Jeremy <peter@vk2pj.dyndns.org> To: Robert Noland <rnoland@freebsd.org> Cc: freebsd-x11 <freebsd-x11@freebsd.org> Subject: Re: [HEADS UP/CFT] Xserver 1.6 + randr + intel Message-ID: <20090207203039.GA9969@test71.vk2pj.dyndns.org> In-Reply-To: <1233467909.1534.24.camel@ferret.2hip.net> References: <1233456742.1534.14.camel@ferret.2hip.net> <1233467909.1534.24.camel@ferret.2hip.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--T4sUOijqQbZv57TR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |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= =2Erej =2E.. |Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-b= sd-bsd_mouse.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-suppor= t-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-sup= port-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/pa= tch-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. --=20 Peter Jeremy --T4sUOijqQbZv57TR Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.10 (FreeBSD) iEYEARECAAYFAkmN728ACgkQ/opHv/APuIcyVQCgkQ91q+8Tj0ivRIgWmag231uq Ly0AnifljRC0ADfsV+Q/+00XD9YLT4oB =JPTA -----END PGP SIGNATURE----- --T4sUOijqQbZv57TR--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090207203039.GA9969>