Bug 1712

Created attachment 1168 [details] [review]
DragonFly addition to xc/config/cf

Created attachment 1169 [details] [review]
More DragonFly additions/changes

Created attachment 1170 [details] [review]
DragonFly addition to xc/config

Created attachment 1171 [details] [review]
DragonFly addition to xc/config v3

Don't do this kind of thing just before going to bed... :-\

Created attachment 1172 [details]
DragonFly.cf imake config file

This a newer version of our DragonnFly.cf
This will still not deal with the removal of the thread stubs
but will be much better.

It is not 100% correct Andy, it leaves out the GCC 2.95.x optimization bug
workaround.  It has the Teeny version defined, DragonFly doesn't use that.
BuildThreadStubLibrary is not present any more in lib/Imakefile.  Alpha is not
supported anymore.

The FreeType, PNG, Expat stuff is something we should wrap like FreeBSD.cf does,
since a user might build from source or from ports (and whatever we wind up with
in the future).

The SharedX11Reqs and SharedXtReqs might be necessary, right now SharedXtReqs is
set correctly in bsdlib.cf, but misses the -lXThrStub addition.  I am not 100%
sure it is supported still, since FreeBSD.cf and OpenBSD.cf removed all this
from their configuration.

There is now a 2nd patch floating around to support the DragonFly platform. It
would be nice if you can either choose one version or merge your work and then
attach the final version to this bug (note: Please read
http://freedesktop.org/pipermail/release-wranglers/2004-November/001169.html if
you want the patch in the X11R6.8.2 maintaince release).

Created attachment 1280 [details] [review]
Add DragonFly support

Version 4, which incorporates David Rhodus work and Andreas Hauser's.

Jeroen Ruigrok:
Can you get two people from the DragonFly project to test the patch and comment
here to vouch for it (assuming it is OK), please (see
http://freedesktop.org/pipermail/release-wranglers/2004-November/001169.html) ?

Reassign bug to me, I have a new patch per feedback from the Dragonfly team

Created attachment 2001 [details] [review]
Add DragonFly support

(In reply to comment #9)
> Jeroen Ruigrok:
> Can you get two people from the DragonFly project to test the patch and comment
> here to vouch for it (assuming it is OK), please (see
> http://freedesktop.org/pipermail/release-wranglers/2004-November/001169.html) ?
Is this still required? The changes are used by DragonFly since several months...

Looks good thus far.

My latest patchset, before I went to Brasil for a bunch of weeks, is located at:
http://www.in-nomine.org/~asmodai/xorg-new.patch

Mike Verona 2005-03-01 20:01 [reply] ------- 
> > In reply to comment #9)
> > Jeroen Ruigrok:
> > Can you get two people from the DragonFly project to test the patch and 
> > comment
> > here to vouch for it (assuming it is OK), please (see
> >
http://freedesktop.org/pipermail/release-wranglers/2004-November/001169.html) ?
> Is this still required? The changes are used by DragonFly since several
> months...

That comment was for the X11R6.8.x stable branch... I am going to commit the
patch to Xorg trunk in a few mins. If it works without problems then we can
consider it for the X11R6.8.x stable branch (again) ...

Created attachment 2004 [details] [review]
Add DragonFly support (same as attachment #2001 [details] [review] + Changelog diff)

same patch as attachment #2001 [details] [review] , I just added a changelog entry to the patch

Patch checked-in...

/cvs/xorg/xc/ChangeLog,v  <--  xc/ChangeLog
new revision: 1.788; previous revision: 1.787
/cvs/xorg/xc/config/cf/DragonFly.cf,v  <--  xc/config/cf/DragonFly.cf
initial revision: 1.1
/cvs/xorg/xc/config/cf/Imake.cf,v  <--  xc/config/cf/Imake.cf
new revision: 1.7; previous revision: 1.6
/cvs/xorg/xc/config/cf/Imakefile,v  <--  xc/config/cf/Imakefile
new revision: 1.6; previous revision: 1.5
/cvs/xorg/xc/config/imake/imake.c,v  <--  xc/config/imake/imake.c
new revision: 1.7; previous revision: 1.6
/cvs/xorg/xc/config/imake/imakemdep.h,v  <--  xc/config/imake/imakemdep.h
new revision: 1.9; previous revision: 1.8
/cvs/xorg/xc/extras/drm/shared/drm.h,v  <--  xc/extras/drm/shared/drm.h
new revision: 1.2; previous revision: 1.1
/cvs/xorg/xc/include/Xos_r.h,v  <--  xc/include/Xos_r.h
new revision: 1.3; previous revision: 1.2
/cvs/xorg/xc/lib/xtrans/Xtranssock.c,v  <--  xc/lib/xtrans/Xtranssock.c
new revision: 1.4; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v  <-- 
xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
new revision: 1.5; previous revision: 1.4
/cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v  <-- 
xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
new revision: 1.3; previous revision: 1.2
/cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v  <-- 
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
new revision: 1.4; previous revision: 1.3
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
/cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c,v 
<--  xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c
new revision: 1.4; previous revision: 1.3
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
Mailing the commit message to xorg-commit@lists.freedesktop.org...

... marking bug as FIXED.

----

It would be nice if someone with DragonFly/BSD can pull Xorg trunk via
% export CVSROOT=:pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
% cvs -z9 checkout xc
% make World 2>&1 | tee -a buildlog.log
% make install
% make install.man
and test whether this builds and works. If there are DragonFly/BSD-speciifc
problems please reopen this bug, otherwise mark the bug as VERIFIED.

Just to comment, mailed Roland a few times in private and haven't heard back yet.

What I emailed:

cc -O -ansi -Wno-system-headers -Dasm=__asm -Wall
-Wpointer-arith-Wstrict-prototypes                     -Wmissing-prototypes
-Wmissing-declarations                        -Wredundant-decls -Wnested-externs
-Wundef   -I/usr/X11R6/include -I../../exports/include
-I../../exports/include/freetype2 -I../../exports/include/freetype2/config
-I../../exports/include/X11  -I../.. -I../../exports/include   -DCSRG_BASED
-DFUNCPROTO=15 -DNARROWPROTO   -DXRENDER -DXFREE86_FT2 -DINCLUDE_XPRINT_SUPPORT
-c print.c
print.c:113: warning: no previous prototype for 'FinishPrinting'
print.c: In function `FinishPrinting':
print.c:129: warning: implicit declaration of function `XpuCompoundTextToXmb'
print.c:129: warning: nested extern declaration of `XpuCompoundTextToXmb'
print.c:129: warning: initialization makes pointer from integer without a cast
print.c:133: warning: implicit declaration of function `XpuFreeXmbString'
print.c:133: warning: nested extern declaration of `XpuFreeXmbString'
print.c: In function `DoPrint':
print.c:223: error: too many arguments to function `XpuGetResolution' *** Error
code 1

I honestly wonder why it decides to use *installed* headers for finding
certain function prototypes instead of that which are part of the sources.

xlogo fails to find a prototype for XpuCompoundTextToXmb(), the .depend file
lists:

programs/xlogo/.depend:xlogo.o: /usr/include/stdio.h
/usr/X11R6/include/X11/XprintUtil/xprintutil.h
programs/xlogo/.depend:print.o: /usr/X11R6/include/X11/XprintUtil/xprintutil.h

Which is very silly given that the current X.org 6.8.2 installed on my box
does not even define XpuCompoundTextToXmb() in xprintutil.h.

Mmm, some more looking shows that other programs do indeed do the correct
thing:

programs/xman/.depend:handler.o: ../../exports/include/X11/XprintUtil/xprintutil.h
programs/xman/.depend:printdialog.o:
../../exports/include/X11/XprintUtil/xprintutil.h
programs/xman/.depend:print.o: ../../exports/include/X11/XprintUtil/xprintutil.h

Why is it insisting on using system installed headers?

Also, make FinishPrinting() in print.c static.