help wanted: get minimal xserver built

Thu Feb 16 15:04:49 PST 2006

* Daniel Stone <daniel at freedesktop.org> wrote:

> Please clean up your patches before submission, next time.

This patch is *not* meant for submission, its just me current 
working branch, where I need some help ... 

I'll clean up once I get the server built.

<snip> 
> > diff -ruN xorg-server-1.0.1.orig/doc/Makefile.am xorg-server-1.0.1/doc/Makefile.am
> > --- xorg-server-1.0.1.orig/doc/Makefile.am	Tue Dec  6 23:48:48 2005
> > +++ xorg-server-1.0.1/doc/Makefile.am	Thu Feb 16 03:48:17 2006
> > @@ -5,7 +5,9 @@
> >  
> >  appman_PROCESSED = $(appman_PRE:man.pre=man)
> >  
> > -appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)
> > +appman_DATA = $(appman_PRE:man.pre=1)
> > +
> > +APP_MAN_SUFFIX = 1
> >  
> >  BUILT_SOURCES = $(appman_PROCESSED)
> 
> This is clearly bogus.

Yeah, just a quick hack to get it built. Seems that there's something 
missing in aclocal ... don't yet know a better way to fix it.

<snip>
> > diff -ruN xorg-server-1.0.1.orig/configure.ac xorg-server-1.0.1/configure.ac
> > --- xorg-server-1.0.1.orig/configure.ac	Thu Feb 16 07:07:54 2006
> > +++ xorg-server-1.0.1/configure.ac	Thu Feb 16 07:10:14 2006
> > @@ -265,13 +265,13 @@
> >  AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME", 
> >  	[Define to OS Name string to display for build OS in Xorg log])
> >  
> > -DEFAULT_VENDOR_NAME="The X.Org Foundation"
> > +DEFAULT_VENDOR_NAME="The_X.Org_Foundation"
> >  DEFAULT_VENDOR_NAME_SHORT="X.Org"
> >  DEFAULT_VERSION_MAJOR=7
> >  DEFAULT_VERSION_MINOR=0
> >  DEFAULT_VERSION_PATCH=0
> >  DEFAULT_VERSION_SNAP=0
> > -DEFAULT_RELEASE_DATE="21 December 2005"
> > +DEFAULT_RELEASE_DATE="21_December_2005"
> >  DEFAULT_VENDOR_WEB="http://wiki.x.org"
> >  
> >  m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
> 
> Why were these changed?

Also a dirty hack, required due some problems w/ cmdline parameter 
passing (probably specific to my libtool replacement ...)

<snip>
> 
> Surely the better solution would be to only build xtest1*.c when
> you need to, rather than ifdef'ing out the entire thing?

Ok. 

> 
> > diff -ruN xorg-server-1.0.1.orig/fb/fb.h xorg-server-1.0.1/fb/fb.h
> > --- xorg-server-1.0.1.orig/fb/fb.h	Thu Feb 16 17:12:26 2006
> > +++ xorg-server-1.0.1/fb/fb.h	Thu Feb 16 17:36:54 2006
> > @@ -43,7 +43,7 @@
> >  #ifdef RENDER
> >  #include "picturestr.h"
> >  #else
> > -#include "picture.h"
> > +#include "../render/picture.h"
> >  #endif
> >  
> >  /*
> 
> No.  If you require Render, then put it in CFLAGS.

hmm, would be better of course. I'm not sure where's the right place 
for it. AFAIK we have to add this only when building *without* render.

<snip>

> > diff -ruN xorg-server-1.0.1.orig/hw/xfree86/Makefile.am xorg-server-1.0.1/hw/xfree86/Makefile.am
> > --- xorg-server-1.0.1.orig/hw/xfree86/Makefile.am	Thu Feb 16 17:12:26 2006
> > +++ xorg-server-1.0.1/hw/xfree86/Makefile.am	Thu Feb 16 20:55:04 2006
> > @@ -7,7 +7,7 @@
> >  SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
> >            ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
> >  	  xf8_32bpp xf8_32wid loader scanpci dixmods exa \
> > -	  $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig
> > +	  $(DRI_SUBDIR) $(DOC_SUBDIR) getconfig
> >  
> >  DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
> >                 parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
> > @@ -37,6 +37,7 @@
> >              $(OS_LIBS) \
> >              dummylib/libdummy.a \
> >  	    dixmods/libdixmods.la \
> > +	    ../../fb/libfb.la	\
> >              @XORG_LIBS@
> >  
> >  Xorg_LDADD = $(XORG_LIBS) \
> 
> ... ?

This is the point where I'm currently experimenting on. 

The xserver fails linking because some symbols are missing, which are
found in libfb, but libfb itself also adds further dependencies ... 

I'm really not sure if this is the right way.

<snip>

> > diff -ruN xorg-server-1.0.1.orig/hw/xfree86/exa/exa.h xorg-server-1.0.1/hw/xfree86/exa/exa.h
> > --- xorg-server-1.0.1.orig/hw/xfree86/exa/exa.h	Thu Feb 16 17:12:26 2006
> > +++ xorg-server-1.0.1/hw/xfree86/exa/exa.h	Thu Feb 16 19:04:02 2006
> > @@ -30,7 +30,12 @@
> >  #include "pixmapstr.h"
> >  #include "windowstr.h"
> >  #include "gcstruct.h"
> > +
> > +#ifdef RENDER
> >  #include "picturestr.h"
> > +#else
> > +#include "../render/picturestr.h"
> > +#endif
> >  
> >  #define EXA_VERSION_MAJOR   0
> >  #define EXA_VERSION_MINOR   2
> 
> No -- see comment on fbpict.c (which I'd imagine has no business being
> built in the non-Render case).

hmm, what is this file for ? how can I come around it ?

<snip>
> 
> > diff -ruN xorg-server-1.0.1.orig/hw/xfree86/loader/xf86sym.c xorg-server-1.0.1/hw/xfree86/loader/xf86sym.c
> > --- xorg-server-1.0.1.orig/hw/xfree86/loader/xf86sym.c	Thu Feb 16 17:12:26 2006
> > +++ xorg-server-1.0.1/hw/xfree86/loader/xf86sym.c	Thu Feb 16 21:26:13 2006
> > @@ -475,7 +475,9 @@
> >      SYMFUNC(xf86CommonSpecialKey)
> >      SYMFUNC(xf86IsPc98)
> >      SYMFUNC(xf86DisableRandR)
> > +#ifdef RENDER
> >      SYMFUNC(xf86GetRotation)
> > +#endif
> 
> ... RANDR ...

Ok, fixed it.

<snip>

> There doesn't seem to be much at all (if anything) left of xaaPict.c
> after these ifdefs, again ...

Ok, changed appropriate Makefile.am ...

<snip>

> No (don't build).

Ok, fixed Makefile.am

I still dont get the server linked :(( 

cu
-- 
---------------------------------------------------------------------
 Enrico Weigelt    ==   metux IT service
  phone:     +49 36207 519931         www:       http://www.metux.de/
  fax:       +49 36207 519932         email:     contact at metux.de
---------------------------------------------------------------------
  Realtime Forex/Stock Exchange trading powered by postgresSQL :))
                                            http://www.fxignal.net/
---------------------------------------------------------------------