Which code base should I use to port something to Xorg 7.4?

[Deron Johnson]

Adam Jackson wrote:
> On Tue, 2009-06-16 at 11:30 -0700, Deron Johnson wrote:
>   
>> Hi Adam. Thanks for your reply. After I received it, I spoke with the 
>> Sun X11 folks and they said that they are using the xserver-1.6-branch. They said that 
>> this was a stable, but more recent branch than the 1.5 branch. So should I be 
>> using the 1.6 branch for my work? Basically, I want to start with something that is 
>> reasonably up-to-date, but not bleeding edge.
>>     
>
> 1.6 is the most recent stable branch.  It's working pretty well here.
>
>   
>> Also, what branches of the non-xserver gits do I use to build with the 
>> xserver-1.6 branch?
>>     
>
> git master of just about everything except inputproto and libXi should
> work fine with xserver-1.6-branch.  For those two you want inputproto
> 1.5.0 and libXi 1.2.1.
>
> - ajax
>   
Thanks for the info. I set up this configuration of the source base, but 
unfortunately
the server doesn't compile. but if I disable xinerama (setenv CONFFLAGS 
--disable-xinerama)
it compiles fine. I don't need xinerama to be enabled for what I'm 
doing, but it would be
nice to compile something as close to the standard server as possible. 
Any advice? Thanks.

../doltcompile gcc -DHAVE_CONFIG_H -I. -I../include -DHAVE_DIX_CONFIG_H 
-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes 
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing 
-D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT 
-DDBUS_API_SUBJECT_TO_CHANGE -I/home/dj/xorg74/modular/include 
-I/home/dj/xorg74/modular/include/pixman-1 
-I/usr/local/include/freetype2 -I/usr/local/include -I/usr/include/hal 
-I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I../include 
-I../include -I../Xext -I../composite -I../damageext -I../xfixes -I../Xi 
-I../mi -I../miext/shadow -I../miext/damage -I../render -I../randr 
-I../fb -DVENDOR_NAME=\""The X.Org Foundation"\" -DVENDOR_RELEASE="(((1) 
* 10000000) + ((6) * 100000) + ((1) * 1000) + 901)" -g -O2 -MT 
dispatch.lo -MD -MP -MF .deps/dispatch.Tpo -c -o dispatch.lo dispatch.c
In file included from ../Xext/panoramiX.h:44,
from dispatch.c:134:
/home/dj/xorg74/modular/include/X11/extensions/panoramiXext.h:49: error: 
expected ‘)’ before ‘*’ token
/home/dj/xorg74/modular/include/X11/extensions/panoramiXext.h:54: error: 
expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before 
‘XPanoramiXQueryVersion’
/home/dj/xorg74/modular/include/X11/extensions/panoramiXext.h:64: error: 
expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘XPanoramiXGetState’
/home/dj/xorg74/modular/include/X11/extensions/panoramiXext.h:70: error: 
expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before 
‘XPanoramiXGetScreenCount’
/home/dj/xorg74/modular/include/X11/extensions/panoramiXext.h:76: error: 
expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before 
‘XPanoramiXGetScreenSize’
make[2]: *** [dispatch.lo] Error 1
make[2]: Leaving directory `/home/dj/xorg74/xserver/dix'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/dj/xorg74/xserver/dix'
make: *** [all-recursive] Error 1