X Strike Force X.Org X11 SVN commit: r2887 - in branches/7.1/xserver/xorg-server/debian: . patches
Author: dnusinow
Date: 2006-08-21 22:31:40 -0400 (Mon, 21 Aug 2006)
New Revision: 2887
Added:
branches/7.1/xserver/xorg-server/debian/patches/16_s390_fix.diff
Modified:
branches/7.1/xserver/xorg-server/debian/changelog
branches/7.1/xserver/xorg-server/debian/patches/series
Log:
* Add 16_s390_fix.diff to fix FTBFS on s390. Thanks Bastian Blank.
(closes: #362641)
Modified: branches/7.1/xserver/xorg-server/debian/changelog
===================================================================
--- branches/7.1/xserver/xorg-server/debian/changelog 2006-08-22 01:42:11 UTC (rev 2886)
+++ branches/7.1/xserver/xorg-server/debian/changelog 2006-08-22 02:31:40 UTC (rev 2887)
@@ -1,3 +1,10 @@
+xorg-server (1:1.1.1-3) UNRELEASED-experimental; urgency=low
+
+ * Add 16_s390_fix.diff to fix FTBFS on s390. Thanks Bastian Blank.
+ (closes: #362641)
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 21 Aug 2006 22:31:36 +0000
+
xorg-server (1:1.1.1-2) experimental; urgency=low
[ Drew Parsons ]
Added: branches/7.1/xserver/xorg-server/debian/patches/16_s390_fix.diff
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/16_s390_fix.diff 2006-08-22 01:42:11 UTC (rev 2886)
+++ branches/7.1/xserver/xorg-server/debian/patches/16_s390_fix.diff 2006-08-22 02:31:40 UTC (rev 2887)
@@ -0,0 +1,87 @@
+Index: xorg-server/hw/xfree86/common/xf86Bus.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Bus.c 2006-08-21 22:15:53.000000000 +0000
++++ xorg-server/hw/xfree86/common/xf86Bus.c 2006-08-21 22:25:21.000000000 +0000
+@@ -3078,7 +3078,7 @@
+ CheckGenericGA()
+ {
+ /* This needs to be changed for multiple domains */
+-#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__arm__)
++#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__arm__) && !defined(__s390__)
+ IOADDRESS GenericIOBase = VGAHW_GET_IOBASE();
+ CARD8 CurrentValue, TestValue;
+
+Index: xorg-server/hw/xfree86/os-support/linux/lnx_video.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/os-support/linux/lnx_video.c 2006-08-21 22:15:54.000000000 +0000
++++ xorg-server/hw/xfree86/os-support/linux/lnx_video.c 2006-08-21 22:30:44.000000000 +0000
+@@ -466,7 +466,7 @@
+ Base,realBase,alignOff);
+ #endif
+
+-#if defined(__ia64__) || defined(__arm__)
++#if defined(__ia64__) || defined(__arm__) || defined(__s390__)
+ #ifndef MAP_WRITECOMBINED
+ #define MAP_WRITECOMBINED 0x00010000
+ #endif
+@@ -596,7 +596,7 @@
+ #if defined(__powerpc__)
+ munmap(ioBase, 0x20000);
+ ioBase = NULL;
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__)
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__)
+ iopl(0);
+ ioperm(0, 1024, 0);
+ #endif
+@@ -615,12 +615,12 @@
+ _X_EXPORT Bool
+ xf86DisableInterrupts()
+ {
+-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__)
++#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__)
+ if (!ExtendedEnabled)
+ if (iopl(3) || ioperm(0, 1024, 1))
+ return (FALSE);
+ #endif
+-#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__)
++#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__s390__)
+ #else
+ # ifdef __GNUC__
+ # if defined(__ia64__)
+@@ -647,12 +647,12 @@
+ _X_EXPORT void
+ xf86EnableInterrupts()
+ {
+-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__)
++#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) || !defined(__s390__)
+ if (!ExtendedEnabled)
+ if (iopl(3) || ioperm(0, 1024, 1))
+ return;
+ #endif
+-#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__)
++#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__s390__)
+ #else
+ # ifdef __GNUC__
+ # if defined(__ia64__)
+@@ -666,7 +666,7 @@
+ asm("sti");
+ # endif
+ #endif
+-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__)
++#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__)
+ if (!ExtendedEnabled) {
+ iopl(0);
+ ioperm(0, 1024, 0);
+Index: xorg-server/hw/xfree86/vgahw/vgaHW.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/vgahw/vgaHW.h 2006-08-21 22:15:54.000000000 +0000
++++ xorg-server/hw/xfree86/vgahw/vgaHW.h 2006-08-21 22:31:08.000000000 +0000
+@@ -176,7 +176,7 @@
+ #define BITS_PER_GUN 6
+ #define COLORMAP_SIZE 256
+
+-#if defined(__powerpc__) || defined(__arm__)
++#if defined(__powerpc__) || defined(__arm__) || defined(__s390__)
+ #define DACDelay(hw) /* No legacy VGA support */
+ #else
+ #define DACDelay(hw) \
Modified: branches/7.1/xserver/xorg-server/debian/patches/series
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/series 2006-08-22 01:42:11 UTC (rev 2886)
+++ branches/7.1/xserver/xorg-server/debian/patches/series 2006-08-22 02:31:40 UTC (rev 2887)
@@ -13,3 +13,4 @@
13_debian_add_xkbpath_env_variable.diff
14_debian_always_look_in_our_module_path.diff
15_symlink_mesa.diff
+16_s390_fix.diff
Reply to: