Re: Advance warning of ARM patch

1999-09-22 Thread Jim Pick
Another small problem,

xc/config/xfree86.cf needs:

#define XF68FBDevPermedia2  NO

for ARM.

I'll attach a replacement 000a_xfree86.cf.diff patch.

Cheers,

 - Jim


--- xc/config/cf/xfree86.cf.origWed Sep 15 23:11:53 1999
+++ xc/config/cf/xfree86.cf Wed Sep 15 23:17:14 1999
@@ -29,37 +29,37 @@
  */
 #ifdef i386Architecture
 #ifndef XF86SVGAServer
-#define XF86SVGAServer  YES
+#define XF86SVGAServer YES
 #endif
 #ifndef XF86VGA16Server
-#define XF86VGA16Server YES
+#define XF86VGA16ServerYES
 #endif
 #ifndef XF86VGA16DualServer
 #define XF86VGA16DualServerYES
 #endif
 #ifndef XF86MonoServer
-#define XF86MonoServer  YES
+#define XF86MonoServer YES
 #endif
 #ifndef XF86MonoDualServer
 #define XF86MonoDualServer YES
 #endif
 #ifndef XF86S3Server
-#define XF86S3ServerYES
+#define XF86S3Server   YES
 #endif
 #ifndef XF86S3VServer
 #define XF86S3VServer  YES
 #endif
 #ifndef XF86I8514Server
-#define XF86I8514Server YES
+#define XF86I8514ServerYES
 #endif
 #ifndef XF86Mach8Server
-#define XF86Mach8Server YES
+#define XF86Mach8ServerYES
 #endif
 #ifndef XF86Mach32Server
-#define XF86Mach32ServerYES
+#define XF86Mach32Server   YES
 #endif
 #ifndef XF86Mach64Server
-#define XF86Mach64ServerYES
+#define XF86Mach64Server   YES
 #endif
 #ifndef XF86P9000Server
 #define XF86P9000ServerYES
@@ -109,6 +109,9 @@
 #ifndef XF86SVGAServer
 #define XF86SVGAServer YES
 #endif
+#ifndef XF86VGA16Server
+#define XF86VGA16ServerYES
+#endif
 #ifndef XF86MonoServer
 #define XF86MonoServer YES
 #endif
@@ -117,12 +120,15 @@
 #endif
 #if defined(LinuxArchitecture)
 #ifndef XF86FBDevServer
-#define XF86FBDevServerYES
+#define XF86FBDevServerYES
 #endif
 #endif
 #ifndef XF86SvgaDrivers
 #define XF86SvgaDriversmga s3v
 #endif
+#ifndef XF86Vga16Drivers
+#define XF86Vga16Drivers   generic
+#endif
 #ifndef XF86Vga2Drivers
 #define XF86Vga2Driversgeneric
 #endif
@@ -135,32 +141,64 @@
 #ifdef Mc68020Architecture
 #ifndef XF68FBDevServer
 #define XF68FBDevServerYES
+#define XF68FBDev77C32 NO
+#define XF68FBDevIMSTT NO
+#define XF68FBDevMach64NO
+#define XF68FBDevPermedia2 NO
 #endif
 #endif
 
-/* 
+/*
+ * For ARM platforms, the default is to build all X servers which
+ * are supported on this platform.
+ */
+#ifdef ArmArchitecture
+#ifndef XF68FBDevServer
+#define XF68FBDevServerYES
+#define XF68FBDevCFB8  YES
+#define XF68FBDevCFB16 YES
+#define XF68FBDevCFB24 YES
+#define XF68FBDevCFB32 YES
+#define XF68FBDevIPLAN2p2  NO
+#define XF68FBDevIPLAN2p4  NO
+#define XF68FBDevIPLAN2p8  NO
+#define XF68FBDevILBM  NO
+#define XF68FBDevAFB   NO
+#define XF68FBDev77C32 NO
+#define XF68FBDevMach64NO
+#define XF68FBDevIMSTT NO
+#define XF68FBDevPermedia2 NO
+#endif
+#endif
+
+/*
  * For Mips/Arc platforms, the default is to build all X servers which
- * are supported on this platform. 
+ * are supported on this platform.
  */
 #ifdef ArcArchitecture
 #ifndef XF86S3Server
