diff options
| author | jlam <jlam> | 2002-11-20 22:13:21 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-11-20 22:13:21 +0000 |
| commit | b996930c139e64ce714409443991827b4a21feda (patch) | |
| tree | 325fd76bed1623994564db2a38a1cb0f9329f2a2 /graphics/glu | |
| parent | b28c0441cc802af0e4be549ee5832d8a1810060c (diff) | |
| download | pkgsrc-b996930c139e64ce714409443991827b4a21feda.tar.gz | |
Compute version of built-in Mesa without using "glxinfo", which is broken
when the capabilities of the running X11 server differ from the X11 server
on the system for which the package is meant. We now try to guess the
Mesa version number based on which OpenGL specification is implemented.
Separate out the logic into its own file, Mesa/version.mk, and use it in
MesaLib's and glu's buildlink2.mk files.
Note that Mesa/version.mk should only be used by the Mesa packages and is
_not_ for general use.
Diffstat (limited to 'graphics/glu')
| -rw-r--r-- | graphics/glu/buildlink2.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/graphics/glu/buildlink2.mk b/graphics/glu/buildlink2.mk index 58826b0bf5c..f46a2784a74 100644 --- a/graphics/glu/buildlink2.mk +++ b/graphics/glu/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.6 2002/11/19 09:19:37 tron Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2002/11/20 22:13:22 jlam Exp $ .if !defined(GLU_BUILDLINK2_MK) GLU_BUILDLINK2_MK= # defined @@ -34,14 +34,8 @@ _NEED_GLU= YES # BUILDLINK_DEPENDS.glu to see if we need to install the pkgsrc Mesa/GLU # or if the built-in one is sufficient. # -. if exists(${X11BASE}/bin/glxinfo) && defined(DISPLAY) -_GLU_VERSION!= \ - ${X11BASE}/bin/glxinfo | \ - ${SED} -n "/OpenGL version string/s/.*Mesa *//p" -. else -_GLU_VERSION?= 3.4 -. endif -_GLU_PKG= glu-${_GLU_VERSION} +. include "../../graphics/Mesa/version.mk" +_GLU_PKG= glu-${_MESA_VERSION} _GLU_DEPENDS= ${BUILDLINK_DEPENDS.glu} _NEED_GLU!= \ if ${PKG_ADMIN} pmatch '${_GLU_DEPENDS}' ${_GLU_PKG}; then \ |