From 9db398a240675e9e2a0e7f5681ed494c91ff13b7 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Wed, 25 Dec 2013 20:25:04 -0600
Subject: [PATCH] glu: Fix GLU for new libGL provided by Mesa

* Remove glapi hacks
---
 sys-libs/glu/glu-9.0.0.recipe | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe
index 85569360c..6850e66d6 100644
--- a/sys-libs/glu/glu-9.0.0.recipe
+++ b/sys-libs/glu/glu-9.0.0.recipe
@@ -5,7 +5,7 @@ COPYRIGHT="Copyright (C) 1999-2012 Brian Paul and others.  All Rights Reserved."
 LICENSE="MIT"
 SRC_URI="ftp://freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz"
 CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -15,12 +15,13 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libGL${secondaryArchSuffix}
 	"
 BUILD_REQUIRES="
-	devel:libglapi$secondaryArchSuffix
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libGL$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -29,13 +30,6 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	# The Haiku build system builds libGL.so from libglapi and libglu. Since the
-	# glu build system requires libGL.so (since the shared libglu.so is linked
-	# against it), we build a dummy libGL.so from libglapi.a.
-	gcc -o libGL.so -shared -Xlinker --whole-archive -lglapi
-	libglLinkFlags="-L$(pwd)"
-
-	LDFLAGS="$libglLinkFlags" \
 	runConfigure ./configure
 	make $jobArgs
 }