Author: branden
Date: 2004-05-21 11:37:25 -0500 (Fri, 21 May 2004)
New Revision: 1430
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/315_arm_fix_up_lnx_video_io_access.diff
Log:
Update ARM support patch #315 to add #define guards against more instances
of x86 and legacy VGA I/O code (thanks, Wookey). (Closes: #234808)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-21 16:25:53 UTC (rev 1429)
+++ trunk/debian/CHANGESETS 2004-05-21 16:37:25 UTC (rev 1430)
@@ -124,4 +124,7 @@
the script is not aborted prematurely (thanks, Oliver Bausinger).
1427
+Update ARM support patch (#234808).
+ 1430
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-05-21 16:25:53 UTC (rev 1429)
+++ trunk/debian/TODO 2004-05-21 16:37:25 UTC (rev 1430)
@@ -12,8 +12,6 @@
These items are listed in descending order of priority; that is, the most
important items come first.
-#234808: updated patch for ARM support
-
Post 4.3.0-1
------------
* Re-do migration of /usr/X11R6/lib/X11/{app-defaults,xkb}:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-21 16:25:53 UTC (rev 1429)
+++ trunk/debian/changelog 2004-05-21 16:37:25 UTC (rev 1430)
@@ -189,12 +189,15 @@
so that the script is not aborted prematurely (thanks, Oliver Bausinger).
(Closes: #248632)
+ * Update ARM support patch #315 to add #define guards against more instances
+ of x86 and legacy VGA I/O code (thanks, Wookey). (Closes: #234808)
+
Changes by Fabio Massimo Di Nitto:
* Update xutils's package description to refer to bdftruncate and ucs2any
programs by their correct names.
- -- Branden Robinson <[EMAIL PROTECTED]> Fri, 21 May 2004 01:30:09 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Fri, 21 May 2004 11:34:13 -0500
xfree86 (4.3.0.dfsg.1-1) unstable; urgency=low
Modified: trunk/debian/patches/315_arm_fix_up_lnx_video_io_access.diff
===================================================================
--- trunk/debian/patches/315_arm_fix_up_lnx_video_io_access.diff
2004-05-21 16:25:53 UTC (rev 1429)
+++ trunk/debian/patches/315_arm_fix_up_lnx_video_io_access.diff
2004-05-21 16:37:25 UTC (rev 1430)
@@ -1,14 +1,40 @@
$Id$
-The file xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
-requires some checks for the ARM architecture to prevent the X server from
+The files xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
+ xc/programs/Xserver/hw/xfree86/common/xf86Bus.c and
+ xc/programs/Xserver/hw/xfree86/vgahw/vhaHW.h
+require some checks for the ARM architecture to prevent the X server from
trying to execute code meant only for x86. This is consistent with other
non-x86 platforms.
-This patch by Peter Naulls. Not submitted upstream yet.
+This patch by Peter Naulls, updated by Wookey.
---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c~
2003-12-31 06:56:51.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
2003-12-31 06:56:53.000000000 -0500
+Not submitted to XFree86.
+
+diff -urN xc/programs/Xserver/hw/xfree86/common/xf86Bus.c
xc/programs/Xserver/hw/xfree86/common/xf86Bus.c
+--- xc/programs/Xserver/hw/xfree86/common/xf86Bus.c 2003-02-21
18:19:34.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/common/xf86Bus.c 2004-05-06
17:41:54.000000000 +0200
+@@ -2966,7 +2966,7 @@
+ CheckGenericGA()
+ {
+ /* This needs to be changed for multiple domains */
+-#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__)
++#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) &&
!defined(__arm__)
+ IOADDRESS GenericIOBase = VGAHW_GET_IOBASE();
+ CARD8 CurrentValue, TestValue;
+
+diff -urN xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
2004-05-06 18:11:19.000000000 +0200
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
2004-05-06 18:03:55.000000000 +0200
+@@ -420,7 +420,7 @@
+ Base,realBase,alignOff);
+ #endif
+
+-#if defined(__ia64__)
++#if defined(__ia64__) || defined(__arm__)
+ #ifndef MAP_WRITECOMBINED
+ #define MAP_WRITECOMBINED 0x00010000
+ #endif
@@ -522,7 +522,7 @@
#endif
}
@@ -27,21 +53,15 @@
iopl(0);
ioperm(0, 1024, 0);
#endif
-@@ -567,12 +567,12 @@
+@@ -567,7 +567,7 @@
Bool
xf86DisableInterrupts()
{
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) &&
!defined(__mips__) && !defined(__ia64__) && !defined(__sh__) &&
!defined(__hppa__)
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) &&
!defined(__mips__) && !defined(__ia64__) && !defined(__sh__) &&
!defined(__hppa__) && !defined(__arm__)
- if (!ExtendedEnabled)
- if (iopl(3) || ioperm(0, 1024, 1))
+ 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(__arm__)
- #else
- # ifdef __GNUC__
- # if defined(__ia64__)
@@ -586,7 +586,7 @@
asm("cli");
# endif
@@ -51,7 +71,7 @@
if (!ExtendedEnabled) {
iopl(0);
ioperm(0, 1024, 0);
-@@ -599,12 +599,12 @@
+@@ -599,7 +599,7 @@
void
xf86EnableInterrupts()
{
@@ -60,12 +80,6 @@
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(__arm__)
- #else
- # ifdef __GNUC__
- # if defined(__ia64__)
@@ -618,7 +618,7 @@
asm("sti");
# endif
@@ -75,3 +89,15 @@
if (!ExtendedEnabled) {
iopl(0);
ioperm(0, 1024, 0);
+diff -urN xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h
xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h
+--- xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h 2002-04-04
16:05:56.000000000 +0200
++++ xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h 2004-05-06
17:43:49.000000000 +0200
+@@ -176,7 +176,7 @@
+ #define BITS_PER_GUN 6
+ #define COLORMAP_SIZE 256
+
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__arm__)
+ #define DACDelay(hw) /* No legacy VGA support */
+ #else
+ #define DACDelay(hw) \
