xserver: Branch 'server-1.3-branch' - 2 commits

[Drew Parsons]

 GL/glx/indirect_dispatch_swap.c                                 |    2 +-
 GL/glx/indirect_program.c                                       |    2 +-
 GL/glx/indirect_texture_compression.c                           |    2 +-
 GL/glx/swap_interval.c                                          |    2 +-
 hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am |    2 +-
 hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am   |    2 +-
 hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am     |    1 +
 hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am      |    2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

New commits:
diff-tree aeabf2a1f873f884b8a8c33b1517c3f3cab4c7f5 (from ee3000f97d7561b2137e247495468a17e6e3b4c3)
Author: Drew Parsons <drew at pug.localdomain>
Date:   Sun Mar 4 16:28:54 2007 +1100

    Xprint: fix font symlinks
    
    Change symlinks to Xprint base fonts in model/PSdefault using local
    relative links.  This facilitates moving the Xprint config files, for
    instance for FHS compliance placing data files in /usr/share rather
    than /usr/lib.  Also ensures NewCenturySchlbk-BoldItalic.pmf is
    installed.

diff --git a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
index 5be5419..c574c5c 100644
--- a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
@@ -1,6 +1,6 @@
 xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts
 
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = ../../PSdefault/fonts
 
 XPFONTS = \
         AvantGarde-Book.pmf \
diff --git a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
index 2ff9ab7..634db1f 100644
--- a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
@@ -1,6 +1,6 @@
 xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts
 
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = ../../PSdefault/fonts
 
 XPFONTS = \
         AvantGarde-Book.pmf \
diff --git a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
index e7ddb6c..1e8c8a7 100644
--- a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
@@ -18,6 +18,7 @@ dist_xpc_DATA =				\
 	LubalinGraph-DemiOblique.pmf	\
 	LubalinGraph-Demi.pmf		\
 	NewCenturySchlbk-Bold.pmf	\
+	NewCenturySchlbk-BoldItalic.pmf \
 	NewCenturySchlbk-Italic.pmf	\
 	NewCenturySchlbk-Roman.pmf	\
 	Souvenir-DemiItalic.pmf		\
diff --git a/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am b/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am
index 8cc2694..d1ee6cf 100644
--- a/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am
@@ -1,6 +1,6 @@
 xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
 
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = ../../PSdefault/fonts
 
 XPFONTS = \
         Courier-Bold.pmf \
diff-tree ee3000f97d7561b2137e247495468a17e6e3b4c3 (from 1fbb3458a5620f87486a24156f6aafdc4eca99b8)
Author: Drew Parsons <dparsons at debian.org>
Date:   Sun Mar 4 16:00:52 2007 +1100

    Support for Hurd and other non-linux GNU systems.
    
    Non-linux GNU systems such as Hurd will define __GLIBC__ or __GNU__
    rather than __linux__.  This must be tested for in order to get byteswap.h
    included.  See commit 594d180fe4f5d508569f9b263799da5af5a97087 (24 Dec
    2006) and other related patches (fixed in upstream HEAD then, why was
    the patch not brought across to the 1.3 branch?).

diff --git a/GL/glx/indirect_dispatch_swap.c b/GL/glx/indirect_dispatch_swap.c
index 9c58ef1..136f0d0 100644
--- a/GL/glx/indirect_dispatch_swap.c
+++ b/GL/glx/indirect_dispatch_swap.c
@@ -28,7 +28,7 @@
 #include <X11/Xmd.h>
 #include <GL/gl.h>
 #include <GL/glxproto.h>
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
 #include <byteswap.h>
 #elif defined(__OpenBSD__)
 #include <sys/endian.h>
diff --git a/GL/glx/indirect_program.c b/GL/glx/indirect_program.c
index d0fd3d1..eae128a 100644
--- a/GL/glx/indirect_program.c
+++ b/GL/glx/indirect_program.c
@@ -46,7 +46,7 @@
 #include "dispatch.h"
 #include "glapioffsets.h"
 
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
 #include <byteswap.h>
 #elif defined(__OpenBSD__)
 #include <sys/endian.h>
diff --git a/GL/glx/indirect_texture_compression.c b/GL/glx/indirect_texture_compression.c
index 0c42ea0..11f63c2 100644
--- a/GL/glx/indirect_texture_compression.c
+++ b/GL/glx/indirect_texture_compression.c
@@ -39,7 +39,7 @@
 #include "glthread.h"
 #include "dispatch.h"
 
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
 #include <byteswap.h>
 #elif defined(__OpenBSD__)
 #include <sys/endian.h>
diff --git a/GL/glx/swap_interval.c b/GL/glx/swap_interval.c
index bcc1c47..f049ce5 100644
--- a/GL/glx/swap_interval.c
+++ b/GL/glx/swap_interval.c
@@ -40,7 +40,7 @@
 #include "dispatch.h"
 #include "glapioffsets.h"
 
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
 #include <byteswap.h>
 #elif defined(__OpenBSD__)
 #include <sys/endian.h>