[xorg-x11-drv-mach64] add build fix patch for 32-bit

[Dave Airlie]

commit 0d1cbc012ce93e6e2cb654dfff2b9190bd2741df
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jul 18 05:02:50 2012 -0400

    add build fix patch for 32-bit

 0001-mach64-fix-build-on-32-bit.patch |   28 ++++++++++++++++++++++++++++
 xorg-x11-drv-mach64.spec              |    7 ++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-mach64-fix-build-on-32-bit.patch b/0001-mach64-fix-build-on-32-bit.patch
new file mode 100644
index 0000000..42094df
--- /dev/null
+++ b/0001-mach64-fix-build-on-32-bit.patch
@@ -0,0 +1,28 @@
+From 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at gmail.com>
+Date: Wed, 18 Jul 2012 18:46:49 +1000
+Subject: [PATCH] mach64: fix build on 32-bit.
+
+tvout code only builds on 32-bit, fix build.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ src/atiscreen.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/atiscreen.c b/src/atiscreen.c
+index 2957877..b1fbd3c 100644
+--- a/src/atiscreen.c
++++ b/src/atiscreen.c
+@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
+ #ifdef TV_OUT
+     /* Fix-up TV out after ImpacTV probe */
+     if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO)
+-        ATISwitchMode(0, pScreenInfo->currentMode, 0);
++        ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode));
+ #endif /* TV_OUT */
+ 
+ #ifdef XF86DRI_DEVEL
+-- 
+1.7.10.4
+
diff --git a/xorg-x11-drv-mach64.spec b/xorg-x11-drv-mach64.spec
index 741b886..1209a95 100644
--- a/xorg-x11-drv-mach64.spec
+++ b/xorg-x11-drv-mach64.spec
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 mach64 video driver
 Name:	    xorg-x11-drv-mach64
 Version:    6.9.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -13,6 +13,7 @@ Group:	    User Interface/X Hardware Support
 Source0:    http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 Patch0:	    mach64-6.8.1-defaultdepth.patch
+Patch1:     0001-mach64-fix-build-on-32-bit.patch
 
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
@@ -31,6 +32,7 @@ X.Org X11 mach64 video driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .defaultdepth
+%patch1 -p1 -b .fix32
 
 %build
 # aclocal ; automake -a ; autoconf
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 #{_mandir}/man4/mach64.4*
 
 %changelog
+* Wed Jul 18 2012 Dave Airlie <airlied at redhat.com> 6.9.3-2
+- add build fix patch for 32-bit
+
 * Wed Jul 18 2012 Dave Airlie <airlied at redhat.com> 6.9.3-1
 - mach64 6.9.3