From a9bbe1bb173e5bf9f2f840b34f33035ea4a6bc08 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck <kallisti5@unixzen.com>
Date: Wed, 20 Mar 2013 03:17:14 +0000
Subject: [PATCH] Mesa: Improve quality

* Fix bugs in bep's
* Make debug builds of mesa easier
* LLVM check didn't work due to
  beps failing at the first non-0
  exit code. Remove for now
---
 sys-libs/mesa/buildpackage.sh |  6 +++++-
 sys-libs/mesa/mesa-7.8.2.bep  |  1 +
 sys-libs/mesa/mesa-9.0.1.bep  |  3 ++-
 sys-libs/mesa/mesa-9.0.2.bep  | 21 +++------------------
 sys-libs/mesa/mesa-9.0.bep    |  3 ++-
 sys-libs/mesa/mesa-9.1.0.bep  | 23 ++++-------------------
 6 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/sys-libs/mesa/buildpackage.sh b/sys-libs/mesa/buildpackage.sh
index 1f161e1cc..6fc82c244 100644
--- a/sys-libs/mesa/buildpackage.sh
+++ b/sys-libs/mesa/buildpackage.sh
@@ -13,7 +13,11 @@ echo " Welcome to Mesa-O-Matic!"
 echo "-=-=-=-=-=-=-=-=-=-=-=-=-="
 echo ""
 
-DEBUG=0
+if [[ $DEBUG -eq 1 ]]; then
+	echo "Debugging: enabled"
+else
+	echo "Debugging: disabled"
+fi
 
 #######################################################################
 # END CONFIG DATA, Dragons below!
diff --git a/sys-libs/mesa/mesa-7.8.2.bep b/sys-libs/mesa/mesa-7.8.2.bep
index bf2222b33..0fbc12615 100644
--- a/sys-libs/mesa/mesa-7.8.2.bep
+++ b/sys-libs/mesa/mesa-7.8.2.bep
@@ -13,6 +13,7 @@ DEPEND=""
 CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57"
 MESSAGE="This port only builds with gcc2. Not for general use."
 BUILD {
+	export DEBUG=0
 	cd Mesa-7.8.2
 	make
 	cd ..
diff --git a/sys-libs/mesa/mesa-9.0.1.bep b/sys-libs/mesa/mesa-9.0.1.bep
index 19d52a98d..d03000d46 100644
--- a/sys-libs/mesa/mesa-9.0.1.bep
+++ b/sys-libs/mesa/mesa-9.0.1.bep
@@ -13,8 +13,9 @@ DEPEND="scons"
 CHECKSUM_MD5="97d6554c05ea7449398afe3a0ede7018"
 MESSAGE="This port only builds with gcc4. Not for general use."
 BUILD {
+	export DEBUG=0
 	cd Mesa-9.0.1
-	scons
+	scons debug=$DEBUG
 	cd ..
 	sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.1 ./Mesa-9.0.1
 	echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
diff --git a/sys-libs/mesa/mesa-9.0.2.bep b/sys-libs/mesa/mesa-9.0.2.bep
index 3e9cc10c4..6bc915411 100644
--- a/sys-libs/mesa/mesa-9.0.2.bep
+++ b/sys-libs/mesa/mesa-9.0.2.bep
@@ -9,31 +9,16 @@ HOMEPAGE="http://www.freedesktop.org/"
 SRC_URI="ftp://freedesktop.org/pub/mesa/9.0.2/MesaLib-9.0.2.tar.bz2"
 REVISION="1"
 STATUS_HAIKU="stable"
-DEPEND="scons"
+DEPEND="scons, llvm >= 3.2"
 CHECKSUM_MD5="dc45d1192203e418163e0017640e1cfc"
 MESSAGE="This port only builds with gcc4. Not for general use."
 BUILD {
-	# this stuff isn't obvious... so notify user
+	export DEBUG=0
 	echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
 	echo "This generates a Mesa3D build package for Haiku... not for general use"
 	echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
-	which llvm-link > /dev/null
-	if [[ $? -eq 0 ]]; then
-	        echo "+ llvm enabled build: yes"
-		LLVM_VER=$(llvm-link --version | grep "version")
-		echo "  -" $LLVM_VER
-		echo "  - You will need to use an llvm optional build package"
-		echo "    while compiling Haiku Gallium GL add-ons"
-	else
-	        echo "+ llvm enabled build: no" 
-		echo "  - llvm optional build package will not be required"
-		echo "    while compiling Haiku Gallium GL add-ons"
-		echo "  - To take advantage of llvm, install llvm before compiling"
-	fi
-	echo ""
-	read -p "Press [Enter] to continue..."
 	cd Mesa-9.0.2
-	scons
+	scons debug=$DEBUG
 	cd ..
 	sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.2 ./Mesa-9.0.2
 	echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
diff --git a/sys-libs/mesa/mesa-9.0.bep b/sys-libs/mesa/mesa-9.0.bep
index 00a0a8440..768707c1e 100644
--- a/sys-libs/mesa/mesa-9.0.bep
+++ b/sys-libs/mesa/mesa-9.0.bep
@@ -13,8 +13,9 @@ DEPEND="scons"
 CHECKSUM_MD5="60e557ce407be3732711da484ab3db6c"
 MESSAGE="This port only builds with gcc4. Not for general use."
 BUILD {
+	export DEBUG=0
 	cd Mesa-9.0
-	scons
+	scons debug=$DEBUG
 	cd ..
 	sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0 ./Mesa-9.0
 	echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
diff --git a/sys-libs/mesa/mesa-9.1.0.bep b/sys-libs/mesa/mesa-9.1.0.bep
index 6b7c63a22..e35967ffc 100644
--- a/sys-libs/mesa/mesa-9.1.0.bep
+++ b/sys-libs/mesa/mesa-9.1.0.bep
@@ -9,31 +9,16 @@ HOMEPAGE="http://www.freedesktop.org/"
 SRC_URI="ftp://freedesktop.org/pub/mesa/9.1/MesaLib-9.1.tar.bz2"
 REVISION="1"
 STATUS_HAIKU="unstable"
-DEPEND="scons"
+DEPEND="scons, llvm >= 3.2"
 CHECKSUM_MD5="d3891e02215422e120271d976ff1947e"
 MESSAGE="This port only builds with gcc4. Not for general use."
 BUILD {
-	# this stuff isn't obvious... so notify user
+	export DEBUG=0
 	echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
 	echo "This generates a Mesa3D build package for Haiku... not for general use"
 	echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
-	which llvm-link > /dev/null
-	if [[ $? -eq 0 ]]; then
-	        echo "+ llvm enabled build: yes"
-		LLVM_VER=$(llvm-link --version | grep "version")
-		echo "  -" $LLVM_VER
-		echo "  - You will need to use an llvm optional build package"
-		echo "    while compiling Haiku Gallium GL add-ons"
-	else
-	        echo "+ llvm enabled build: no" 
-		echo "  - llvm optional build package will not be required"
-		echo "    while compiling Haiku Gallium GL add-ons"
-		echo "  - To take advantage of llvm, install llvm before compiling"
-	fi
-	echo ""
-	read -p "Press [Enter] to continue..."
-	cd Mesa-9.1.0
-	scons
+	cd Mesa-9.1
+	scons debug=$DEBUG
 	cd ..
 	sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.1.0 ./Mesa-9.1
 	echo "There should be a Mesa OptionalBuild package in your home if everything went well!"