From 6654a2f43447d0c7666c197c828bd173dd6ef17728ee7e579a341968ee17ac72 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 29 Jan 2010 14:01:40 +0000
Subject: [PATCH] Accepting request 30735 from X11:XOrg

Copy from X11:XOrg/Mesa based on submit request 30735 from user coolo

OBS-URL: https://build.opensuse.org/request/show/30735
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=80
---
 Mesa.changes                  |  5 +++++
 Mesa.spec                     |  6 ++++--
 spantmp2_h_ppc_build_fix.diff | 11 +++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 spantmp2_h_ppc_build_fix.diff

diff --git a/Mesa.changes b/Mesa.changes
index e8c4511..996d580 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 22 14:19:15 CET 2010 - ro@suse.de
+
+- fix build for ppc 
+
 -------------------------------------------------------------------
 Tue Dec 22 04:55:36 CET 2009 - sndirsch@suse.de
 
diff --git a/Mesa.spec b/Mesa.spec
index 678df9a..bedf71e 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package Mesa (Version 7.7)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -33,7 +33,7 @@ Obsoletes:      Mesa-64bit
 %endif
 #
 Version:        7.7
-Release:        5
+Release:        6
 Summary:        Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL
 Source:         MesaLib-%{version}.tar.bz2
 Source1:        MesaDemos-%{version}.tar.bz2
@@ -42,6 +42,7 @@ Source3:        README.updates
 Source4:        manual-pages.tar.bz2
 Source5:        drirc
 Patch1:         dri_driver_dir.diff
+Patch2:         spantmp2_h_ppc_build_fix.diff
 Patch6:         link-shared.diff
 Patch7:         disable_gem_warning.diff
 Patch15:        Mesa_indirect_old_xserver_compatibility.diff
@@ -113,6 +114,7 @@ rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl}
 # we use freeglut
 rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h}
 %patch1
+%patch2
 sed -i 's/REPLACE/%_lib/g' src/glx/x11/Makefile
 ### FIXME
 #%patch6
diff --git a/spantmp2_h_ppc_build_fix.diff b/spantmp2_h_ppc_build_fix.diff
new file mode 100644
index 0000000..6fb765b
--- /dev/null
+++ b/spantmp2_h_ppc_build_fix.diff
@@ -0,0 +1,11 @@
+--- src/mesa/drivers/dri/common/spantmp2.h
++++ src/mesa/drivers/dri/common/spantmp2.h
+@@ -400,7 +400,7 @@
+ #  define READ_RGBA( rgba, _x, _y )				        \
+      do {								\
+         GLuint p = GET_VALUE(_x, _y);					\
+-        *((uint32_t *) rgba) = (t << 8) | 0xff;				\
++        *((uint32_t *) rgba) = (p << 8) | 0xff;				\
+      } while (0)
+ # else
+ #  define READ_RGBA( rgba, _x, _y )				        \