I can do the trunk merge for you, if you want to fixup the code later. Alan.
On Wed, Jun 26, 2002 at 11:45:51AM +0100, José Fonseca wrote: > Last night the script tried to build the s3virge binary snapshot for the > first time, but it failed when building a file related with the i830 > driver: > > gcc -O2 -ansi -Wall -Wpointer-arith -Wstrict-prototypes > -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -pipe -g > -fno-merge-constants > -I../../../../../../../programs/Xserver/hw/xfree86/common > -I../../../../../../../programs/Xserver/hw/xfree86/os-support -I. > -I../../../../../../../programs/Xserver/include > -I../../../../../../../exports/include/X11 > -I../../../../../../../include/extensions -I../.. -Ikernel > -I../../../../../../.. -I../../../../../../../exports/include > -I/usr/X11R6/include -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L > -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE > -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY -DTOGCUP > -DXF86BIGFONT -DDPMSExtension -DPANORAMIX -DRENDER -DGCCUSESGAS > -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXFreeXDGA -DXvExtension > -DXFree86LOADER -DXFree86Server -DXF86VIDMODE -DXvMCExtension > -DSMART_SCHEDULE -DBUILDDEBUG -DX_BYTE_ORDER=X_LITTLE_ENDIAN -DNDEBUG > -DFUNCPROTO=15 -DNARROWPROTO -DIN_MODULE -DXFree86Module > -DHAS_MTRR_SUPPORT -DGLXEXT -DXF86DRI -DGLX_DIRECT_RENDERING > -DGLX_USE_DLOPEN -DGLX_USE_MESA -c xf86drmI830.c > xf86drmI830.c: In function `drmI830CleanupDma': > xf86drmI830.c:55: `drm_i830_init_t' undeclared (first use in this function) > xf86drmI830.c:55: (Each undeclared identifier is reported only once > xf86drmI830.c:55: for each function it appears in.) > xf86drmI830.c:55: parse error before `init' > xf86drmI830.c:57: `init' undeclared (first use in this function) > xf86drmI830.c:60: `DRM_IOCTL_I830_INIT' undeclared (first use in this > function) > xf86drmI830.c: In function `drmI830InitDma': > xf86drmI830.c:69: `drm_i830_init_t' undeclared (first use in this function) > xf86drmI830.c:69: parse error before `init' > xf86drmI830.c:71: `init' undeclared (first use in this function) > xf86drmI830.c:91: `DRM_IOCTL_I830_INIT' undeclared (first use in this > function) > make[8]: *** [xf86drmI830.o] Error 1 > rm -f xf86drmS3V.o > > And the packaging script fails since it can't find libdrm.a. > > Max, is there any file related to i830 missing or outdated in the > s3virge branch? Or perhaps the i830 driver should be disabled on this > branch. > > José Fonseca > > > ------------------------------------------------------- > This sf.net email is sponsored by: Jabber Inc. > Don't miss the IM event of the season | Special offer for OSDN members! > JabConf 2002, Aug. 20-22, Keystone, CO http://www.jabberconf.com/osdn > _______________________________________________ > Dri-devel mailing list > [EMAIL PROTECTED] > https://lists.sourceforge.net/lists/listinfo/dri-devel ------------------------------------------------------- This sf.net email is sponsored by: Jabber Inc. Don't miss the IM event of the season | Special offer for OSDN members! JabConf 2002, Aug. 20-22, Keystone, CO http://www.jabberconf.com/osdn _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel