Multi Pointer X MPX Build problem

[Roland Scheidegger]

Nikolas Doerfler wrote:
> Peter Hutterer wrote:
>> Nikolas Dörfler wrote:
>>> gcc -DHAVE_DIX_CONFIG_H -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS 
>>> -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/tmp/modular//include -I/tmp/modular//include/pixman-1 
>>> -I/usr/include/freetype2 -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 -g -O2 -o Xvfb InitInput.o InitOutput.o
>>> dpmsstubs.o stubs.o miinitext.o ../../fb/.libs/libfb.a
>>> ../../xfixes/.libs/libxfixes.a ../../Xext/.libs/libXext.a
>>> ../../dbe/.libs/libdbe.a ../../XTrap/.libs/libxtrap.a
>>> ../../record/.libs/librecord.a ../../GL/glx/.libs/libglx.a
>>> ../../GL/mesa/.libs/libGLcore.a ../../render/.libs/librender.a
>>> ../../randr/.libs/librand
>> r.
>>> a ../../damageext/.libs/libdamageext.a 
>>> ../../miext/damage/.libs/libdamage.a 
>>> ../../miext/shadow/.libs/libshadow.a ../../Xi/.libs/libXi.a 
>>> ../../xkb/.libs/libxkb.a ../../xkb/.libs/libxkbstubs.a 
>>> ../../composite/.libs/libcomposite.a ../../dix/.libs/libxpstubs.a
>>>  ../../os/.libs/libcwrapper.a libfbcmap.a
>>> ../../dix/.libs/libdix.a ../../config/libconfig.a
>>> ../../mi/.libs/libmi.a ../../os/.libs/libos.a -L/tmp/modular//lib
>>> -L/lib /tmp/modular//lib/libXfont.so /usr/lib/libfreetype.so 
>>> /tmp/modular//lib/libXau.so /tmp/modular/lib/libfontenc.so -lz 
>>> /tmp/modular/lib/libpixman-1.so /usr/lib/libhal.so 
>>> /usr/lib/libusb.so -ldl -luuid -ldbus-1 
>>> /tmp/modular//lib/libXdmcp.so -lcrypto -lm -lrt   -Wl,--rpath 
>>> -Wl,/tmp/modular//lib -Wl,--rpath -Wl,/tmp/modular/lib
>>> -Wl,--rpath -Wl,/tmp/modular//lib -Wl,--rpath
>>> -Wl,/tmp/modular/lib 
>>> ../../GL/glx/.libs/libglx.a(indirect_dispatch.o): In function 
>>> `__glXDisp_ProgramParameter4fvNV': 
>>> /home/doerflen/mpx/xserver/GL/glx/indirect_dispatch.c:5190: 
>>> undefined reference to `CALL_ProgramParameter4fvNV' 
>>> ../../GL/glx/.libs/libglx.a(indirect_dispatch.o): In function 
>>> `__glXDisp_ProgramParameter4dvNV': 
>>> /home/doerflen/mpx/xserver/GL/glx/indirect_dispatch.c:5181: 
>>> undefined reference to `CALL_ProgramParameter4dvNV' 
>>> ../../GL/glx/.libs/libglx.a(indirect_dispatch_swap.o): In
>>> function `__glXDispSwap_ProgramParameter4fvNV': 
>>> /home/doerflen/mpx/xserver/GL/glx/indirect_dispatch_swap.c:5346: 
>>> undefined reference to `CALL_ProgramParameter4fvNV' 
>>> ../../GL/glx/.libs/libglx.a(indirect_dispatch_swap.o): In
>>> function `__glXDispSwap_ProgramParameter4dvNV': 
>>> /home/doerflen/mpx/xserver/GL/glx/indirect_dispatch_swap.c:5337: 
>>> undefined reference to `CALL_ProgramParameter4dvNV'
>> tbh, I don't know if that is really an issue with MPX. I get the
>> same error (I usually --disable-glx on configure). Not quite sure
>> how to fix it, pulling master stuff now. If it happens there too,
>> I'll have to defer to someone else :)
>> 
> 
>> These CALL_ProgramParameter4xyNV functions no longer exist (due to 
>> changes which eliminated the corresponding gl functions, since they
>> are identical to some ARB functions). Regenerating the server glx
>> protocol (which was done for xserver master) from the mesa master
>> branch (in the glapi directory) should probably fix this (or pull
>> in the glx changes
>>> from xserver master).
> 
>> Roland
> 
> Hi, I tried to manually copy the changed files from the xserver
> master branch. But this caused further errors. How can I get these
> changes done automatically?
> 
>>> Regenerating the server glx protocol (which was done for xserver
>>> master) from the mesa master branch (in the glapi directory)
>>> should probably fix this (or pull in the glx changes from xserver
>>> master).
> 
> When I'm doing a
> 
> git pull . master
> 
> in xserver ( mpx branch ) I'm getting a lot of conflicting files. My
> impression is now that I have to wait until MPX is merged into master
> which   might be to long since I need MPX for my diploma thesis.
> 
> 
> Am I on the right way for solving these problems? Unfortunatly I'm
> not very experienced in using git.
> 
> Btw: Has anybody successfully built MPX? Thanks for your help.
> 
> Cheers Niko Doerfler

Peter has merged xserver master into mpx so these problems are hopefully
solved.
Otherwise, regenerating these xserver glx files from mesa is simple,
simply do a "make server" in the src/mesa/glapi directory. Though there
could be other interface changes, so it might not work for some branches.
If you only wanted to port these changes from the xserver master branch,
you shouldn't copy the files, rather use git-cherry-pick to apply only
the relevant changes.

Roland