3 files changed, 110 insertions, 0 deletions

diff --git a/graphics/glean/files/patch-common.mak b/graphics/glean/files/patch-common.mak
new file mode 100644
index 000000000000..c43083b4c0af
--- /dev/null
+++ b/graphics/glean/files/patch-common.mak
@@ -0,0 +1,59 @@
+--- ../make/common.mak.orig	Wed Nov  6 19:13:23 2002
++++ ../make/common.mak	Thu Sep 25 16:22:58 2003
+@@ -39,11 +39,11 @@
+ # Locations of common commands:
+ ifeq ($(PLATFORM), Unix)
+ 	AR:=/usr/bin/ar
+-	CC:=/usr/bin/g++
++	CC:=${CXX}
+ 	INSTALL:=/usr/bin/install -c
+ 	RANLIB:=/usr/bin/ranlib
+ 	RM:=/bin/rm
+-	SED:=/bin/sed
++	SED:=/usr/bin/sed
+ 	SHELL:=/bin/sh
+ 	MKDIR:=/bin/mkdir
+ endif # Unix
+@@ -72,14 +72,14 @@
+ ifeq ($(PLATFORM), Unix)
+ 	# Note:  Do *not* list standard system #include directories here,
+ 	# because some compilers complain about them.
+-	XINC:=-I/usr/include/X11
+-	XLIB:=/usr/X11R6/lib
+-	GLINC:=#-I/usr/include
+-	GLLIB:=/usr/lib
+-	GLUTINC:=#-I/usr/include
+-	GLUTLIB:=/usr/lib
+-	TIFFINC:=#-I/usr/include
+-	TIFFLIB:=/usr/lib
++	XINC:=-I${X11BASE}/include
++	XLIB:=${X11BASE}/lib
++	GLINC:=-I${X11BASE}/include
++	GLLIB:=${X11BASE}/lib
++	GLUTINC:=-I${X11BASE}/include
++	GLUTLIB:=${X11BASE}/lib
++	TIFFINC:=-I${LOCALBASE}/include
++	TIFFLIB:=${LOCALBASE}/lib
+ 	EXTRALIBS:=
+ endif # Unix
+ ifeq ($(PLATFORM), BeOS)
+@@ -166,10 +162,7 @@
+ 	$(TIFFINC)
+ OPT:=		# Optimization options
+ ifeq ($(PLATFORM), Unix)
+-_OPT=\
+-	-march=pentiumpro \
+-	-O -fno-unroll-all-loops \
+-	$(OPT)
++_OPT= ${CFLAGS}
+ endif # Unix
+ ifeq ($(PLATFORM), BeOS)
+ _OPT=\
+@@ -183,7 +176,6 @@
+ WARN:=		# warning options
+ ifeq ($(PLATFORM), Unix)
+ _WARN=\
+-	-Wall \
+ 	-W \
+ 	$(WARN)
+ endif # Unix
diff --git a/graphics/glean/files/patch-ttexcombine.cpp b/graphics/glean/files/patch-ttexcombine.cpp
new file mode 100644
index 000000000000..86def8980613
--- /dev/null
+++ b/graphics/glean/files/patch-ttexcombine.cpp
@@ -0,0 +1,10 @@
+--- glean/ttexcombine.cpp.orig	Thu Sep 25 16:17:52 2003
++++ glean/ttexcombine.cpp	Thu Sep 25 16:17:53 2003
+@@ -75,6 +75,7 @@
+ #include "ttexcombine.h"
+ #include <stdio.h>
+ #include <cmath>
++#include <cassert>
+ 
+ #define CLAMP(VAL, MIN, MAX)	\
+ 	((VAL) < (MIN) ? (MIN) : ((VAL) > (MAX) ? (MAX) : (VAL)))
diff --git a/graphics/glean/files/patch-ttexenv.cpp b/graphics/glean/files/patch-ttexenv.cpp
new file mode 100644
index 000000000000..46b7b58e7bd6
--- /dev/null
+++ b/graphics/glean/files/patch-ttexenv.cpp
@@ -0,0 +1,41 @@
+Index: glean/ttexenv.cpp
+===================================================================
+RCS file: /cvsroot/glean/glean/src/glean/ttexenv.cpp,v
+retrieving revision 1.7
+retrieving revision 1.6
+diff -u -u -r1.7 -r1.6
+--- glean/ttexenv.cpp	24 Sep 2003 16:28:08 -0000	1.7
++++ glean/ttexenv.cpp	31 May 2001 16:05:35 -0000	1.6
+@@ -614,8 +614,6 @@
+ 	else
+ 		numModes = 4;
+ 
+-	r.pass = true;
+-
+ 	for (int fmt = 0; fmt < 6; fmt++) {
+ 		const GLenum format = FormatEnums[fmt];
+ 		const char *formatName = FormatNames[fmt];
+@@ -632,7 +630,7 @@
+ 						envName, formatName,
+ 						COLORS, colors, envColor, w)) {
+ 						r.pass = false;
+-						break;
++						return;
+ 					}
+ 				}
+ 			}
+@@ -642,10 +640,14 @@
+ 					envName, formatName,
+ 					COLORS, colors, colors[0], w)) {
+ 					r.pass = false;
++					return;
+ 				}
+ 			}
+ 		}
+ 	}
++
++	r.pass = true;
++
+ } // TexEnvTest::runOne
+ 
+