summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Mesa/Makefile4
-rw-r--r--graphics/Mesa/Makefile.common14
-rw-r--r--graphics/Mesa/buildlink2.mk5
-rw-r--r--graphics/MesaDemos/Makefile4
-rw-r--r--graphics/MesaLib/Makefile19
-rw-r--r--graphics/MesaLib/buildlink2.mk70
-rw-r--r--graphics/MesaLib/distinfo4
-rw-r--r--graphics/glu/Makefile19
-rw-r--r--graphics/glu/buildlink2.mk65
-rw-r--r--graphics/glu/distinfo4
-rw-r--r--graphics/glut/Makefile15
-rw-r--r--graphics/glut/PLIST6
-rw-r--r--graphics/glut/buildlink2.mk7
-rw-r--r--graphics/glut/distinfo6
14 files changed, 23 insertions, 219 deletions
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 841e75a3ad4..c00e8b49422 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2003/07/17 21:39:58 grant Exp $
+# $NetBSD: Makefile,v 1.51 2003/08/26 01:43:51 jschauma Exp $
#
PKGNAME= Mesa-${MESA_VERSION}
@@ -20,8 +20,6 @@ NO_CONFIGURE= yes
NO_BUILD= yes
EXTRACT_ONLY= # empty
-MAKEFLAGS+= MESA_REQD=${MESA_REQD}
-
do-install: # empty
.include "../../graphics/MesaLib/buildlink2.mk"
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 397715a6d48..5fcb0d3386b 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,10 +1,6 @@
-# $NetBSD: Makefile.common,v 1.17 2003/07/17 21:39:59 grant Exp $
+# $NetBSD: Makefile.common,v 1.18 2003/08/26 01:43:51 jschauma Exp $
-# Latest is: 5.0.1
-# Default is: 3.4.2
-MESA_REQD?= 3.4.2
-
-MESA_VERSION= ${MESA_REQD}
+MESA_VERSION= 5.0.1
DISTNAME?= MesaLib-${MESA_VERSION}
CATEGORIES?= graphics
MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
@@ -21,9 +17,3 @@ GNU_CONFIGURE?= yes
CONFIGURE_ARGS+= --enable-static
.include "../../mk/bsd.prefs.mk"
-
-.if exists(${LOCALBASE}/lib/libGL.so.5) && empty(MESA_REQD:M5.[0-9]*)
-MESA_REQD= 5.0.1
-.endif
-
-MAKEFLAGS+= MESA_REQD="${MESA_REQD}"
diff --git a/graphics/Mesa/buildlink2.mk b/graphics/Mesa/buildlink2.mk
index ab448ef455f..fa1d35aaf1d 100644
--- a/graphics/Mesa/buildlink2.mk
+++ b/graphics/Mesa/buildlink2.mk
@@ -1,13 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/15 23:31:22 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/08/26 01:43:51 jschauma Exp $
.if !defined(MESA_BUILDLINK2_MK)
MESA_BUILDLINK2_MK= # defined
-MESA_REQD?= 3.4.2
BUILDLINK_PREFIX.Mesa= ${BUILDLINK_PREFIX.MesaLib}
-MAKEFLAGS+= MESA_REQD="${MESA_REQD}"
-
.include "../../graphics/MesaLib/buildlink2.mk"
.include "../../graphics/glu/buildlink2.mk"
.include "../../graphics/glut/buildlink2.mk"
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index 000fb6c693a..f6c4c912d9d 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:40:00 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/26 01:43:51 jschauma Exp $
PKGNAME= MesaDemos-${MESA_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -7,8 +7,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//}
MAINTAINER= jschauma@NetBSD.org
COMMENT= OpenGL examples and Demos
-MESA_REQD= 5.0.1
-
.include "../Mesa/Makefile.common"
USE_BUILDLINK2= yes
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 791dbfaf2d6..446ed3b7dea 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/17 21:40:01 grant Exp $
+# $NetBSD: Makefile,v 1.22 2003/08/26 01:43:52 jschauma Exp $
PKGNAME= MesaLib-${MESA_VERSION}
WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//}
@@ -20,23 +20,6 @@ BUILD_DIRS= ${WRKSRC}/src
CONFIGURE_ARGS+= --disable-sparc
.endif
-# XXX should be >= 3.4.2
-.if empty(MESA_REQD:M5.[0-9]*)
-
-# Check if we got Mesa distributed with XFree86 4.x.
-.if exists(${X11BASE}/include/GL/glx.h) && \
- exists(${X11BASE}/lib/X11/config/X11.tmpl)
-_IS_BUILTIN_MESA!= ${EGREP} -c BuildGLXLibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
-.else
-_IS_BUILTIN_MESA= 0
-.endif
-
-.if (${X11PREFIX} == ${X11BASE}) && (${_IS_BUILTIN_MESA} != "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/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk
index e876026de0f..602edcf1e79 100644
--- a/graphics/MesaLib/buildlink2.mk
+++ b/graphics/MesaLib/buildlink2.mk
@@ -1,81 +1,19 @@
-# $NetBSD: buildlink2.mk,v 1.14 2003/07/15 23:31:22 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.15 2003/08/26 01:43:52 jschauma Exp $
.if !defined(MESALIB_BUILDLINK2_MK)
MESALIB_BUILDLINK2_MK= # defined
.include "../../mk/bsd.prefs.mk"
-MESA_REQD?= 3.4.2
-
-.if exists(${LOCALBASE}/lib/libGL.so.5) && empty(MESA_REQD:M5.[0-9]*)
-MESA_REQD= 5.0.1
-.endif
-
-BUILDLINK_DEPENDS.MesaLib?= MesaLib>=${MESA_REQD}
+BUILDLINK_DEPENDS.MesaLib?= MesaLib>=${MESA_VERSION}
BUILDLINK_PKGSRCDIR.MesaLib?= ../../graphics/MesaLib
-_REQUIRE_BUILTIN_MESALIB?= NO
-
-MAKEFLAGS+= MESA_REQD="${MESA_REQD}"
-
-# XXX should be >= 3.4.2
-.if !empty(MESA_REQD:M5.[0-9]*)
-_IS_BUILTIN_MESALIB= 0
-CPPFLAGS+= -DGLX_GLXEXT_LEGACY
-CFLAGS+= -DGLX_GLXEXT_LEGACY
-.else
-
-# Check if we got Mesa distributed with XFree86 4.x or if we need to
-# depend on the Mesa package.
-#
-_GL_GLX_H= ${X11BASE}/include/GL/glx.h
-_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl
-.if exists(${_GL_GLX_H}) && exists(${_X11_TMPL})
-_IS_BUILTIN_MESALIB!= ${EGREP} -c BuildGLXLibrary ${_X11_TMPL} || ${TRUE}
-.else
-_IS_BUILTIN_MESALIB= 0
-.endif
-
-.endif # MESA_REQD
-
-.if !empty(_REQUIRE_BUILTIN_MESALIB:M[yY][eE][sS])
-_NEED_MESALIB= NO
-.else
-. if ${_IS_BUILTIN_MESALIB} == "0"
-_NEED_MESALIB= YES
-. else
-#
-# Create an appropriate package name for the built-in MesaLib distributed
-# with XFree86 4.x. This package name can be used to check against
-# BUILDLINK_DEPENDS.MesaLib to see if we need to install the pkgsrc
-# Mesa or if the built-in one is sufficient.
-#
-. include "../../graphics/Mesa/version.mk"
-_MESALIB_PKG= MesaLib-${_MESA_VERSION}
-_MESALIB_DEPENDS= ${BUILDLINK_DEPENDS.MesaLib}
-_NEED_MESALIB!= \
- if ${PKG_ADMIN} pmatch '${_MESALIB_DEPENDS}' ${_MESALIB_PKG}; then \
- ${ECHO} "NO"; \
- else \
- ${ECHO} "YES"; \
- fi
-. endif
-.endif
-
-.if ${_NEED_MESALIB} == "YES"
BUILDLINK_PACKAGES+= MesaLib
EVAL_PREFIX+= BUILDLINK_PREFIX.MesaLib=MesaLib
BUILDLINK_PREFIX.MesaLib_DEFAULT= ${LOCALBASE}
-.else
-BUILDLINK_PREFIX.MesaLib= ${X11BASE}
-.endif
-.if ${_NEED_MESALIB} == "NO"
-_BLNK_MESALIB_LDFLAGS= -L${BUILDLINK_PREFIX.MesaLib}/lib -lGL
-LIBTOOL_ARCHIVE_UNTRANSFORM_SED+= \
- -e "s|${BUILDLINK_PREFIX.MesaLib}/lib/libGL.la|${_BLNK_MESALIB_LDFLAGS}|g" \
- -e "s|${LOCALBASE}/lib/libGL.la|${_BLNK_MESALIB_LDFLAGS}|g"
-.endif
+CPPFLAGS+= -DGLX_GLXEXT_LEGACY
+CFLAGS+= -DGLX_GLXEXT_LEGACY
BUILDLINK_FILES.MesaLib+= include/GL/GL*.h
BUILDLINK_FILES.MesaLib+= include/GL/gl.h
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 28732727128..3bd4010f9da 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.11 2003/07/04 11:27:39 tron Exp $
+$NetBSD: distinfo,v 1.12 2003/08/26 01:43:52 jschauma Exp $
-SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37
-Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes
SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799
Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes
SHA1 (patch-aa) = 7fa63dca0edfc41812b5432cbabd861ec52cec33
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
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 3355b4e25bd..93a9dd68514 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 21:40:59 grant Exp $
+# $NetBSD: Makefile,v 1.19 2003/08/26 01:43:50 jschauma Exp $
PKGNAME= ${DISTNAME:S/MesaLib/glut/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -28,19 +28,6 @@ post-install:
.include "../../graphics/MesaLib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
-.if (${MESA_REQD} == 3.4.2)
-SO_SUFFIX=3
-SO_VERS=3.7
-.elif (${MESA_REQD} == 5.0.1)
-SO_SUFFIX=10
-SO_VERS=10.1
-.else
-.error Library version not known!
-.endif
-
-PLIST_SUBST+=SO_SUFFIX=${SO_SUFFIX}
-PLIST_SUBST+=SO_VERS=${SO_VERS}
-
# must be below bsd.pkg.mk to overwrite values
PREFIX= ${LOCALBASE}
X11PREFIX= ${LOCALBASE}
diff --git a/graphics/glut/PLIST b/graphics/glut/PLIST
index c662626ac24..a2c32125aa4 100644
--- a/graphics/glut/PLIST
+++ b/graphics/glut/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2003/03/30 08:54:39 jmc Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/08/26 01:43:50 jschauma Exp $
include/GL/glut.h
include/GL/glutf90.h
lib/libglut.so
-lib/libglut.so.${SO_SUFFIX}
-lib/libglut.so.${SO_VERS}
+lib/libglut.so.10
+lib/libglut.so.10.1
lib/libglut.a
lib/libglut.la
@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/glut/buildlink2.mk b/graphics/glut/buildlink2.mk
index 1299fab8e69..7eeec0e524f 100644
--- a/graphics/glut/buildlink2.mk
+++ b/graphics/glut/buildlink2.mk
@@ -1,15 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/15 23:31:23 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/08/26 01:43:50 jschauma Exp $
.if !defined(GLUT_BUILDLINK2_MK)
GLUT_BUILDLINK2_MK= # defined
-MESA_REQD?= 3.4.2
BUILDLINK_PACKAGES+= glut
-BUILDLINK_DEPENDS.glut?= glut>=${MESA_REQD}
+BUILDLINK_DEPENDS.glut?= glut>=${MESA_VERSION}
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 a6a9a5b03d5..dccaf486665 100644
--- a/graphics/glut/distinfo
+++ b/graphics/glut/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.13 2003/07/16 08:51:31 wiz Exp $
+$NetBSD: distinfo,v 1.14 2003/08/26 01:43:50 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 23:05:05 +0000