From 2ed97855e11605096ee3abfa69796bc0632d3628 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sun, 28 Apr 2013 15:13:30 +0000
Subject: [PATCH] Mesa: Update Mesa 7.8.2 patch

* ifeq vs ifdef to ensure DEBUG is disabled
  properly
* call make haiku vs copying haiku to current
* Fixes #9685 gcc2 debug
---
 sys-libs/mesa/mesa-7.8.2.recipe        |  2 +-
 sys-libs/mesa/patches/mesa-7.8.2.patch | 71 +-------------------------
 2 files changed, 3 insertions(+), 70 deletions(-)

diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe
index e908cd79a..0b63bc774 100644
--- a/sys-libs/mesa/mesa-7.8.2.recipe
+++ b/sys-libs/mesa/mesa-7.8.2.recipe
@@ -16,7 +16,7 @@ BUILD()
 {
 	export DEBUG=0
 	cd Mesa-7.8.2
-	make
+	make haiku
 	cd ..
 	sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 7.8.2 ./Mesa-7.8.2
 	echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
diff --git a/sys-libs/mesa/patches/mesa-7.8.2.patch b/sys-libs/mesa/patches/mesa-7.8.2.patch
index d51062ec9..7a4e37ab1 100644
--- a/sys-libs/mesa/patches/mesa-7.8.2.patch
+++ b/sys-libs/mesa/patches/mesa-7.8.2.patch
@@ -234,76 +234,9 @@ diff -Naur Mesa-7.8.2/bin/mklib Mesa-7.8.2-haiku/bin/mklib
 +        mv ${FINAL_BINS} ${INSTALLDIR}/
 +    fi
  fi
-diff -Naur Mesa-7.8.2/configs/current Mesa-7.8.2-haiku/configs/current
---- Mesa-7.8.2/configs/current	1970-01-01 00:00:00.000000000 +0000
-+++ Mesa-7.8.2-haiku/configs/current	2013-04-24 20:34:52.673972224 +0000
-@@ -0,0 +1,63 @@
-+# Configuration for Haiku
-+# Written by Alexander von Gluck IV
-+#
-+# Based on the BeOS config 
-+# written by Philippe Houdoin
-+
-+include $(TOP)/configs/default
-+
-+CONFIG_NAME = haiku
-+
-+# Haiku settings
-+
-+DEFINES = \
-+	-DBEOS_THREADS \
-+	-DGNU_ASSEMBLER \
-+	-DUSE_X86_ASM \
-+	-DUSE_MMX_ASM \
-+	-DUSE_3DNOW_ASM \
-+	-DUSE_SSE_ASM
-+ 
-+MESA_ASM_SOURCES = $(X86_SOURCES)
-+GLAPI_ASM_SOURCES = $(X86_API)
-+
-+CC = gcc
-+CXX = g++
-+LD = gcc
-+ 
-+CFLAGS = -Wall -Wno-multichar $(DEFINES)
-+CXXFLAGS = $(CFLAGS)
-+LDFLAGS +=
-+
-+# Work around aliasing bugs - developers should comment this out
-+CFLAGS += -fno-strict-aliasing
-+#CFLAGS += -std=c99
-+CXXFLAGS += -fno-strict-aliasing
-+
-+# No makedepend on Haiku, this will solve it
-+MKDEP = true
-+
-+# Debug defines
-+ifdef DEBUG
-+	CFLAGS  += -g -O0
-+	LDFLAGS += -g
-+	DEFINES += -DDEBUG
-+else
-+	CFLAGS   += -O3
-+endif
-+
-+# GLU settings
-+GLU_LIB_NAME = libglu.a
-+GLU_LIB = glu
-+
-+# Directories
-+SRC_DIRS = glsl mesa/x86 mapi/glapi mesa glu
-+GLU_DIRS = sgi
-+DRIVER_DIRS =
-+PROGRAM_DIRS =
-+
-+# Library/program dependencies
-+GL_LIB_DEPS = 
-+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-+GLU_LIB_DEPS =  
-+APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)
 diff -Naur Mesa-7.8.2/configs/haiku Mesa-7.8.2-haiku/configs/haiku
 --- Mesa-7.8.2/configs/haiku	1970-01-01 00:00:00.000000000 +0000
-+++ Mesa-7.8.2-haiku/configs/haiku	2013-04-24 20:34:52.675282944 +0000
++++ Mesa-7.8.2-haiku/configs/haiku	2013-04-28 15:02:58.028573696 +0000
 @@ -0,0 +1,63 @@
 +# Configuration for Haiku
 +# Written by Alexander von Gluck IV
@@ -345,7 +278,7 @@ diff -Naur Mesa-7.8.2/configs/haiku Mesa-7.8.2-haiku/configs/haiku
 +MKDEP = true
 +
 +# Debug defines
-+ifdef DEBUG
++ifeq ($(DEBUG),1)
 +	CFLAGS  += -g -O0
 +	LDFLAGS += -g
 +	DEFINES += -DDEBUG