rpms/xorg-x11-drv-ati/devel mach64-cpio-for-ia64.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.38, 1.39

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21066

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	mach64-cpio-for-ia64.patch 
Log Message:
* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-9.fc6
- mach64-cpio-for-ia64.patch: Enable CPIO for mach64 on ia64. (#203017)


mach64-cpio-for-ia64.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mach64-cpio-for-ia64.patch ---
This enables CPIO on ia64, which makes mach64 work at the expense of mach32.
We can probably safely say that the intersection of ia64 users and mach32
users is negligible, but unfortunately mach64 is somehow quite common in ia64
machines.  - ajax

--- xf86-video-ati-6.6.1/configure.ac.jx	2006-06-16 02:17:28.000000000 -0400
+++ xf86-video-ati-6.6.1/configure.ac	2006-08-18 10:40:24.000000000 -0400
@@ -135,7 +135,7 @@
     ATIMISC_TV_OUT=yes
     ATIMISC_CPIO=yes
     ;;
-  x86_64|amd64|alpha)
+  x86_64|amd64|alpha|ia64)
     ATIMISC_CPIO=yes
     ;;
   sparc)


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xorg-x11-drv-ati.spec	11 Aug 2006 00:01:47 -0000	1.38
+++ xorg-x11-drv-ati.spec	18 Aug 2006 14:52:56 -0000	1.39
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -32,6 +32,9 @@
 # Rage 128 patches (100-199)
 Patch100:  r128-missing-xf86ForceHWCursor-symbol-bug168753.patch
 
+# mach64 patches (200-299)
+Patch200:  mach64-cpio-for-ia64.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
@@ -53,6 +56,7 @@
 %patch1 -p1 -b .rn50-dri
 %patch2 -p1 -b .xpress-200
 %patch100 -p0 -b .r128-missing-xf86ForceHWCursor-symbol-bug168753
+%patch200 -p1 -b .mach64-for-ia64
 
 %build
 %configure --disable-static
@@ -96,6 +100,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-9.fc6
+- mach64-cpio-for-ia64.patch: Enable CPIO for mach64 on ia64. (#203017)
+
 * Thu Aug 10 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-8.fc6
 - radeon-6.6.1-xpress-200.patch: Also disable DRI on xpress200, known broken.