Author: dnusinow
Date: 2006-03-04 19:39:27 -0500 (Sat, 04 Mar 2006)
New Revision: 1374
Added:
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/08_s390_servermd.diff
Modified:
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series
Log:
* Port patches from trunk
+ s390/500_s390_support.diff
Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
2006-03-05 00:35:38 UTC (rev 1373)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
2006-03-05 00:39:27 UTC (rev 1374)
@@ -9,13 +9,14 @@
+ arm/303_arm_cache_flush.diff
+ arm/315_arm_is_not_x86_and_has_no_vga.diff
+ general/099e_xorgconf_manpage_overhaul.diff
+ + s390/500_s390_support.diff
* add 04_read_rom_in_chunks.diff. This reads PCI ROM in large chunks rather
than one byte at a time. This patch by Alex Williamson and forwarded to us
by Dann Frazier. Thanks to both of them. (closes: #353168)
* Don't build xserver-xorg-core on s390. This means putting all the other
arches as being explicitly listed. Damn !s390.
- -- David Nusinow <[EMAIL PROTECTED]> Sat, 4 Mar 2006 19:33:30 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Sat, 4 Mar 2006 19:38:44 -0500
xorg-server (1:1.0.1-1) experimental; urgency=low
Added:
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/08_s390_servermd.diff
===================================================================
---
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/08_s390_servermd.diff
2006-03-05 00:35:38 UTC (rev 1373)
+++
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/08_s390_servermd.diff
2006-03-05 00:39:27 UTC (rev 1374)
@@ -0,0 +1,29 @@
+$Id: 500_s390_support.diff 689 2005-10-19 22:11:30Z dnusinow $
+
+Miscellaneous fixes for S/390.
+
+This patch by Gerhard Tonn.
+
+Not submitted to XFree86.
+
+Index: xc/programs/Xserver/include/servermd.h
+===================================================================
+--- xc/programs/Xserver/include/servermd.h.orig 2005-10-18
19:45:06.000000000 -0400
++++ xc/programs/Xserver/include/servermd.h 2005-10-18 22:41:18.000000000
-0400
+@@ -518,7 +518,15 @@
+ #define GLYPHPADBYTES 4
+ #define GETLEFTBITS_ALIGNMENT 1
+ #endif
+-
++
++/* linux on IBM S/390 */
++#if defined (linux) && defined (__s390__)
++#define IMAGE_BYTE_ORDER MSBFirst
++#define BITMAP_BIT_ORDER MSBFirst
++#define GLYPHPADBYTES 4
++#define GETLEFTBITS_ALIGNMENT 1
++#endif /* linux/s390 */
++
+ /* 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
+ * you) used and the number of times the ddx routine has to be called.
Modified:
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series
2006-03-05 00:35:38 UTC (rev 1373)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series
2006-03-05 00:39:27 UTC (rev 1374)
@@ -5,3 +5,4 @@
05_arm_cache_flush.diff -p3
06_arm_is_not_x86_and_has_no_vga.diff -p3
07_xorgconf_manpage_overhaul.diff -p0
+08_s390_servermd.diff -p3
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
