diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-07-15 23:31:21 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-07-15 23:31:21 +0000 |
| commit | 937d21f1b753fdbb43ec5c595ab42eca4df5bea5 (patch) | |
| tree | 58657d97d9f03dd23f1118cf80319147241b6f14 /graphics/glut | |
| parent | f9f6d8711b45e4c492cd6dd2434b5bb944ad7f9d (diff) | |
| download | pkgsrc-937d21f1b753fdbb43ec5c595ab42eca4df5bea5.tar.gz | |
Hopefully finally get this right:
Default Mesa Version should be 3.4.2, so that people who don't care and have
GL in XF don't need to build the whole thing. If MESA_REQD is set to 5.0.1
(as, for example, by MesaDemos), require version 5.0.1 of MesaLib, gl* etc.
If libGL.so.5 is found to be present on the system, force MESA_REQD to be
5.0.1 to avoid accidental downgrades if MESA_REQD was not specified before-
hand.
Changes reviewed by tron@ (thanks!).
Diffstat (limited to 'graphics/glut')
| -rw-r--r-- | graphics/glut/buildlink2.mk | 4 | ||||
| -rw-r--r-- | graphics/glut/distinfo | 8 | ||||
| -rwxr-xr-x | graphics/glut/patches/patch-aa | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/graphics/glut/buildlink2.mk b/graphics/glut/buildlink2.mk index 59690b7004e..1299fab8e69 100644 --- a/graphics/glut/buildlink2.mk +++ b/graphics/glut/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.5 2003/03/09 19:04:54 jschauma Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2003/07/15 23:31:23 jschauma Exp $ .if !defined(GLUT_BUILDLINK2_MK) GLUT_BUILDLINK2_MK= # defined @@ -8,6 +8,8 @@ BUILDLINK_PACKAGES+= glut BUILDLINK_DEPENDS.glut?= glut>=${MESA_REQD} BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut +MAKEFLAGS+= MESA_REQD="${MESA_REQD}" + EVAL_PREFIX+= BUILDLINK_PREFIX.glut=glut BUILDLINK_PREFIX.glut_DEFAULT= ${LOCALBASE} BUILDLINK_FILES.glut= include/GL/glut.h diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo index fb25097bcd4..301366fa3fb 100644 --- a/graphics/glut/distinfo +++ b/graphics/glut/distinfo @@ -1,7 +1,11 @@ -$NetBSD: distinfo,v 1.11 2003/07/12 01:07:11 jschauma Exp $ +$NetBSD: distinfo,v 1.12 2003/07/15 23:31:23 jschauma Exp $ +SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37 +Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes +SHA1 (MesaDemos-3.4.2.tar.bz2) = b291eb70c07ad2e12122e53039bf6d36c061a914 +Size (MesaDemos-3.4.2.tar.bz2) = 854130 bytes SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799 Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes SHA1 (MesaDemos-5.0.1.tar.bz2) = 7bc5c33e3799b9cd596311e8dde800800c68c938 Size (MesaDemos-5.0.1.tar.bz2) = 889575 bytes -SHA1 (patch-aa) = 90155341635627e99eca013f5da89a2721bfb0fc +SHA1 (patch-aa) = 1a24208f58cb92d92660a8ef3033952b3fd6c7bb diff --git a/graphics/glut/patches/patch-aa b/graphics/glut/patches/patch-aa index 5d10db724eb..721fc3a80a3 100755 --- a/graphics/glut/patches/patch-aa +++ b/graphics/glut/patches/patch-aa @@ -1,12 +1,14 @@ -$NetBSD: patch-aa,v 1.2 2003/07/12 01:07:11 jschauma Exp $ +$NetBSD: patch-aa,v 1.3 2003/07/15 23:31:23 jschauma Exp $ --- src-glut/glutint.h.orig 2003-07-11 19:33:42.000000000 +0000 +++ src-glut/glutint.h 2003-07-11 19:33:45.000000000 +0000 -@@ -33,6 +33,8 @@ +@@ -33,6 +33,10 @@ #include <gl/mesa_wgl.h> #endif ++#ifdef GL_VERSION_1_4 +#include <GL/glxext.h> ++#endif + #ifndef _WIN32 /* added by BrianP: */ |