diff options
author | jschauma <jschauma@pkgsrc.org> | 2003-08-26 01:43:48 +0000 |
---|---|---|
committer | jschauma <jschauma@pkgsrc.org> | 2003-08-26 01:43:48 +0000 |
commit | aa0aa518ac14831c74a251ce2f29ab666a0ee437 (patch) | |
tree | f140f06de4c7c70760a39202e8a58d32c2b1d16a /graphics/glu | |
parent | 06d1f547a30205849de1743770d1e6f9ccbcabc9 (diff) | |
download | pkgsrc-aa0aa518ac14831c74a251ce2f29ab666a0ee437.tar.gz |
Finally remove support of Mesa 3.4.1 completely as discussed at length
on tech-pkg@ at various times. This means that regardless of what kind of
GL support comes with X11, if a package depends on GL, Mesa 5.0.1 (or higher)
will be installed into ${LOCALBASE}.
Some troubleshooting after the latest patches by Krister Walfridsson.
Diffstat (limited to 'graphics/glu')
-rw-r--r-- | graphics/glu/Makefile | 19 | ||||
-rw-r--r-- | graphics/glu/buildlink2.mk | 65 | ||||
-rw-r--r-- | graphics/glu/distinfo | 4 |
3 files changed, 5 insertions, 83 deletions
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index c3687433c0e..413492a070a 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/07/17 21:40:58 grant Exp $ +# $NetBSD: Makefile,v 1.18 2003/08/26 01:43:49 jschauma Exp $ PKGNAME= ${DISTNAME:C/MesaLib/glu/} WRKSRC= ${WRKDIR}/${DISTNAME:C/Lib//} @@ -16,23 +16,6 @@ BUILD_DIRS= ${WRKSRC}/src-glu .include "../../mk/bsd.prefs.mk" -# XXX should be >= 3.4.2 -.if empty(MESA_REQD:M5.[0-9]*) - -# Check if we got libGLU distributed with XFree86 4.x. -.if exists(${X11BASE}/include/GL/glu.h) && \ - exists(${X11BASE}/lib/X11/config/X11.tmpl) -_IS_BUILTIN_GLU!= ${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} -.else -_IS_BUILTIN_GLU= 0 -.endif - -.if (${X11PREFIX} == ${X11BASE}) && (${_IS_BUILTIN_GLU} != "0") -PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution" -.endif - -.endif # MESA_REQD - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/GL cd ${WRKSRC}/include/GL; for hdr in \ diff --git a/graphics/glu/buildlink2.mk b/graphics/glu/buildlink2.mk index acf860629be..23eb076c2af 100644 --- a/graphics/glu/buildlink2.mk +++ b/graphics/glu/buildlink2.mk @@ -1,74 +1,15 @@ -# $NetBSD: buildlink2.mk,v 1.11 2003/07/15 23:31:22 jschauma Exp $ +# $NetBSD: buildlink2.mk,v 1.12 2003/08/26 01:43:49 jschauma Exp $ .if !defined(GLU_BUILDLINK2_MK) GLU_BUILDLINK2_MK= # defined .include "../../mk/bsd.prefs.mk" -MESA_REQD?= 3.4.2 -BUILDLINK_DEPENDS.glu?= glu>=${MESA_REQD} -BUILDLINK_PKGSRCDIR.glu?= ../../graphics/glu - -_REQUIRE_BUILTIN_GLU?= NO - -MAKEFLAGS+= MESA_REQD="${MESA_REQD}" - -# XXX should be >= 3.4.2 -.if !empty(MESA_REQD:M5.[0-9]*) -_IS_BUILTIN_GLU= 0 -.else - -# Check if we got libGLU distributed with XFree86 4.x or if we need to -# depend on the glu package. -# -_GL_GLU_H= ${X11BASE}/include/GL/glu.h -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl -.if exists(${_GL_GLU_H}) && exists(${_X11_TMPL}) -_IS_BUILTIN_GLU!= ${EGREP} -c BuildGLULibrary ${_X11_TMPL} || ${TRUE} -.else -_IS_BUILTIN_GLU= 0 -.endif - -.endif # MESA_REQD - -.if !empty(_REQUIRE_BUILTIN_GLU:M[yY][eE][sS]) -_NEED_GLU= NO -.else -. if ${_IS_BUILTIN_GLU} == "0" -_NEED_GLU= YES -. else -# -# Create an appropriate package name for the built-in Mesa/GLU distributed -# with XFree86 4.x. This package name can be used to check against -# BUILDLINK_DEPENDS.glu to see if we need to install the pkgsrc Mesa/GLU -# or if the built-in one is sufficient. -# -. 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 \ - ${ECHO} "NO"; \ - else \ - ${ECHO} "YES"; \ - fi -. endif -.endif - -.if ${_NEED_GLU} == "YES" BUILDLINK_PACKAGES+= glu +BUILDLINK_DEPENDS.glu?= glu>=${MESA_VERSION} +BUILDLINK_PKGSRCDIR.glu?= ../../graphics/glu EVAL_PREFIX+= BUILDLINK_PREFIX.glu=glu BUILDLINK_PREFIX.glu_DEFAULT= ${LOCALBASE} -.else -BUILDLINK_PREFIX.glu= ${X11BASE} -.endif - -.if ${_NEED_GLU} == "NO" -_BLNK_GLU_LDFLAGS= -L${BUILDLINK_PREFIX.glu}/lib -lGLU -LIBTOOL_ARCHIVE_UNTRANSFORM_SED+= \ - -e "s|${BUILDLINK_PREFIX.glu}/lib/libGLU.la|${_BLNK_GLU_LDFLAGS}|g" \ - -e "s|${LOCALBASE}/lib/libGLU.la|${_BLNK_GLU_LDFLAGS}|g" -.endif BUILDLINK_FILES.glu= include/GL/glu.h BUILDLINK_FILES.glu+= include/GL/glu_mangle.h diff --git a/graphics/glu/distinfo b/graphics/glu/distinfo index cf14873e128..fda715e2ab8 100644 --- a/graphics/glu/distinfo +++ b/graphics/glu/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.10 2003/07/22 14:02:58 jschauma Exp $ +$NetBSD: distinfo,v 1.11 2003/08/26 01:43:49 jschauma Exp $ SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799 Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes -SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37 -Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes |