X Strike Force XFree86 SVN commit: r1388 - in trunk/debian: . patches
Author: branden
Date: 2004-05-12 00:45:06 -0500 (Wed, 12 May 2004)
New Revision: 1388
Added:
trunk/debian/patches/600_amd64_support.diff
Removed:
trunk/debian/patches/600_amd64_Xlib_support_and_ati_fix.diff
Modified:
trunk/debian/CHANGESETS
Log:
Rename patch to reflect its status as a general dumping ground for
miscellaneous AMD64 support issues.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-12 05:43:46 UTC (rev 1387)
+++ trunk/debian/CHANGESETS 2004-05-12 05:45:06 UTC (rev 1388)
@@ -21,7 +21,7 @@
1336
Add support for the AMD64 architecture.
- 1346, 1387
+ 1346, 1387, 1388
Add SVN Id keyword and set svn:keywords property to Id on all files in
debian/scripts where this was not already the case.
Deleted: trunk/debian/patches/600_amd64_Xlib_support_and_ati_fix.diff
===================================================================
--- trunk/debian/patches/600_amd64_Xlib_support_and_ati_fix.diff 2004-05-12 05:43:46 UTC (rev 1387)
+++ trunk/debian/patches/600_amd64_Xlib_support_and_ati_fix.diff 2004-05-12 05:45:06 UTC (rev 1388)
@@ -1,50 +0,0 @@
-# $Id$
-
-AMD64 is not a "bi-width" architecture in Debian at present; instead it is
-a pure 64-bit environment, so do not define "HaveLib64" as "YES".
-
-Don't perform an UltraSPARC (SPARC64)-specific kludge on AMD64, just as we
-don't on IA64.
-
-Also undo an upstream renaming of the x86-64 architecture that leaked into
-a patch for the ATI driver.
-
-This patch by Andreas Jochens and Branden Robinson.
-
-Not submitted to XFree86.
-
-diff -urN xc/config/cf/linux.cf xc/config/cf/linux.cf
---- xc/config/cf/linux.cf 2003-02-20 23:30:20.000000000 -0600
-+++ xc/config/cf/linux.cf 2004-04-16 04:02:14.127323952 -0500
-@@ -572,7 +572,7 @@
- #define MkdirHierCmd mkdir -p
-
- #ifndef HaveLib64
--# if defined (x86_64Architecture) || defined (s390xArchitecture)
-+# if defined (s390xArchitecture)
- # define HaveLib64 YES
- # else
- # define HaveLib64 NO
-diff -urN xc/lib/X11/XlcDL.c xc/lib/X11/XlcDL.c
---- xc/lib/X11/XlcDL.c 2002-11-25 08:04:53.000000000 -0600
-+++ xc/lib/X11/XlcDL.c 2004-04-15 05:10:31.325361544 -0500
-@@ -58,7 +58,7 @@
- #ifdef _LP64
- # if defined(__sparcv9)
- # define _MACH64_NAME "sparcv9"
--# elif defined(__ia64__)
-+# elif defined(__ia64__) || defined(__amd64__)
- # undef MACH64_NAME
- # else
- # error "Unknown architecture"
---- xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile~ 2004-05-03 17:51:07.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile 2004-05-03 17:57:15.000000000 -0500
-@@ -82,7 +82,7 @@
- * ATIAvoidNonPCI necessarily implies ATIAvoidCPIO.
- */
- #if defined(i386Architecture) || \
-- defined(AMD64Architecture) || \
-+ defined(x86_64Architecture) || \
- defined(AlphaArchitecture)
- # ifndef ATIAvoidCPIO
- # define ATIAvoidCPIO NO
Copied: trunk/debian/patches/600_amd64_support.diff (from rev 1387, trunk/debian/patches/600_amd64_Xlib_support_and_ati_fix.diff)
Reply to: