mesa: Changes to 'debian-unstable'
debian/changelog | 2 ++
src/mesa/main/compiler.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 86ef7e64c8f8aa35bf6462ac1b734d37c67d83b1
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Jun 27 17:19:14 2013 +0200
debian/changelog: Add changelog entry
diff --git a/debian/changelog b/debian/changelog
index 2ea885d..00fb8ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ mesa (9.1.3-7) UNRELEASED; urgency=low
[ Andreas Boll ]
* Use dpkg-buildflags.
* Disable silent rules.
+ * Cherry-pick commit 0829b89 (mesa: Fix ieee fp on Alpha) from upstream
+ (Fixes FTBFS on alpha)
-- Julien Cristau <jcristau@debian.org> Tue, 25 Jun 2013 21:26:56 +0200
commit 622f06d96557d4ab7c7b0530e4bdf1138ccde12e
Author: Sven Joachim <svenjoac@gmx.de>
Date: Fri Jun 14 22:10:33 2013 +0200
mesa: Fix ieee fp on Alpha
Commit 1f82bf12ed inadvertently broke it, checking for __IEEE_FLOAT on all
Alpha machines instead of only on VMS as before.
NOTE: This is a candidate for the 9.1 branch.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
Signed-off-by: Sven Joachim <svenjoac@gmx.de>
(cherry picked from commit 0829b893a9e9c874c0ef80d343af49334305e32e)
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 8b23665..8f8bd05 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -316,7 +316,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
defined(__arm__) || \
defined(__sh__) || defined(__m32r__) || \
(defined(__sun) && defined(_IEEE_754)) || \
- (defined(__alpha__) && defined(__IEEE_FLOAT))
+ defined(__alpha__)
#define USE_IEEE
#define IEEE_ONE 0x3f800000
#endif
Reply to: