xorg-server-1.4 vs. Mesa-7.0.1 (with GLX) again

[James Richard Tyrer]

I am very puzzled as I think that I got this to build before.

But, IAC, it now fails with this error:

make[2]: Entering directory `/usr/src/Xorg/xorg-server-1.4/hw/xgl'
Making all in .
make[3]: Entering directory `/usr/src/Xorg/xorg-server-1.4/hw/xgl'
/usr/local/bin/gcc -DHAVE_CONFIG_H -I. -I../../include 
-I/usr/gnome-2/include -I/usr/include/mysql 
-I/usr/local/BerkeleyDB.4.6/include  -DHAVE_DIX_CONFIG_H -Wall 
-Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes 
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing 
-DDBUS_API_SUBJECT_TO_CHANGE -D_BSD_SOURCE -DHAS_FCHOWN 
-DHAS_STICKY_DIR_BIT -I/usr/include/freetype2 -I/usr/include/hal 
-I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include 
-I/usr/local/include/pixman-1 -I/usr/X11R7/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 
-DHAVE_XGL_CONFIG_H -DHAVE_DIX_CONFIG_H -I../../GL/glx 
-I../../GL/include -I/usr/src/Mesa-7.0.1/include 
-I/usr/src/Mesa-7.0.1/src/mesa/glapi -I/usr/local/include 
-I/usr/X11R7/include   -march=athlon -mtune=athlon -O2 
-m128bit-long-double -MT xglinput.o -MD -MP -MF .deps/xglinput.Tpo -c -o 
xglinput.o xglinput.c
xglinput.c: In function 'xglMouseProc':
xglinput.c:56: warning: 'miPointerGetMotionBufferSize' is deprecated 
(declared at ../../mi/mipointer.h:99)
xglinput.c:56: error: too few arguments to function 
'InitPointerDeviceStruct'
xglinput.c: In function 'xglInitInput':
xglinput.c:261: warning: implicit declaration of function 
'miRegisterPointerDevice'
xglinput.c:261: warning: nested extern declaration of 
'miRegisterPointerDevice'
xglinput.c:262: error: too many arguments to function 'mieqInit'
make[3]: *** [xglinput.o] Error 1
make[3]: Leaving directory `/usr/src/Xorg/xorg-server-1.4/hw/xgl'

Google came up with some information.  I applied a patch to: "xglinput"

--- a/hw/xgl/xglinput.c
+++ b/hw/xgl/xglinput.c
@@ -51,9 +51,9 @@ xglMouseProc (DeviceIntPtr pDevice,
         InitPointerDeviceStruct (pDev,
                                  map,
                                  NUM_BUTTONS,
-                                miPointerGetMotionEvents,
+                                GetMotionHistory,
                                  (PtrCtrlProcPtr) NoopDDA,
-                                miPointerGetMotionBufferSize ());
+                                0, 2);
         break;
      case DEVICE_ON:
         pDev->on = TRUE;
@@ -259,5 +259,5 @@ xglInitInput (int argc, char **argv)
      RegisterKeyboardDevice (pKeyboard);

      miRegisterPointerDevice (screenInfo.screens[0], pPointer);
-    mieqInit (&pKeyboard->public, &pPointer->public);
+    mieqInit ();
  }

but it resulted in another problem:

mv -f .deps/xglshm.Tpo .deps/xglshm.Po
/usr/local/bin/gcc -DHAVE_CONFIG_H -I. -I../../include 
-I/usr/gnome-2/include -I/usr/include/mysql 
-I/usr/local/BerkeleyDB.4.6/include  -DHAVE_DIX_CONFIG_H -Wall 
-Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes 
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing 
-DDBUS_API_SUBJECT_TO_CHANGE -D_BSD_SOURCE -DHAS_FCHOWN 
-DHAS_STICKY_DIR_BIT -I/usr/include/freetype2 -I/usr/include/hal 
-I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include 
-I/usr/local/include/pixman-1 -I/usr/X11R7/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 
-DHAVE_XGL_CONFIG_H -DHAVE_DIX_CONFIG_H -I../../GL/glx 
-I../../GL/include -I/usr/src/Mesa-7.0.1/include 
-I/usr/src/Mesa-7.0.1/src/mesa/glapi -I/usr/local/include 
-I/usr/X11R7/include   -march=athlon -mtune=athlon -O2 
-m128bit-long-double -MT xglcompose.o -MD -MP -MF .deps/xglcompose.Tpo 
-c -o xglcompose.o xglcompose.c
xglcompose.c: In function 'xglCompositeGeneral':
xglcompose.c:134: error: 'union _SourcePict' has no member named 'source'
xglcompose.c:172: error: 'union _SourcePict' has no member named 'source'
make[3]: *** [xglcompose.o] Error 1
make[3]: Leaving directory `/usr/src/Xorg/xorg-server-1.4/hw/xgl'

There is a union: "_SourcePict" in the file: "picturestr.h" and it 
doesn't have a member named "source".

So, it appears that there is something wrong with this union:

typedef union _SourcePict {
     unsigned int type;
     PictSolidFill solidFill;
     PictGradient gradient;
     PictLinearGradient linear;
     PictRadialGradient radial;
     PictConicalGradient conical;
} SourcePict, *SourcePictPtr;

If the only problem is that an entry is missing, this is a simple fix 
but I don't know the correct type for "source".

-- 
JRT