I had to make a couple more changes for powerpc in the current version: debian/xlib6g.files.powerpc I removed, and moved the i386 version back to xlib6g.files. I moved the HasPlugin define in linux.cf out of the I386Architecture clause it was in, to be consistent with 3.3.6, where we build xrx on at least powerpc... I removed SuperProbe.1x from xutils.files.powerpc. I broke xlibgl-dev.files into an i386 and a powerpc version and removed libOSMesa.so. This is not the ideal fix; we SHOULD build libOSMesa on powerpc. It's a bit tricky, though. I'll try to fix it properly later. I enabled imstt and tdfx drivers in xfree86.cf, and added their manpages to xserver-xfree86.files.powerpc. I noticed while doing this that the whole usr/X11R6/lib/modules is in the powerpc files list instead of its components; is that intentional? Patches to xfree86.cf and linux.cf are attached, as well as the debian/* diff. I'm rebuilding it now to see if I made any stupid mistakes. Dan /--------------------------------\ /--------------------------------\ | Daniel Jacobowitz |__| SCS Class of 2002 | | Debian GNU/Linux Developer __ Carnegie Mellon University | | dan@debian.org | | dmj+@andrew.cmu.edu | \--------------------------------/ \--------------------------------/
--- xc/config/cf/xfree86.cf.orig Thu Aug 10 00:25:23 2000 +++ xc/config/cf/xfree86.cf Thu Aug 10 00:28:20 2000 @@ -413,7 +413,7 @@ # ifndef DevelDrivers # if XFree86Devel -# define DevelDrivers ati +# define DevelDrivers ati imstt tdfx # else # define DevelDrivers /* */ # endif --- xc/config/cf/linux.cf.orig Thu Aug 10 00:22:58 2000 +++ xc/config/cf/linux.cf Thu Aug 10 00:05:15 2000 @@ -431,10 +431,6 @@ #define LinuxMachineDefines -D__i386__ #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#if UseElfFormat -#define HasPlugin YES -#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */ -#endif #endif /* i386Architecture */ #ifdef AlphaArchitecture @@ -488,6 +484,11 @@ #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif + +#if UseElfFormat +#define HasPlugin YES +#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */ +#endif #ifndef StandardDefines #define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines
Attachment:
deb.diff.gz
Description: Binary data