Date: Sun, 08 Feb 2009 00:46:22 -0500 From: Robert Noland <rnoland@FreeBSD.org> To: Peter Jeremy <peter@vk2pj.dyndns.org> Cc: freebsd-x11 <freebsd-x11@freebsd.org> Subject: Re: [HEADS UP/CFT] Xserver 1.6 + randr + intel Message-ID: <1234071983.1562.54.camel@ferret.2hip.net> In-Reply-To: <20090207203039.GA9969@test71.vk2pj.dyndns.org> References: <1233456742.1534.14.camel@ferret.2hip.net> <1233467909.1534.24.camel@ferret.2hip.net> <20090207203039.GA9969@test71.vk2pj.dyndns.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-7LMew6KjF/sVQarP8Te3 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Sun, 2009-02-08 at 07:30 +1100, Peter Jeremy wrote: > 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. >=20 > 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. >=20 > >> 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. >=20 > This patch has two failures against the current ports tree: >=20 > |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/Makefi= le.rej > ... > |Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support= -bsd-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-supp= ort-bsd-bsd_mouse.c > |diff -N x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-suppor= t-bsd-bsd_mouse.c > |--- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bs= d-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-s= upport-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 >=20 > 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. I'll respin the patch, but the os-support has been removed from the server in 1.6. It now lives in the mouse driver itself, so that patch is just entirely removed. robert. >=20 --=20 Robert Noland <rnoland@FreeBSD.org> FreeBSD --=-7LMew6KjF/sVQarP8Te3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.10 (FreeBSD) iEYEABECAAYFAkmOca4ACgkQM4TrQ4qfRONjHwCdE5P9JTV8KnKOaMGiFn1TitYe 1PUAniGLKLCn+4OsoqtKAEw/iN0EyxiJ =c7iV -----END PGP SIGNATURE----- --=-7LMew6KjF/sVQarP8Te3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1234071983.1562.54.camel>