Merge branch 'sunweaver-pr/fix-ftbfs-on-hppa' into 3.6.x

debian/patches/016_nx-X11_install-location.debian.patch

@@ -14,7 +14,7 @@ Last-Update: 2017-02-08
 
 --- a/nx-X11/config/cf/Imake.tmpl
 +++ b/nx-X11/config/cf/Imake.tmpl
-@@ -734,7 +734,7 @@
+@@ -736,7 +736,7 @@
  #define AlternateUsrLibDir YES
  #endif
  #else
@@ -23,7 +23,7 @@ Last-Update: 2017-02-08
  #ifndef AlternateUsrLibDir
  #define AlternateUsrLibDir NO
  #endif
-@@ -752,7 +752,7 @@
+@@ -754,7 +754,7 @@
  #define AlternateUsrDataDir YES
  #endif
  #else

nx-X11/config/cf/Imake.cf

@@ -184,6 +184,12 @@
 #  undef __vax__
 #  define VaxArchitecture
 # endif
+# ifdef __hppa__
+#  ifndef HPArchitecture
+#   define HPArchitecture
+#  endif
+#  undef __hppa__
+# endif /* __hppa__ */
 #endif /* OpenBSD */
 
 /* Systems based on kernel of OpenBSD */
@@ -890,6 +896,12 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 #  undef MIPSEL
 #  undef _MIPSEL
 # endif
+# ifdef __hppa__
+#  ifndef HPArchitecture
+#   define HPArchitecture
+#  endif
+#  undef __hppa__
+# endif /* __hppa__ */
 # ifdef __sh__
 #  ifndef SuperHArchitecture
 #   define SuperHArchitecture

nx-X11/config/cf/Imake.tmpl

@@ -507,6 +507,8 @@ XCOMM the platform-specific parameters - edit site.def to change
 #define ByteOrder		X_BIG_ENDIAN
 #elif defined(PpcArchitecture) || defined(Ppc64Architecture)
 #define ByteOrder		X_BIG_ENDIAN
+#elif defined(HPArchitecture)
+#define ByteOrder		X_BIG_ENDIAN
 #elif defined(SuperHArchitecture)
 #define ByteOrder		X_LITTLE_ENDIAN
 #elif defined(SuperHebArchitecture)

nx-X11/config/cf/linux.cf

@@ -537,6 +537,13 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #   define LdCmd		CcCmd -nostdlib -Wl,"-m alpha"
 #   define AsmDefines		-DUSE_GAS -U__ELF__
 #  endif /* AlphaArchitecture */
+#  ifdef HPArchitecture
+#   define CcCmd               gcc
+#   define CplusplusCmd                g++
+#   define AsCmd               CcCmd -c -x assembler
+#   define LdCmd               CcCmd -nostdlib
+#   define AsmDefines          -DUSE_GAS -U__ELF__
+#  endif /* HPArchitecture */
 #  ifdef i386Architecture
 #   define CcCmd		gcc -b i486-linuxaout
 #   define CplusplusCmd		g++ -b i486-linuxaout
@@ -575,6 +582,13 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #   define AsmDefines		-D__ELF__
 #   define CplusplusCmd		c++ -b alpha-linux
 #  endif /* AlphaArchitecture */
+#  ifdef HPArchitecture
+#   define CcCmd		gcc
+#   define CplusplusCmd		g++
+#   define AsCmd		CcCmd -c -x assembler
+#   define LdCmd		CcCmd -nostdlib
+#   define AsmDefines		-D__ELF__
+#  endif /* HPArchitecture */
 #  ifdef i386Architecture
 #   define CcCmd		gcc -b i486-linux
 #   define AsCmd		CcCmd -c -x assembler
@@ -676,6 +690,13 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 # endif
 #endif /* AlphaArchitecture */
 
+#ifdef HPArchitecture
+# define OptimizedCDebugFlags	-O2  GccAliasingArgs
+# define LinuxMachineDefines	-D__hppa__
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+#endif /* HPArchitecture */
+
 #ifdef Arm32Architecture
 # define DefaultCCOptions
 # ifndef OptimizedCDebugFlags

nx-X11/config/cf/xorg.cf

@@ -244,7 +244,7 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
     defined(Sparc64Architecture) || defined(MipsArchitecture) || \
     defined(AlphaArchitecture) || defined(PpcArchitecture) || \
     defined(Mc68020Architecture) || defined(Arm32Architecture) || \
-    defined(SuperHArchitecture)
+    defined(HPArchitecture) || defined(SuperHArchitecture)
 # ifndef XorgServer
 #  define XorgServer		YES
 # endif

nx-X11/extras/Mesa.patches_6.4.1/4004_define-USE_IEEE-macro-for-more-platforms.patch

@@ -5,12 +5,13 @@ Index: Mesa/src/mesa/main/imports.h
 ===================================================================
 --- Mesa.orig/src/mesa/main/imports.h
 +++ Mesa/src/mesa/main/imports.h
-@@ -204,6 +204,8 @@ typedef union { GLfloat f; GLint i; } fi
+@@ -204,6 +204,9 @@ typedef union { GLfloat f; GLint i; } fi
      defined(ia64) || defined(__ia64__) || \
      defined(__mips) || defined(_MIPS_ARCH) || \
      defined(__arm__) || \
 +    defined(__aarch64__) || \
 +    defined(__mc68000__) || \
++    defined(__hppa__) || \
      defined(__sh__) || \
      (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
  #define USE_IEEE

nx-X11/include/Xmd.h

@@ -58,6 +58,7 @@ SOFTWARE.
     defined(__ia64__) || defined(ia64) || \
     defined(__sparc64__) || \
     defined(__s390x__) || \
+    (defined(__hppa__) && defined(__LP64__)) || \
     defined(__amd64__) || defined(amd64) || \
     defined(__powerpc64__)
 #define LONG64				/* 32/64-bit architecture */

nx-X11/programs/Xserver/include/servermd.h

@@ -48,308 +48,21 @@ SOFTWARE.
 #ifndef SERVERMD_H
 #define SERVERMD_H 1
 
-/*
- * Note: much of this is vestigial from mfb/cfb times.  This should
- * really be simplified even further.
- */
+#include <nx-X11/Xarch.h>          /* for X_LITTLE_ENDIAN/X_BIG_ENDIAN */
 
-/*
- * Machine dependent values:
- * GLYPHPADBYTES should be chosen with consideration for the space-time
- * trade-off.  Padding to 0 bytes means that there is no wasted space
- * in the font bitmaps (both on disk and in memory), but that access of
- * the bitmaps will cause odd-address memory references.  Padding to
- * 2 bytes would ensure even address memory references and would
- * be suitable for a 68010-class machine, but at the expense of wasted
- * space in the font bitmaps.  Padding to 4 bytes would be good
- * for real 32 bit machines, etc.  Be sure that you tell the font
- * compiler what kind of padding you want because its defines are
- * kept separate from this.  See server/include/font.h for how
- * GLYPHPADBYTES is used.
- *
- */
-
-#ifdef vax
-
-#define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the VAX only */
+#if X_BYTE_ORDER == X_LITTLE_ENDIAN
+#define IMAGE_BYTE_ORDER	LSBFirst
 #define BITMAP_BIT_ORDER	LSBFirst
-#define	GLYPHPADBYTES		1
-
-#endif /* vax */
-
-#ifdef __arm32__
-
-#define IMAGE_BYTE_ORDER        LSBFirst
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-#  define BITMAP_BIT_ORDER      MSBFirst
-# else
-#  define BITMAP_BIT_ORDER      LSBFirst
-# endif
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16)
-#  define BITMAP_SCANLINE_UNIT  8
-# endif
-
-#define GLYPHPADBYTES           4
-
-#endif /* __arm32__ */
-
-#ifdef __aarch64__
-
-#ifdef __AARCH64EL__
-#define IMAGE_BYTE_ORDER        LSBFirst
-#define BITMAP_BIT_ORDER        LSBFirst
-#endif
-#ifdef __AARCH64EB__
-#define IMAGE_BYTE_ORDER        MSBFirst
-#define BITMAP_BIT_ORDER        MSBFirst
-#endif
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16)
-#  define BITMAP_SCANLINE_UNIT  8
-# endif
-
-#define GLYPHPADBYTES           4
-
-#endif /* __aarch64__ */
-
-#if defined(__powerpc__) || defined(__ppc__)
-
-#define IMAGE_BYTE_ORDER        MSBFirst
-#define BITMAP_BIT_ORDER        MSBFirst
-#define GLYPHPADBYTES           4
-
-#endif /* PowerPC */
-
-#if defined(__sh__)
-
-#if defined(__BIG_ENDIAN__)
-# define IMAGE_BYTE_ORDER	MSBFirst
-# define BITMAP_BIT_ORDER	MSBFirst
-# define GLYPHPADBYTES		4
-#else
-# define IMAGE_BYTE_ORDER	LSBFirst
-# define BITMAP_BIT_ORDER	LSBFirst
-# define GLYPHPADBYTES		4
-#endif
-
-#endif /* SuperH */
-
-
-#if (defined(sun) && (defined(__sparc) || defined(sparc))) || \
-    (defined(__uxp__) && (defined(sparc) || defined(mc68000))) || \
-    defined(__sparc__) || defined(__mc68000__)
-
-#if defined(__sparc) || defined(__sparc__)
-# if !defined(sparc)
-#  define sparc 1
-# endif
-#endif
-
-#if defined(sun386) || defined(sun5)
-# define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the SUN only */
-# define BITMAP_BIT_ORDER	LSBFirst
-#else
-# define IMAGE_BYTE_ORDER	MSBFirst        /* Values for the SUN only */
-# define BITMAP_BIT_ORDER	MSBFirst
-#endif
-
-#define	GLYPHPADBYTES		4
-
-#endif /* sun && !(i386 && SVR4) */
-
-#if defined(ibm032) || defined (ibm)
-
-#ifdef i386
-# define IMAGE_BYTE_ORDER	LSBFirst	/* Value for PS/2 only */
-#else
-# define IMAGE_BYTE_ORDER	MSBFirst        /* Values for the RT only*/
-#endif
-#define BITMAP_BIT_ORDER	MSBFirst
-#define	GLYPHPADBYTES		1
-/* ibm pcc doesn't understand pragmas. */
-
-#ifdef i386
-#define BITMAP_SCANLINE_UNIT	8
-#endif
-
-#endif /* ibm */
-
-#if defined (M4310) || defined(M4315) || defined(M4317) || defined(M4319) || defined(M4330)
-
-#define IMAGE_BYTE_ORDER	MSBFirst        /* Values for Pegasus only */
+#elif X_BYTE_ORDER == X_BIG_ENDIAN
+#define IMAGE_BYTE_ORDER	MSBFirst
 #define BITMAP_BIT_ORDER	MSBFirst
