From 57d3fc6748a32f5adeefc81b5f61b76d1d4d9afd Mon Sep 17 00:00:00 2001
From: David Spencer <nobbutl@yahoo.co.uk>
Date: Wed, 12 May 2010 17:40:44 +0200
Subject: libraries/glew: Updated for version 1.5.1

---
 libraries/glew/glew.SlackBuild       | 10 ++++++++--
 libraries/glew/glew.info             |  8 ++++----
 libraries/glew/glew_glapientry.patch | 20 ++++++++++----------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/libraries/glew/glew.SlackBuild b/libraries/glew/glew.SlackBuild
index d14be26f22..9e8ea552e6 100644
--- a/libraries/glew/glew.SlackBuild
+++ b/libraries/glew/glew.SlackBuild
@@ -5,7 +5,7 @@
 # This script is dedicated to the public domain
 
 PRGNAM=glew
-VERSION=1.5.0
+VERSION=1.5.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -19,6 +19,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -33,9 +35,13 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 chmod 0755 doc ; chmod a-x doc/*
 
-# This patch resolves a clash between Glew and Slackware 12's Mesa Glut
+# This patch resolves a clash between Glew and Slackware's Mesa Glut
 # (unpatched glew.h undefs a macro GLAPIENTRY defined by Mesa Glut's glu.h).
 patch -p1 < $CWD/glew_glapientry.patch
+# Fix build error in 1.5.1 (bug 2274802)
+_TEMPFILE=$(mktemp)
+fromdos < config/config.guess > ${_TEMPFILE}
+cat ${_TEMPFILE} > config/config.guess ; rm -f ${_TEMPFILE}
 
 make OPT="$SLKCFLAGS"
 make install GLEW_DEST=$PKG/usr
diff --git a/libraries/glew/glew.info b/libraries/glew/glew.info
index e99b558a78..bf37c1176b 100644
--- a/libraries/glew/glew.info
+++ b/libraries/glew/glew.info
@@ -1,8 +1,8 @@
 PRGNAM="glew"
-VERSION="1.5.0"
+VERSION="1.5.1"
 HOMEPAGE="http://glew.sourceforge.net/"
-DOWNLOAD="http://download.sourceforge.net/glew/glew-1.5.0-src.tgz"
-MD5SUM="3fececda0151b060c08ffd8a12892741"
+DOWNLOAD="http://downloads.sourceforge.net/glew/glew-1.5.1-src.tgz"
+MD5SUM="759a59853dfaae4d007b414a3c1712f2"
 MAINTAINER="David Spencer"
 EMAIL="nobbutl@yahoo.co.uk"
-APPROVED="rworkman,Erik Hanson"
+APPROVED="rworkman"
diff --git a/libraries/glew/glew_glapientry.patch b/libraries/glew/glew_glapientry.patch
index 95e21f6017..3dc1e4b308 100644
--- a/libraries/glew/glew_glapientry.patch
+++ b/libraries/glew/glew_glapientry.patch
@@ -1,10 +1,10 @@
---- glew-1.5.0/include/GL/glew.h	2007-12-28 03:09:49.000000000 +0000
-+++ glew-patched/include/GL/glew.h	2008-01-26 11:45:27.000000000 +0000
-@@ -10764,7 +10764,6 @@
- #ifdef GLEW_APIENTRY_DEFINED
- #undef GLEW_APIENTRY_DEFINED
- #undef APIENTRY
--#undef GLAPIENTRY
- #endif
- 
- #ifdef GLEW_CALLBACK_DEFINED
+--- glew-1.5.1/include/GL/glew.h	2008-11-03 06:25:21.000000000 +0000
++++ glew-patched/include/GL/glew.h	2008-11-21 23:23:16.000000000 +0000
+@@ -12243,7 +12243,6 @@
+ #ifdef GLEW_APIENTRY_DEFINED
+ #undef GLEW_APIENTRY_DEFINED
+ #undef APIENTRY
+-#undef GLAPIENTRY
+ #endif
+ 
+ #ifdef GLEW_CALLBACK_DEFINED
-- 
cgit v1.2.3