Author: branden
Date: 2004-05-25 12:13:16 -0500 (Tue, 25 May 2004)
New Revision: 1440
Modified:
trunk/debian/CHANGESETS
trunk/debian/control
trunk/debian/patches/600_amd64_support.diff
trunk/debian/xserver-xfree86.config.in
Log:
Add more patches for AMD64 support.
* Declare a default XFree86 X server driver list for this arch.
* Do not build-depend on libglide2 or libglide3.
* Use "__x86_64__" to recognize the C library's notion of the AMD64
architecture, not "__AMD64__".
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-25 17:10:14 UTC (rev 1439)
+++ trunk/debian/CHANGESETS 2004-05-25 17:13:16 UTC (rev 1440)
@@ -21,7 +21,7 @@
1336
Add support for the AMD64 architecture.
- 1346, 1387, 1388, 1395
+ 1346, 1387, 1388, 1395, 1440
Add SVN Id keyword and set svn:keywords property to Id on all files in
debian/scripts where this was not already the case.
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-05-25 17:10:14 UTC (rev 1439)
+++ trunk/debian/control 2004-05-25 17:13:16 UTC (rev 1440)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL
PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev |
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev,
libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin,
po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26)
[amd64 i386], libglide3-dev (>= 2002.04.10-3) [alpha amd64 i386],
linux-kernel-headers [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc
s390 sh], linux-kernel-headers (>= 2.5.999-test7-bk-15) [sparc], libpng12-dev |
libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev
(>= 2.1.2), libxrender-dev (>= 0.8.3), libxcursor-dev, dbs, m4
+Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev |
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev,
libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin,
po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26)
[i386], libglide3-dev (>= 2002.04.10-3) [alpha i386], linux-kernel-headers
[alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh],
linux-kernel-headers (>= 2.5.999-test7-bk-15) [sparc], libpng12-dev |
libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev
(>= 2.1.2), libxrender-dev (>= 0.8.3), libxcursor-dev, dbs, m4
Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
Package: lbxproxy
Modified: trunk/debian/patches/600_amd64_support.diff
===================================================================
--- trunk/debian/patches/600_amd64_support.diff 2004-05-25 17:10:14 UTC (rev
1439)
+++ trunk/debian/patches/600_amd64_support.diff 2004-05-25 17:13:16 UTC (rev
1440)
@@ -6,9 +6,12 @@
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.
+Also undo an upstream renaming of the x86-64 architecture's Imake symbol
+that leaked into a patch for the ATI driver.
+Use "__x86_64__" to recognize the C library's notion of the AMD64
+architecture, not "__AMD64__".
+
This patch by Andreas Jochens and Branden Robinson.
Not submitted to XFree86.
@@ -48,3 +51,14 @@
defined(AlphaArchitecture)
# ifndef ATIAvoidCPIO
# define ATIAvoidCPIO NO
+--- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h~ 2004-05-23
11:35:43.528353480 +0200
++++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h 2004-05-23
11:36:01.410634960 +0200
+@@ -321,7 +321,7 @@
+ # define INCLUDE_XF86_NO_DOMAIN
+ # endif
+ # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
+-#elif defined(__AMD64__)
++#elif defined(__x86_64__)
+ # define ARCH_PCI_INIT ix86PciInit
+ # define INCLUDE_XF86_MAP_PCI_MEM
+ # define INCLUDE_XF86_NO_DOMAIN
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2004-05-25 17:10:14 UTC (rev
1439)
+++ trunk/debian/xserver-xfree86.config.in 2004-05-25 17:13:16 UTC (rev
1440)
@@ -591,6 +591,9 @@
alpha)
DRIVER_LIST="ati, cirrus, glint, mga, nv, rendition, s3, s3virge,
savage, siliconmotion, tdfx, tga, vga"
;;
+ amd64)
+ DRIVER_LIST="apm, ark, ati, chips, cirrus, cyrix, fbdev, glint, i128,
i740, i810, imstt, mga, neomagic, newport, nsc, nv, rendition, s3, s3virge,
savage, siliconmotion, sis, tdfx, tga, trident, tseng, vesa, vga, via, vmware"
+ ;;
arm|hppa)
DRIVER_LIST="ati, chips, fbdev, glint, mga, nv, s3, s3virge, savage,
sis, tdfx, trident, vga"
;;
