On 04-May-15 02:43, Branden Robinson wrote:
> I have commited your further patches to Debian's XFree86 SVN; I'd like
> for some AMD64 users to test packages built from the SVN trunk.
>
> I do thank your for your contributions, and look forward to hearing
> reports of how these packages work. I'd like to be able to claim amd64
> as a supported architecture in 4.3.0.dfsg.1-2.
Thank you for including the amd64 patches to the xfree86 SVN trunk.
I compiled the current xfree86 SVN trunk version with a small additional
patch (see below) for amd64 and tested the resulting packages on my
dual-opteron machine, which is running Debian amd64 natively.
Xfree86 is working fine with these packages on that machine.
I have a KDE desktop environment and mozilla running
and everything works as expected so far.
The 'pure64' amd64 port on alioth uses a similar patch to xfree86
(but against the current sid version).
Regards
Andreas Jochens
Index: README
===================================================================
--- README (revision 1438)
+++ README (working copy)
@@ -57,7 +57,7 @@
400-449 hppa architecture patches
450-499 ia64 architecture patches
500-549 s390/s390x architecture patches
- 550-600 sh{3,4}{,eb} architecture patches
+ 550-599 sh{3,4}{,eb} architecture patches
600-649 amd64 architecture patches
800-819 Debian GNU/Hurd patches
820-839 Debian GNU/FreeBSD patches
Index: xserver-xfree86.config.in
===================================================================
--- xserver-xfree86.config.in (revision 1438)
+++ xserver-xfree86.config.in (working copy)
@@ -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"
;;
Index: patches/600_amd64_support.diff
===================================================================
--- patches/600_amd64_support.diff (revision 1438)
+++ patches/600_amd64_support.diff (working copy)
@@ -9,6 +9,9 @@
Also undo an upstream renaming of the x86-64 architecture that leaked into
a patch for the ATI driver.
+Change '__AMD64__' to '__x86_64__'
+in xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h.
+
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
Index: control
===================================================================
--- control (revision 1438)
+++ control (working copy)
@@ -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