-#define GLYPHPADBYTES		4
-
-#endif /* tektronix */
-
-#ifdef macII
-
-#define IMAGE_BYTE_ORDER      	MSBFirst        /* Values for the MacII only */
-#define BITMAP_BIT_ORDER      	MSBFirst
-#define GLYPHPADBYTES         	4
-
-#endif /* macII */
-
-#if (defined(mips) || defined(__mips))
-
-#if defined(MIPSEL) || defined(__MIPSEL__)
-# define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the PMAX only */
-# define BITMAP_BIT_ORDER	LSBFirst
-# define GLYPHPADBYTES		4
 #else
-# define IMAGE_BYTE_ORDER	MSBFirst        /* Values for the MIPS only */
-# define BITMAP_BIT_ORDER	MSBFirst
-# define GLYPHPADBYTES		4
-#endif
-
-#endif /* mips */
-
-#if defined(__alpha) || defined(__alpha__) || defined(__alphaCross)
-# define IMAGE_BYTE_ORDER	LSBFirst	/* Values for the Alpha only */
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-#  define BITMAP_BIT_ORDER      MSBFirst
-# else
-#  define BITMAP_BIT_ORDER      LSBFirst
-# endif
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16)
-#  define BITMAP_SCANLINE_UNIT  8
-# endif
-
-# define GLYPHPADBYTES		4
-
-#endif /* alpha */
-
-#if defined (linux) && defined (__s390__)
-
-#define IMAGE_BYTE_ORDER      	MSBFirst
-#define BITMAP_BIT_ORDER      	MSBFirst
-#define GLYPHPADBYTES         	4
-
-#define BITMAP_SCANLINE_UNIT	8
-
-#endif /* linux/s390 */
-
-#if defined (linux) && defined (__s390x__)
-
-#define IMAGE_BYTE_ORDER       MSBFirst
-#define BITMAP_BIT_ORDER       MSBFirst
-#define GLYPHPADBYTES          4
-
-#define BITMAP_SCANLINE_UNIT	8
-
-#endif /* linux/s390x */
-
-
-#if defined(__ia64__) || defined(ia64)
-# define IMAGE_BYTE_ORDER	LSBFirst
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-#  define BITMAP_BIT_ORDER      MSBFirst
-# else
-#  define BITMAP_BIT_ORDER      LSBFirst
-# endif
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16)
-#  define BITMAP_SCANLINE_UNIT  8
-# endif
-
-# define GLYPHPADBYTES		4
-
-#endif /* ia64 */
-
-#if defined(__amd64__) || defined(amd64) || defined(__amd64)
-# define IMAGE_BYTE_ORDER	LSBFirst
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-#  define BITMAP_BIT_ORDER      MSBFirst
-# else
-#  define BITMAP_BIT_ORDER      LSBFirst
-# endif
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16)
-#  define BITMAP_SCANLINE_UNIT  8
-# endif
-
-# define GLYPHPADBYTES		4
-/* ???? */
-#endif /* AMD64 */
-
-#ifdef stellar
-
-#define IMAGE_BYTE_ORDER	MSBFirst       /* Values for the stellar only*/
-#define BITMAP_BIT_ORDER	MSBFirst
-#define	GLYPHPADBYTES		4
-#define IMAGE_BUFSIZE		(64*1024)
-/*
- * Use SysV random number generator.
- */
-#define random rand
-
-#endif /* stellar */
-
-#ifdef luna
-
-#define IMAGE_BYTE_ORDER        MSBFirst   	/* Values for the OMRON only*/
-#define BITMAP_BIT_ORDER	MSBFirst
-#define	GLYPHPADBYTES		4
-
-#ifndef mc68000
-#endif
-
-#endif /* luna */
-
-#if	(defined(SVR4) && defined(i386)) || \
-	defined(__alpha__) || defined(__alpha) || \
-	defined(__i386__) || defined(__i386) || \
-	defined(__s390x__) || defined(__s390__)
-  
-#ifndef IMAGE_BYTE_ORDER
-#define IMAGE_BYTE_ORDER	LSBFirst
-#endif
-
-#ifndef BITMAP_BIT_ORDER
-# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-#  define BITMAP_BIT_ORDER      MSBFirst
-# else
-#  define BITMAP_BIT_ORDER      LSBFirst
-# endif
-#endif
-
-#ifndef BITMAP_SCANLINE_UNIT
-# if defined(XF86MONOVGA) || defined(XF86VGA16)
-#  define BITMAP_SCANLINE_UNIT  8
-# endif
+#error "Too weird to live."
 #endif
 
 #ifndef GLYPHPADBYTES
 #define GLYPHPADBYTES           4
 #endif
-
-#ifdef XSVGA
-#define AVOID_GLYPHBLT
-#define NO_ONE_RECT
-#endif
-
-#endif /* SVR4 / BSD / i386 */
-
-#if defined (linux) && defined (__mc68000__)
-
-#define IMAGE_BYTE_ORDER       MSBFirst
-#define BITMAP_BIT_ORDER       MSBFirst
-#define GLYPHPADBYTES          4
-
-#endif /* linux/m68k */
-
-/* linux on the Compaq Itsy */
-#if defined(linux) && defined(__arm__)
-#define IMAGE_BYTE_ORDER	LSBFirst
-#define BITMAP_BIT_ORDER	LSBFirst
-#define GLYPHPADBYTES		4
-#endif
  
 /* size of buffer to use with GetImage, measured in bytes. There's obviously
  * a trade-off between the amount of stack (or whatever ALLOCATE_LOCAL gives