-#define XF86S3Server  YES
+#define XF86S3Server   YES
+#endif
+#if defined(LinuxArchitecture)
+#ifndef XF86FBDevServer
+#define XF86FBDevServerYES
+#endif
 #endif
 #endif
 
-/* 
+/*
  * For PowerPC platforms, the default is to build all X servers which
- * are supported on this platform. 
+ * are supported on this platform.
  */
 #ifdef PowerPCArchitecture
 #ifndef XF86SVGAServer
-#define XF86SVGAServerNO
+#define XF86SVGAServer NO
 #endif
 #ifndef XF86VGA16Server
-#define XF86VGA16Server   NO
+#define XF86VGA16ServerNO
 #endif
 #ifndef XF86S3Server
-#define XF86S3Server  NO
+#define XF86S3Server   NO
 #endif
 #ifndef XF68FBDevServer
 #define XF68FBDevServerYES
@@ -174,10 +212,21 @@
 #define XF68FBDevILBM  NO
 #define XF68FBDevAFB   YES
 #define XF68FBDev77C32 YES
-#define XF68FBDevMach64YES
 #define XF68FBDevIMSTT YES
+#define XF68FBDevMach64YES
+#define XF68FBDevPermedia2 YES
+#endif
+#endif
+
+/* For SPARC PCI platforms, the default is to build all X servers which are
+ * supported on this platform.
+ */
+#ifdef SparcArchitecture
+#ifndef XF86Mach64Server
+#define XF86Mach64Server   YES
 #endif
 #endif
+
 /*
  * The following disables all X servers not already enabled above
  */
@@ -430,7 +479,7 @@
  */
 #ifndef XF86SvgaDrivers
 # ifdef AlphaArchitecture
-#  define XF86SvgaDrivers  mga tvga8900 s3v
+#  define XF86SvgaDrivers  mga tvga8900 s3v nv
 # else
 #  if defined(LinuxArchitecture)
 #   define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvg

Advance warning of ARM patch

1999-09-22 Thread Jim Pick
Hi Branden,

I'm trying to build your latest X for ARM.

It looks like you left out one of my patches.  The missing patch was
026_arm_XtOffset.diff.  I'll include it again at the end of this
email.

It fixes an upstream bug - but I'm not sure what the best way to fix
it is because I don't know why they're doing what they are doing in
the first place.  It's probably to compensate for some non-Linux ARM
platform.  But for Debian, the patch should be OK.

I'm going to try to build it right now with the new patch included.
It takes a few hours to build.

Thanks for integrating the ARM stuff!

Cheers,

 - Jim

--- Intrinsic.h.originalTue Aug 17 22:16:01 1999
+++ xc/lib/Xt/Intrinsic.h   Tue Aug 17 22:16:27 1999
@@ -2059,7 +2059,7 @@
 #define XtDefaultFont  "XtDefaultFont"
 #define XtDefaultFontSet   "XtDefaultFontSet"
 
-#if defined(CRAY) || defined(__arm) || defined(__ACK)
+#if defined(CRAY) || defined(__ACK)
 #if __STDC__ && !defined(__ACK)
 #define XtOffset(p_type,field) _Offsetof(p_type,field)
 #else
@@ -2073,7 +2073,7 @@
 
 #endif /* !CRAY2 */
 #endif  /* __STDC__ */
-#else  /* ! (CRAY || __arm || __ACK) */
+#else  /* ! (CRAY || __ACK) */
 
 #define XtOffset(p_type,field) \
((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))


Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.

1999-09-22 Thread Ben Collins
On Wed, Sep 22, 1999 at 03:23:10PM +0200, Sven LUTHER wrote:
> On Tue, Sep 21, 1999 at 07:53:00PM +0200, Hartmut Koptein wrote:
> > > > And another mistake in the patch, should have waited a bit more before 
> > > > posting,
> > > > but since i was going away, i wanted to make things available.
> > > > 
> > > > Anyway, the build process breaks again læter, didn't have time to check 
> > > > it out
> > > > though.
> > > > 
> > > > So the correct patch for the mach64 stuff follows.
> > > 
> > > Could you try the 3.3.5 source that was installed yesterday? It built fine
> > > on sparc (which 3.3.4-2 didn't do).
> > 
> > No, 3.3.5 is also broken:
> > 
> > 
> > rm -f mach64im.o
> > gcc -c -O2 -fsigned-char  
> > -I../../../../../programs/Xserver/hw/xfree86/common -I.
> 
> Yes,
> 
> Noticed that also, 
> 
> I have a patch and are compiling right no will upload everything tomorrow.
> 
> ( notice that the patch is the part of the patch i posted previously, the one
>   commenting out regwbe in mach64im.c)

As I said before commenting that out will break sparc, please add "#ifdef
__sparc__" around the function instead.

Ben


Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.

1999-09-22 Thread Sven LUTHER
On Tue, Sep 21, 1999 at 07:53:00PM +0200, Hartmut Koptein wrote:
> > > And another mistake in the patch, should have waited a bit more before 
> > > posting,
> > > but since i was going away, i wanted to make things available.
> > > 
> > > Anyway, the build process breaks again læter, didn't have time to check 
> > > it out
> > > though.
> > > 
> > > So the correct patch for the mach64 stuff follows.
> > 
> > Could you try the 3.3.5 source that was installed yesterday? It built fine
> > on sparc (which 3.3.4-2 didn't do).
> 
> No, 3.3.5 is also broken:
> 
> 
> rm -f mach64im.o
> gcc -c -O2 -fsigned-char  -I../../../../../programs/Xserver/hw/xfree86/common 
> -I.

Yes,

Noticed that also, 

I have a patch and are compiling right no will upload everything tomorrow.

( notice that the patch is the part of the patch i posted previously, the one
  commenting out regwbe in mach64im.c)

Friendly,

Sven LUTHER


xfree86-1_3.3.5 compiles on m68k

1999-09-22 Thread Christian T. Steigies
On Tue, 21 Sep 1999, Branden Robinson wrote:

> On Tue, Sep 21, 1999 at 07:53:00PM +0200, Hartmut Koptein wrote:
> > No, 3.3.5 is also broken:
> 
> Damn.
> 
> I'd like to hear how m68k fares.
In principle, it compiles fine. All my patches seem to have gone in, thanks
Branden, just a few small problems are left:

arch detection:

[EMAIL PROTECTED]:/build/xfree86/xfree86-1-3.3.5>./debian/rules environment
Package build environment (not all variables may be set):
$(ARCH) is m68k
$(DEB_HOST_ARCH) is 
$(BUILD_ARCH) is m68k
$(ARCH_MAP) is m68k
$(L6FLAGS) is -DLinuxCLibMajorVersion=6 -DLinuxCLibMinorVersion=1
$(L5FLAGS) is -DLinuxCLibMajorVersion=5 -DLinuxCLibMinorVersion=4
-DShLibDir=/usr/lib/libc5-compat -DUsrLibDir=/usr/m68k-linuxlibc1/lib
-DBinDir=/usr/m68k-linuxlibc1/bin -DIncRoot=/usr/m68k-linuxlibc1/include
$(DOCOMPAT) is build-old
Required packages for build: gcc flex libc6-dev zlib1g-dev libncurses4-dev
tcl8.0-dev tk8.0-dev lynx findutils altgcc libc5-altdev

Branden, if you want to check this yourself and experiment where it fails,
just swap m68k and i386 in rules, ie pretend that i386 needs the ohter glibc
and youll notice just the same problem.
I still propose that you go back to your 3.3.3.1 concept for arch
detection/glibc settings, IIRC 
  if($ARCH==m68k) LinuxCLibMinorVersion=0
  else...
that one worked fine.

building xfree-3.3.5 went fine (after I hacked ClibMinor to 0), but the
create-compat* scripts are still not called:
 dpkg-genchanges: error: package xlib6-altdev in control file but not in files 
list
I could create them by hand, they are somehow forgotten in debian/rules.

I could install the packages, was asked nicely about XF86Config, mouse and
Xmodmap contains entries for m68k/Amiga. so far everything looks ok. Now I
am rebuilding the whole thing with gcc272 instead of gcc-2.95, I get the
same messages I allready posted here, some bug in gcc or xfree, I dont know,
xfree-3.3.4 works when compiled with gcc272.

Ciao,
Christian.


Re: Installing an X fonts package to a new FontPath.

1999-09-22 Thread Ralph Giles
On Tue, 14 Sep 1999, Branden Robinson wrote:
>> We can consider about the case of gsfonts-x11.  Ghostscript's type1
>> fonts can be shared by ghostscript and X11.  (I really like this type
>> of sharings.)  There seems to be no way for gsfonts-x11 to meet your
>> proposal.

> I don't see why not.  You could ship a bunch of symlinks from
> /usr/X11R6/lib/X11/fonts/Type1/* to wherever gsfonts-x11 keeps them.

I was just browsing the archives, and noticed your recent request for more
feedback. Coincidentally, I was just thinking about this today. :)

I'd actually prefer to see the Type1 and Truetype fonts in a
/usr/share/fonts, and symlinked into /usr/X11R6/. Both of these formats
are broadly useful to a variety of software, and by no means exclusive to
X. They're architecture independent as well, so /usr/share seems like a
good place. This idea also helps aesthetically in providing a symmetric
place to install local fonts. (a must, IMHO, given the poor quality of
available DFSG-free display fonts)

I suppose this moves things up a level policy-wise, but I think it's the
best thing to do. The FHS doesn't seem to specify anything on the subject.

> BTW, if Type1 fonts like this are truly sharable, I don't see much point
> in naming the package "gsfonts-x11", but maybe that's just me.  If I get
> started ranting on people's illogical and inconsistent package names,
> I'll never stop.  And we've all seen how gracefully dpkg handles package
> renames (not).

See, my proposal gets rid of the need for such packages! =)

> I'll clarify the proposal that symlinks are acceptable as long as
> /usr/X11R6/lib/fonts/ is not otherwise cluttered with directories.

You mean /usr/X11R6/lib/X11/fonts/ ?

Down at the wishlist level, I'd like to see some way to break font
collections into directories. Things quickly get unwieldy and it would be 
nice to have an obvious indication of what fonts came from where.

Cheers,
 -ralph

--
[EMAIL PROTECTED]
please cc me on replys, I'm not subscribed to the list


Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.

1999-09-22 Thread Branden Robinson
On Tue, Sep 21, 1999 at 07:53:00PM +0200, Hartmut Koptein wrote:
> No, 3.3.5 is also broken:

Damn.

I'd like to hear how m68k fares.

And, dare I ask, ARM?

-- 
G. Branden Robinson  |
Debian GNU/Linux |   The noble soul has reverence for itself.
[EMAIL PROTECTED]   |   -- Friedrich Nietzsche
cartoon.ecn.purdue.edu/~branden/ |


pgpB71xyMmhAg.pgp
Description: PGP signature


Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.

1999-09-22 Thread Branden Robinson
On Tue, Sep 21, 1999 at 03:14:46PM +0200, Sven LUTHER wrote:
> On Tue, Sep 21, 1999 at 05:04:58AM -0400, Ben Collins wrote:
> > Could you try the 3.3.5 source that was installed yesterday? It built fine
> > on sparc (which 3.3.4-2 didn't do).
> 
> Ok, i will download the source, and build it this evening,
> 
> do you know if the afb bug fix i submitted was included ?

The changelog was posted to debian-x, and also to debian-devel-changes when
the package was installed...

-- 
G. Branden Robinson  |Never underestimate the power of human
Debian GNU/Linux |stupidity.
[EMAIL PROTECTED]   |-- Robert Heinlein
cartoon.ecn.purdue.edu/~branden/ |


pgpfVahIFlkDI.pgp
Description: PGP signature