[xorg-x11-drv-nouveau] don't try to include vbe.h and xf86int10.h on ppc(64)

[Karsten Hopp]

commit 3b8c97141f0a0e9b3548267b2f2a1592f9ba7b75
Author: Karsten Hopp <karsten at redhat.com>
Date:   Mon Jul 2 12:18:22 2012 +0200

    don't try to include vbe.h and xf86int10.h on ppc(64)

 xorg-x11-drv-nouveau-ppc.patch |   39 +++++++++++++++++++++++++++++++++++++++
 xorg-x11-drv-nouveau.spec      |    9 ++++++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/xorg-x11-drv-nouveau-ppc.patch b/xorg-x11-drv-nouveau-ppc.patch
new file mode 100644
index 0000000..e64a4e6
--- /dev/null
+++ b/xorg-x11-drv-nouveau-ppc.patch
@@ -0,0 +1,39 @@
+diff -up xf86-video-nouveau-1.0.1/src/nv_driver.c.ppc xf86-video-nouveau-1.0.1/src/nv_driver.c
+--- xf86-video-nouveau-1.0.1/src/nv_driver.c.ppc	2012-07-02 12:08:19.172163488 +0200
++++ xf86-video-nouveau-1.0.1/src/nv_driver.c	2012-07-02 12:08:57.547809381 +0200
+@@ -25,7 +25,9 @@
+ #include "nv_include.h"
+ 
+ #include "xorg-server.h"
++#if !defined(__powerpc__)
+ #include "xf86int10.h"
++#endif
+ #include "xf86drm.h"
+ #include "xf86drmMode.h"
+ #include "nouveau_drm.h"
+diff -up xf86-video-nouveau-1.0.1/src/nv_include.h.ppc xf86-video-nouveau-1.0.1/src/nv_include.h
+--- xf86-video-nouveau-1.0.1/src/nv_include.h.ppc	2012-07-02 11:40:16.658531972 +0200
++++ xf86-video-nouveau-1.0.1/src/nv_include.h	2012-07-02 11:46:14.203915773 +0200
+@@ -30,7 +30,9 @@
+ 
+ #include "xf86DDC.h"
+ 
++#if !defined(__powerpc__)
+ #include "vbe.h"
++#endif
+ 
+ #include "xf86RandR12.h"
+ 
+diff -up xf86-video-nouveau-1.0.1/src/nv_type.h.ppc xf86-video-nouveau-1.0.1/src/nv_type.h
+--- xf86-video-nouveau-1.0.1/src/nv_type.h.ppc	2012-07-02 12:07:22.543161675 +0200
++++ xf86-video-nouveau-1.0.1/src/nv_type.h	2012-07-02 12:09:03.701592241 +0200
+@@ -3,7 +3,9 @@
+ 
+ #include "colormapst.h"
+ #include "xf86Cursor.h"
++#if !defined(__powerpc__)
+ #include "xf86int10.h"
++#endif
+ #include "exa.h"
+ #ifdef XF86DRI
+ #define _XF86DRI_SERVER_
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index 49ba5b7..e0869b5 100644
--- a/xorg-x11-drv-nouveau.spec
+++ b/xorg-x11-drv-nouveau.spec
@@ -8,7 +8,7 @@ Name:      xorg-x11-drv-nouveau
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   1.0.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -22,6 +22,7 @@ Source0: http://nouveau.freedesktop.org/release/xf86-video-nouveau-%{version}.ta
 Source1: make-git-snapshot.sh
 
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
+Patch0:  xorg-x11-drv-nouveau-ppc.patch
 
 BuildRequires: libtool automake autoconf
 BuildRequires: xorg-x11-server-devel > 1.7.99.3-3
@@ -49,6 +50,9 @@ X.Org X11 nouveau video driver.
 
 %prep
 %setup -q -n xf86-video-nouveau-%{dirsuffix}
+%ifarch ppc %{power64}
+%patch0 -p1
+%endif
 
 %build
 autoreconf -v --install
@@ -72,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon Jul 02 2012 Karsten Hopp <karsten at redhat.com> 1.0.1-2
+- we don't have vbe.h and xf86int10.h in xorg-x11-server-devel for ppc(64)
+
 * Tue Jun 19 2012 Ben Skeggs <bskeggs at redhat.com> 1.0.1-1
 - nouveau 1.0.1