> > > > I'm a bit rusty on the DRM but it looks like the changes are minor so > > I may do the updates unless someone beats me to it, or indicates > > there's a reason for things as they are. > > I'm still catching up on email from the holiday weekend, but I plan to import > a new libdrm into the monolith this week.
I've just "aligned" the xf86drm.h in libdrm with the X one, the libdrm one is the master, the X one in monolith programs/Xserver/hw/xfree86/os-support should really be symlinked across to the extras one using Imakery, patch below, along with nuking the current one.. there is also an xf86drm.h in Mesa sources but we don't use it anymore, it should be removed... Dave. -- David Airlie, Software Engineer http://www.skynet.ie/~airlied / airlied at skynet.ie Linux kernel - DRI, VAX / pam_smb / ILUG Index: programs/Xserver/hw/xfree86/os-support/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v retrieving revision 1.5 diff -u -r1.5 Imakefile --- programs/Xserver/hw/xfree86/os-support/Imakefile 8 Nov 2005 06:33:29 -0000 1.5 +++ programs/Xserver/hw/xfree86/os-support/Imakefile 29 Nov 2005 09:27:39 -0000 @@ -125,3 +125,5 @@ InstallDriverSDKNonExecFile(xf86drm.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(xf86drmCompat.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(assyntax.h,$(DRIVERSDKINCLUDEDIR)) + +LinkSourceFile(xf86drm.h,$(DRMSRCDIR)/libdrm) ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel