Bug 36181

Summary: XFree86-4-Server update fixes DRI (including 3dfx) compiling.
Product: Ports & Packages Reporter: Eric Anholt <eanholt>
Component: Individual Port(s)Assignee: freebsd-ports (Nobody) <ports>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Eric Anholt 2002-03-21 23:40:01 UTC 
	Updates XFree86-4-Server port to always compile DRI on i386 machines, including
	3dfx support.  It no longer requires system source to be installed.
	This does not require Glide to be installed, unlike 3dfx support in 4.1.0.  
	I think the %%I386%%es are changed to what they should be (though I don't
	see any reason that the 2d and 3d drivers besides i8x0 shouldn't
	be compiled for alpha).
	
	Supersedes ports/36121

How-To-Repeat: 	apply patch from /usr/ports
Comment 1 Alan Eldridge 2002-03-22 03:49:30 UTC 
On Thu, Mar 21, 2002 at 03:36:01PM -0800, Eric Anholt wrote:
>
>>Number:         36181
>>Category:       ports
>>Synopsis:       XFree86-4-Server update fixes DRI (including 3dfx) compiling.

Shouldn't we bump PORTREVISION with this one?

-- 
AlanE
"When the going gets weird, the weird turn pro." - HST
Comment 2 Will Andrews 2002-03-22 12:16:50 UTC 
On Thu, Mar 21, 2002 at 08:00:03PM -0800, Alan Eldridge wrote:
>  Shouldn't we bump PORTREVISION with this one?

That's OK.  When I get around to committing this patch and yours
(RSN) it should have a PORTREVISION bump.

Regards,
-- 
wca
Comment 3 Alan Eldridge 2002-03-22 13:36:01 UTC 
On Thu, Mar 21, 2002 at 03:36:01PM -0800, Eric Anholt wrote:
>
>>Number:         36181
>>Category:       ports
>>Synopsis:       XFree86-4-Server update fixes DRI (including 3dfx) compiling.

Possibly harmless error (seems to be) message on X server exit, shown in
context:

(II) TDFX(0): [drm] removed 1 reserved context for kernel
DRIUnlock called when not locked
(II) TDFX(0): [drm] unmapping 8192 bytes of SAREA 0xdc2a6000 at
0x2828c000

This system has a Voodoo5 running at 1280x1024x24bpp.

-- 
AlanE
"When the going gets weird, the weird turn pro." - HST
Comment 4 Will Andrews 2002-03-24 02:18:18 UTC 
On Thu, Mar 21, 2002 at 03:36:01PM -0800, Eric Anholt wrote:
> >Description:
> 	Updates XFree86-4-Server port to always compile DRI on i386 machines,
>	including 3dfx support.  It no longer requires system source to be
>	installed.  This does not require Glide to be installed, unlike 3dfx
>	support in 4.1.0.  I think the %%I386%%es are changed to what they
>	should be (though I don't see any reason that the 2d and 3d drivers
>	besides i8x0 shouldn't	be compiled for alpha).

OK, I've tested your patch.  However, I have a concern... your
patch removes several kernel drivers for DRI.  Is that
intentional?  What about the changing of BuldXF86DRM to NO?

> Index: x11-servers/XFree86-4-Server/pkg-plist
> ===================================================================
> RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/pkg-plist,v
> retrieving revision 1.41
> diff -u -r1.41 pkg-plist
> --- x11-servers/XFree86-4-Server/pkg-plist	19 Mar 2002 18:22:49 -0000	1.41
> +++ x11-servers/XFree86-4-Server/pkg-plist	21 Mar 2002 23:27:01 -0000
> @@ -47,12 +47,6 @@
>  lib/X11/etc/sun.termcap
>  lib/X11/etc/sun.terminfo
>  lib/X11/etc/xmodmap.std
> -%%DRI_KMOD%%lib/X11/kernel/gamma.ko
> -%%DRI_KMOD%%lib/X11/kernel/mga.ko
> -%%DRI_KMOD%%lib/X11/kernel/r128.ko
> -%%DRI_KMOD%%lib/X11/kernel/radeon.ko
> -%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
> -%%DRI_KMOD%%@dirrm lib/X11/kernel
>  lib/X11/xserver/SecurityPolicy
>  lib/modules/codeconv/libARABIC.a
>  lib/modules/codeconv/libARMSCII8.a
> @@ -88,9 +82,10 @@
>  %%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
>  %%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
>  %%DRI%%lib/modules/dri/mga_dri.so
> -%%DRI%%lib/modules/dri/radeon_dri.so
> +%%I386:%%%%DRI%%lib/modules/dri/radeon_dri.so
>  %%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
>  %%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
> +%%DRI%%lib/modules/dri/tdfx_dri.so
>  %%I386:%%lib/modules/drivers/apm_drv.o
>  %%I386:%%lib/modules/drivers/ark_drv.o
>  %%I386:%%lib/modules/drivers/ati_drv.o
> Index: x11-servers/XFree86-4-Server/scripts/configure
> ===================================================================
> RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/scripts/configure,v
> retrieving revision 1.70
> diff -u -r1.70 configure
> --- x11-servers/XFree86-4-Server/scripts/configure	16 Mar 2002 23:40:16 -0000	1.70
> +++ x11-servers/XFree86-4-Server/scripts/configure	21 Mar 2002 21:36:30 -0000
> @@ -46,7 +46,9 @@
>  	echo "#define XInputDrivers mouse" >> $LOCALDEF	
>      fi
>      echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF
> -    echo "#define BuildXF86DRM ${BuildXF86DRM}" >> $LOCALDEF
> +    echo "#define BuildXF86DRM NO" >> $LOCALDEF
> +    echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF
> +    echo "#define Glide3IncDir glide3" >> $LOCALDEF
>  
>      # Matrox driver support
>      echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF

Regards,
-- 
wca
Comment 5 Eric Anholt 2002-04-01 08:45:10 UTC 
Yes, I meant to remove the kernel drivers.  More functional ones are in
the drm-kmod port.  The kernel modules in the XServer source for BSD are
basically the drm-kmod ones with some linux/bsd ifdefs removed and fewer
PCI IDs.  I created the port because patches happen to that much more
often than to the DRI stuff in the XServer, so it saves recompiling the
server when kernel stuff changes.

(Sorry if there have been other messages -- I just got back from break
and my FreeBSD mailbox is backed up).

On Sat, 2002-03-23 at 18:18, Will Andrews wrote:
> On Thu, Mar 21, 2002 at 03:36:01PM -0800, Eric Anholt wrote:
> > >Description:
> > 	Updates XFree86-4-Server port to always compile DRI on i386 machines,
> >	including 3dfx support.  It no longer requires system source to be
> >	installed.  This does not require Glide to be installed, unlike 3dfx
> >	support in 4.1.0.  I think the %%I386%%es are changed to what they
> >	should be (though I don't see any reason that the 2d and 3d drivers
> >	besides i8x0 shouldn't	be compiled for alpha).
> 
> OK, I've tested your patch.  However, I have a concern... your
> patch removes several kernel drivers for DRI.  Is that
> intentional?  What about the changing of BuldXF86DRM to NO?
> 
> > Index: x11-servers/XFree86-4-Server/pkg-plist
> > ===================================================================
> > RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/pkg-plist,v
> > retrieving revision 1.41
> > diff -u -r1.41 pkg-plist
> > --- x11-servers/XFree86-4-Server/pkg-plist	19 Mar 2002 18:22:49 -0000	1.41
> > +++ x11-servers/XFree86-4-Server/pkg-plist	21 Mar 2002 23:27:01 -0000
> > @@ -47,12 +47,6 @@
> >  lib/X11/etc/sun.termcap
> >  lib/X11/etc/sun.terminfo
> >  lib/X11/etc/xmodmap.std
> > -%%DRI_KMOD%%lib/X11/kernel/gamma.ko
> > -%%DRI_KMOD%%lib/X11/kernel/mga.ko
> > -%%DRI_KMOD%%lib/X11/kernel/r128.ko
> > -%%DRI_KMOD%%lib/X11/kernel/radeon.ko
> > -%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
> > -%%DRI_KMOD%%@dirrm lib/X11/kernel
> >  lib/X11/xserver/SecurityPolicy
> >  lib/modules/codeconv/libARABIC.a
> >  lib/modules/codeconv/libARMSCII8.a
> > @@ -88,9 +82,10 @@
> >  %%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
> >  %%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
> >  %%DRI%%lib/modules/dri/mga_dri.so
> > -%%DRI%%lib/modules/dri/radeon_dri.so
> > +%%I386:%%%%DRI%%lib/modules/dri/radeon_dri.so
> >  %%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
> >  %%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
> > +%%DRI%%lib/modules/dri/tdfx_dri.so
> >  %%I386:%%lib/modules/drivers/apm_drv.o
> >  %%I386:%%lib/modules/drivers/ark_drv.o
> >  %%I386:%%lib/modules/drivers/ati_drv.o
> > Index: x11-servers/XFree86-4-Server/scripts/configure
> > ===================================================================
> > RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/scripts/configure,v
> > retrieving revision 1.70
> > diff -u -r1.70 configure
> > --- x11-servers/XFree86-4-Server/scripts/configure	16 Mar 2002 23:40:16 -0000	1.70
> > +++ x11-servers/XFree86-4-Server/scripts/configure	21 Mar 2002 21:36:30 -0000
> > @@ -46,7 +46,9 @@
> >  	echo "#define XInputDrivers mouse" >> $LOCALDEF	
> >      fi
> >      echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF
> > -    echo "#define BuildXF86DRM ${BuildXF86DRM}" >> $LOCALDEF
> > +    echo "#define BuildXF86DRM NO" >> $LOCALDEF
> > +    echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF
> > +    echo "#define Glide3IncDir glide3" >> $LOCALDEF
> >  
> >      # Matrox driver support
> >      echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF
> 
> Regards,
> -- 
> wca
Comment 6 Will Andrews freebsd_committer freebsd_triage 2002-04-02 03:13:17 UTC 
State Changed
From-To: open->closed

Committed, thanks.