From owner-freebsd-ports Mon May 15 15:50: 9 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id CAEA837B91A for ; Mon, 15 May 2000 15:50:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id PAA04559; Mon, 15 May 2000 15:50:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from rr.com (rdu25-28-182.nc.rr.com [24.25.28.182]) by hub.freebsd.org (Postfix) with ESMTP id BC77837B58D for ; Mon, 15 May 2000 15:43:45 -0700 (PDT) (envelope-from rhh@rr.com) Received: (from rhh@localhost) by rr.com (8.9.3/8.9.3) id SAA02077; Mon, 15 May 2000 18:44:41 -0400 (EDT) (envelope-from rhh) Message-Id: <200005152244.SAA02077@rr.com> Date: Mon, 15 May 2000 18:44:41 -0400 (EDT) From: aa8vb@ipass.net Reply-To: aa8vb@ipass.net To: FreeBSD-gnats-submit@freebsd.org Cc: aa8vb@ipass.net X-Send-Pr-Version: 3.2 Subject: ports/18575: py-opengl port fix for numpy breakage Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 18575 >Category: ports >Synopsis: py-opengl port fix for numpy breakage >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon May 15 15:50:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Randall Hopper >Release: FreeBSD 3.4-RELEASE i386 >Organization: self >Environment: 3.4-RELEASE, python-1.5.2, Distutils-0.8.2, Numerical-15.3 >Description: This patch to the py-opengl port fixes the breakage caused by the recent update to the numpy port. Note that you'll need the Numerical-15.3 numpy port (committed last night) to build this py-opengl update. >How-To-Repeat: Build port. >Fix: Thanks. --- 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message