Updating X.org FreeBSD ports to 7.3

[Rene Ladan]

Robert C. Noland III schreef:
> On Sat, 2007-09-08 at 17:39 -0400, Robert C. Noland III wrote:
>> On Sat, 2007-09-08 at 15:34 +0200, Fabian Keil wrote:
>>> Florent Thoumie <flz at xbsd.org> wrote:
>>>
>>>> As some of you may know already, X.org released X11R7.3 yesterday. Since 
>>>> we already made the move to modular ports for 7.2, the work to update 
>>>> ports to 7.3 was much faster.
>>>>
>>>> It's not likely to cause any major breakage but I'd like to get some 
>>>> feedback (from users and pointyhat) before I commit the update, so it 
>>>> probably won't reach the CVS repository before wednesday.
>>>>
>>>> Here's a diff against current ports tree:
>>>>
>>>> http://dump.xbsd.org/freebsd/xorg73.diff.gz
>>> I run into a few problems with this on
>>> FreeBSD 7.0-CURRENT #22: Thu Aug 30 21:45:49 CEST 2007,
>>> the first being:
>>>
[...]
>>>
>>> The problem seems to be that xorg-nestserver checks for
>>> /usr/local/libdata/pkgconfig/pixman-1.pc which is also referenced
>>> in pixman's pkg-plist, but pixman actually install it to
>>> /usr/local/lib/pkgconfig/pixman-1.pc.
>> Attached is a patch to the patch for pixman...
>
I applied the patch to the port patch, pixman/xorg-nestserver build fine
after it.

> Actually, the optional dependency on gtk20 produces a circular
> dependency... xorg-libraries > pixman -> gtk20 -> xorg-libraries -> ...
>
Confirmed.  Using portmaster:
===>   Registering installation for xorg-server-1.4,1
pkg_create: dependency loop detected for package gtk-2.10.14
pkg_create: dependency loop detected for package gtk-2.10.14
pkg_create: dependency loop detected for package pixman-0.9.5
pkg_create: dependency loop detected for package xorg-libraries-7.3
pkg_create: dependency loop detected for package pixman-0.9.5
pkg_create: dependency loop detected for package xorg-libraries-7.3
pkg_create: dependency loop detected for package gtk-2.10.14
pkg_create: dependency loop detected for package pixman-0.9.5
pkg_create: dependency loop detected for package xorg-libraries-7.3
pkg_create: dependency loop detected for package gtk-2.10.14
pkg_create: dependency loop detected for package gtk-2.10.14
pkg_create: dependency loop detected for package pixman-0.9.5
pkg_create: dependency loop detected for package xorg-libraries-7.3
pkg_create: dependency loop detected for package pixman-0.9.5


>>> After copying it to the expected location I got:
>>>
>>> ===>   xorg-server-1.4,1 depends on file: /usr/local/bin/perl5.8.8 - found
>>> ===>  Patching for xorg-server-1.4,1
>>> ===>   xorg-server-1.4,1 depends on file: /usr/local/bin/perl5.8.8 - found
>>> ===>  Applying extra patch /usr/ports/x11-servers/xorg-server/files/extra-patch-gcc42
>>> 1 out of 1 hunks failed--saving rejects to hw/xfree86/scanpci/Makefile.in.rej
>>> *** Error code 1
>>>
>>> Which I solved by removing the ".if ${OSVERSION} > 700042" check.
>>>
I just removed that part completely from the port Makefile, xorg-server builds and
runs fine without it on my box (i386, 7.0-CURRENT, gcc4.2.1)

>>> Afterwards xorg-nestserver's configure script complained about:
>>> Requested 'compositeproto >= 0.4' but version of CompositeProto is 0.3.1
>>> and xorg-server's about:
>>> Requested 'inputproto >= 1.4.2' but version of InputProto is 1.3.2
>>>
Huh?  The patch already contains updates for inputproto 1.3.2 -> 1.4.2.1 and
compositeproto 0.3.1 -> 0.4

As I'm having an ATI Radeon X1450 (RV515), I tried running the unported
xf86-video-avivo driver (HEAD) compiled with libpciaccess (0.9.1, last HEAD
that compiled on FreeBSD).  Unfortunately, it doesn't run so I tried loading
xf86-video-vesa as usual.
However, the vesa driver bailed out with an ABI mismatch (since it was still
compiled against xorg-server 1.2.0), which I fixed by recompiling the xf86-video-vesa
port.  So now at least vesa works again.

I'm also seeing that the *Lock leds stopped working when I'm in X (they work on the
console).  I have XkbModel=pc105 and XkbLayout=us in /etc/X11/xorg.conf

Regards,
Rene
-- 
GPG fingerprint = E738 5471 D185 7013 0EE0  4FC8 3C1D 6F83 12E1 84F6 (subkeys.pgp.net)

"It won't fit on the line."
		-- me, 2001