*** /usr/src/XFree86.CLEAN/xc/lib/XvMC/hw/i810/I810XvMC.c	Mon Oct  1 07:17:54 2001
--- lib/XvMC/hw/i810/I810XvMC.c	Mon Oct  1 07:36:21 2001
***************
*** 2822,2828 ****
    int clipped_srcx, clipped_srcy, clipped_destx, clipped_desty;
    int clipped_srcw, clipped_srch, clipped_destw, clipped_desth;
    uint x1,y1,root_width,root_height;
!   int x2 = 0, y2 = 0;
    uint nChilds;
    int stat;
    Window win,root,parent,*pChilds;
--- 2822,2828 ----
    int clipped_srcx, clipped_srcy, clipped_destx, clipped_desty;
    int clipped_srcw, clipped_srch, clipped_destw, clipped_desth;
    uint x1,y1,root_width,root_height;
!   int x2 = 0, y2 = 0,unused;
    uint nChilds;
    int stat;
    Window win,root,parent,*pChilds;
***************
*** 2878,2884 ****
      y1 += y2;
      win = parent;
    }while(win != root);
!   XGetGeometry(display,root, &root, &d, &d, &root_width, &root_height, &d, &d);
  
    /* Left edge of Video window clipped to screen */
    extents.x1 = 0;
--- 2878,2885 ----
      y1 += y2;
      win = parent;
    }while(win != root);
!   XGetGeometry(display,root, &root, &unused, &unused,
!                &root_width, &root_height, &d, &d);
  
    /* Left edge of Video window clipped to screen */
    extents.x1 = 0;
*** /usr/src/XFree86.CLEAN/xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile	Mon Oct  1 07:39:38 2001
--- programs/Xserver/hw/xfree86/drivers/i810/Imakefile	Mon Oct  1 07:40:18 2001
***************
*** 7,25 ****
  #include <Server.tmpl>
  
  #if BuildXF86DRI
! DRISRCS = i810_dri.c
! DRIOBJS = i810_dri.o
  DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri \
  	-I$(XF86OSSRC)/linux/drm/kernel -I$(TOP)/include
  DRIDEFINES = $(GLX_DEFINES)
  #endif
  
  SRCS = 	i810_driver.c i810_cursor.c i810_accel.c i810_io.c	\
! 	i810_memory.c i810_wmark.c i810_dga.c i810_video.c i810_hwmc.c \
  	$(DRISRCS)
  
  OBJS = 	i810_driver.o i810_cursor.o i810_accel.o i810_io.o	\
! 	i810_memory.o i810_wmark.o i810_dga.o i810_video.o i810_hwmc.o \
  	$(DRIOBJS)
  
  #if defined(XF86DriverSDK)
--- 7,25 ----
  #include <Server.tmpl>
  
  #if BuildXF86DRI
! DRISRCS = i810_dri.c i810_hwmc.c
! DRIOBJS = i810_dri.o i810_hwmc.o
  DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri \
  	-I$(XF86OSSRC)/linux/drm/kernel -I$(TOP)/include
  DRIDEFINES = $(GLX_DEFINES)
  #endif
  
  SRCS = 	i810_driver.c i810_cursor.c i810_accel.c i810_io.c	\
! 	i810_memory.c i810_wmark.c i810_dga.c i810_video.c \
  	$(DRISRCS)
  
  OBJS = 	i810_driver.o i810_cursor.o i810_accel.o i810_io.o	\
! 	i810_memory.o i810_wmark.o i810_dga.o i810_video.o \
  	$(DRIOBJS)
  
  #if defined(XF86DriverSDK)