[packages/xorg-driver-video-mach64] - fix build on ix86 - release 4

[baggins]

commit 699a4e94692173bff7385bef5fc227e1a3e6103d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 24 09:24:45 2012 +0200

    - fix build on ix86
    - release 4

 0001-mach64-fix-build-on-32-bit.patch | 28 ++++++++++++++++++++++++++++
 xorg-driver-video-mach64.spec         |  4 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-mach64.spec b/xorg-driver-video-mach64.spec
index 5853fd5..1882a5a 100644
--- a/xorg-driver-video-mach64.spec
+++ b/xorg-driver-video-mach64.spec
@@ -2,11 +2,12 @@ Summary:	X.org video drivers for ATI VGAWonder/Mach32/Mach64 adapters
 Summary(pl.UTF-8):	Sterowniki obrazu X.org do kart graficznych ATI VGAWonder/Mach32/Mach64
 Name:		xorg-driver-video-mach64
 Version:	6.9.3
-Release:	3
+Release:	4
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-%{version}.tar.bz2
 # Source0-md5:	94189e4ad9dc431a962228c61dae6f77
+Patch0:		0001-mach64-fix-build-on-32-bit.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -60,6 +61,7 @@ większość kart z serii:
 
 %prep
 %setup -q -n xf86-video-mach64-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
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
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-mach64.git/commitdiff/699a4e94692173bff7385bef5fc227e1a3e6103d