Attachment 8962 Details for Bug 18575 – file.diff

[patch] file.diff

file.diff (text/plain), 2.73 KB, created by Randall Hopper on 2000-05-15 23:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Randall Hopper

Created: 2000-05-15 23:50:00 UTC

Size: 2.73 KB

patch

obsolete

>--- old/files/Setup.base	Sun Nov 28 18:14:00 1999
>+++ py-opengl/files/Setup.base	Mon May 15 17:46:58 2000
>@@ -9,10 +9,10 @@
> #
> 
> # This module provides most of the interfaces to the standard OpenGL API
>-_opengl	_openglmodule.c  -IX11BASE/include -LX11BASE/lib -lGL 
>+_opengl	_openglmodule.c  -IX11BASE/include -LX11BASE/lib -lGL -lXext -lX11
> 
> # Some convenience functions contributed by users.
>-openglutil	openglutil.c  -IX11BASE/include -LX11BASE/lib -lGL 
>+openglutil	openglutil.c  -IX11BASE/include -LX11BASE/lib -lGL -lXext -lX11
> 
> # 
> # If you have the Numeric extensions installed, make sure the
>@@ -22,13 +22,22 @@
> # These modules provide a few more features than the two modules
> # above, and significantly more speed in some circumstances
> #
>+# (( Will these guys ever decide on "one" include directory name?! ))
> _opengl_num	_opengl_nummodule.c  -DNUMERIC \
> 	-ILOCALBASE/include/python1.5/numerical \
>-	-IX11BASE/include -LX11BASE/lib -lGL 
>+	-ILOCALBASE/include/python1.5/Numeric \
>+	-IX11BASE/include -LX11BASE/lib -lGL -lXext -lX11
> 
> openglutil_num	openglutil_num.c  -DNUMERIC \
> 	-ILOCALBASE/include/python1.5/numerical \
>-	-IX11BASE/include -LX11BASE/lib -lGL 
>+	-ILOCALBASE/include/python1.5/Numeric \
>+	-IX11BASE/include -LX11BASE/lib -lGL -lXext -lX11
>+# NOTES:  
>+#  - The -lX11 for _opengl_num and openglutil_num is a hack around 
>+#    XFree86 4.0 libGL.so's undeclared dependence on libX11 (e.g. XFreePixmap).
>+#  - The -lXext for _opengl_num and opengl_num is a hack around
>+#    XFree86 4.0 libGL.so's undeclared depdnence on libXext 
>+#    (e.g. XextAddDisplay)
> 
> # The GLU utility library -- part of most standard OpenGL setups
> _glu	_glumodule.c  \
>@@ -40,7 +49,7 @@
> 	-lglut  \
> # You'll definitely need these (or maybe edit them for MesaGL/MesaGLU:
> 	-IX11BASE/include -LX11BASE/lib \
>-	-lGLU -lGL  \
>+	-lGLU -lGL \
> # Various combinations of these depending on your platform:
> 	-lXi -lXmu -lXext -lX11 \
> # on SGI IRIX 6, uncomment the following
>--- old/Makefile	Sun Apr 30 06:12:20 2000
>+++ py-opengl/Makefile	Mon May 15 16:53:30 2000
>@@ -8,7 +8,8 @@
> PORTNAME=	opengl
> PORTVERSION=	1.5.5
> CATEGORIES=	graphics python
>-MASTER_SITES=	http://starship.python.net/crew/da/
>+MASTER_SITES=	http://www.ipass.net/~dbhopper/aa8vb/TMP/ \
>+		http://starship.python.net/crew/da/
> PKGNAMEPREFIX=	py-
> DISTNAME=	PyOpenGL-${PORTVERSION}
> 
>@@ -20,8 +21,6 @@
> 		${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy
> LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
> 
>-BROKEN=		"Does not compile"
>-
> ALL_TARGET=	default
> 
> WRKSRC=		${WRKDIR}/${DISTNAME}/src
>@@ -32,7 +31,7 @@
> #
> # Support for Numeric is compiled in by default.
> #
>-NUMPYDIR=	${LOCALBASE}/lib/python1.5/site-packages/numerical
>+NUMPYDIR=	${LOCALBASE}/lib/python1.5/site-packages/Numeric
> 
> #
> # The standard setup file

Actions: View | Diff

Attachments on bug 18575: 8962