diff options
| author | tg <tg@FreeBSD.org> | 2000-05-16 09:07:56 +0000 |
|---|---|---|
| committer | tg <tg@FreeBSD.org> | 2000-05-16 09:07:56 +0000 |
| commit | a84975ab03c92d01c8ba284f77a7b5c0ea27488d (patch) | |
| tree | ee83161e780fd2a831ce27589cce4f66b0668b41 | |
| parent | d4c6f8b730682c034e36e983f3084390cfa1f0c2 (diff) | |
| download | FreeBSD-ports-a84975ab03c92d01c8ba284f77a7b5c0ea27488d.zip FreeBSD-ports-a84975ab03c92d01c8ba284f77a7b5c0ea27488d.tar.gz | |
Fix recent breakage caused by py-numeric update.
PR: 18575
Submitted by: Randall Hopper <aa8vb@ipass.net>
| -rw-r--r-- | graphics/py-opengl/Makefile | 7 | ||||
| -rw-r--r-- | graphics/py-opengl/files/Setup.base | 19 |
2 files changed, 17 insertions, 9 deletions
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index 94c625d..56999d7 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -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 @@ RUN_DEPENDS= python:${PORTSDIR}/lang/python \ ${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 @@ PLIST_SUB+= OSMAJOR=${OSMAJOR} # # 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 diff --git a/graphics/py-opengl/files/Setup.base b/graphics/py-opengl/files/Setup.base index ebd688b..135f831 100644 --- a/graphics/py-opengl/files/Setup.base +++ b/graphics/py-opengl/files/Setup.base @@ -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 @@ openglutil openglutil.c -IX11BASE/include -LX11BASE/lib -lGL # 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 @@ _glut \ -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 |
