Author: branden
Date: 2003-05-26 14:03:36 -0500 (Mon, 26 May 2003)
New Revision: 75
Removed:
trunk/patches/454_ia64_no_int10.diff
trunk/patches/999_really_shut_off_int10.diff
Modified:
trunk/changelog
Log:
trash patches #454 and #999; the former causes a FTBFS on IA-64 because the X
server code isn't actually structured to let you shut Int10 support off on that
architecture; Bdale already knows that the X server sucks for IA-64 on 4.2.1,
so all we really need for that architecture are the libs and clients (and
hopefully official 4.3.0 packages sooner rather than later)
Deleted: trunk/patches/454_ia64_no_int10.diff
==============================================================================
--- trunk/patches/454_ia64_no_int10.diff 2003-05-26 18:42:25 UTC (rev 74)
+++ trunk/patches/454_ia64_no_int10.diff 2003-05-26 19:03:36 UTC (rev 75)
@@ -1,19 +0,0 @@
-It was never wonderful, but now with GCC 3.2 it really sucks, per Bdale
-Garbee.
-
---- xc/config/cf/xfree86.cf~ 2003-03-04 15:50:15.000000000 -0500
-+++ xc/config/cf/xfree86.cf 2003-03-04 15:51:44.000000000 -0500
-@@ -280,7 +280,12 @@
- # endif
- /* int10 module */
- # ifndef XF86Int10
--# define XF86Int10 YES
-+/* Int10 doesn't work very well on IA-64 */
-+# ifdef ia64Architecture
-+# define XF86Int10 NO
-+# else
-+# define XF86Int10 YES
-+# endif
- # endif
-
- /*
Deleted: trunk/patches/999_really_shut_off_int10.diff
==============================================================================
--- trunk/patches/999_really_shut_off_int10.diff 2003-05-26 18:42:25 UTC
(rev 74)
+++ trunk/patches/999_really_shut_off_int10.diff 2003-05-26 19:03:36 UTC
(rev 75)
@@ -1,19 +0,0 @@
---- xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile~ 2003-03-16
23:39:22.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile 2003-03-16
23:40:20.000000000 -0500
-@@ -66,11 +66,13 @@
- #if BuildXF86DRI
- DRISUBDIR = drm
- #endif
--TESTVAR = XF86INT10_BUILD
-
--#if XF86INT10_BUILD > X86EMU_GENERIC
-+#if XF86Int10
-+TESTVAR = XF86INT10_BUILD
-+# if XF86INT10_BUILD > X86EMU_GENERIC
- INT10SUBDIR = int10
--#endif
-+# endif
-+#endif
-
- #if BuildXF86DRI || (XF86INT10_BUILD > X86EMU_GENERIC)
- #define IHaveSubdirs
Modified: trunk/changelog
==============================================================================
--- trunk/changelog 2003-05-26 18:42:25 UTC (rev 74)
+++ trunk/changelog 2003-05-26 19:03:36 UTC (rev 75)
@@ -89,9 +89,6 @@
reverted long ago: set window size from xterm instead of child process to
avoid race condition with resize. (Keith Packard) (Closes: #39964)
* patch #084: new; fix typo in patch to XF86Config.man
- * patch #454: new; turn off Int10 support for IA-64, apparently when this is
- mixed with GCC 3.2, bad things happen, per Bdale Garbee
- * patch #500: resynced with #454
* patch #910: new; change X server's "can't find default font" and "can't
find cursor font" error messages to whack users with a big fat clue
@@ -189,7 +186,7 @@
xserver-xfree86/config/device/driver from "atimisc", "r128", or "radeon"
to "ati"
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 26 May 2003 01:52:01 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 26 May 2003 14:01:21 -0500
xfree86 (4.2.1-6) unstable; urgency=medium
