pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Finally remove support of Mesa 3.4.1 completely as dis...
details: https://anonhg.NetBSD.org/pkgsrc/rev/0804267f9b00
branches: trunk
changeset: 460252:0804267f9b00
user: jschauma <jschauma%pkgsrc.org@localhost>
date: Tue Aug 26 01:43:48 2003 +0000
description:
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:
graphics/Mesa/Makefile | 4 +-
graphics/Mesa/Makefile.common | 14 +-----
graphics/Mesa/buildlink2.mk | 5 +-
graphics/MesaDemos/Makefile | 4 +-
graphics/MesaLib/Makefile | 19 +--------
graphics/MesaLib/buildlink2.mk | 70 +--------------------------------
graphics/MesaLib/distinfo | 4 +-
graphics/glu/Makefile | 19 +--------
graphics/glu/buildlink2.mk | 65 +------------------------------
graphics/glu/distinfo | 4 +-
graphics/glut/Makefile | 15 +------
graphics/glut/PLIST | 6 +-
graphics/glut/buildlink2.mk | 7 +--
graphics/glut/distinfo | 6 +--
pkgtools/x11-links/Makefile | 4 +-
pkgtools/x11-links/xfree.buildlink2.mk | 4 +-
16 files changed, 25 insertions(+), 225 deletions(-)
diffs (truncated from 455 to 300 lines):
diff -r 583899cfbaa4 -r 0804267f9b00 graphics/Mesa/Makefile
--- a/graphics/Mesa/Makefile Mon Aug 25 21:27:15 2003 +0000
+++ b/graphics/Mesa/Makefile Tue Aug 26 01:43:48 2003 +0000
@@ -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_BUILD= yes
EXTRACT_ONLY= # empty
-MAKEFLAGS+= MESA_REQD=${MESA_REQD}
-
do-install: # empty
.include "../../graphics/MesaLib/buildlink2.mk"
diff -r 583899cfbaa4 -r 0804267f9b00 graphics/Mesa/Makefile.common
--- a/graphics/Mesa/Makefile.common Mon Aug 25 21:27:15 2003 +0000
+++ b/graphics/Mesa/Makefile.common Tue Aug 26 01:43:48 2003 +0000
@@ -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 @@
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 -r 583899cfbaa4 -r 0804267f9b00 graphics/Mesa/buildlink2.mk
--- a/graphics/Mesa/buildlink2.mk Mon Aug 25 21:27:15 2003 +0000
+++ b/graphics/Mesa/buildlink2.mk Tue Aug 26 01:43:48 2003 +0000
@@ -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 -r 583899cfbaa4 -r 0804267f9b00 graphics/MesaDemos/Makefile
--- a/graphics/MesaDemos/Makefile Mon Aug 25 21:27:15 2003 +0000
+++ b/graphics/MesaDemos/Makefile Tue Aug 26 01:43:48 2003 +0000
@@ -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 @@
MAINTAINER= jschauma%NetBSD.org@localhost
COMMENT= OpenGL examples and Demos
-MESA_REQD= 5.0.1
-
.include "../Mesa/Makefile.common"
USE_BUILDLINK2= yes
diff -r 583899cfbaa4 -r 0804267f9b00 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Mon Aug 25 21:27:15 2003 +0000
+++ b/graphics/MesaLib/Makefile Tue Aug 26 01:43:48 2003 +0000
@@ -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 @@
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 -r 583899cfbaa4 -r 0804267f9b00 graphics/MesaLib/buildlink2.mk
--- a/graphics/MesaLib/buildlink2.mk Mon Aug 25 21:27:15 2003 +0000
+++ b/graphics/MesaLib/buildlink2.mk Tue Aug 26 01:43:48 2003 +0000
@@ -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 -r 583899cfbaa4 -r 0804267f9b00 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Mon Aug 25 21:27:15 2003 +0000
+++ b/graphics/MesaLib/distinfo Tue Aug 26 01:43:48 2003 +0000
@@ -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 -r 583899cfbaa4 -r 0804267f9b00 graphics/glu/Makefile
--- a/graphics/glu/Makefile Mon Aug 25 21:27:15 2003 +0000
+++ b/graphics/glu/Makefile Tue Aug 26 01:43:48 2003 +0000
@@ -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 @@
.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 -r 583899cfbaa4 -r 0804267f9b00 graphics/glu/buildlink2.mk
--- a/graphics/glu/buildlink2.mk Mon Aug 25 21:27:15 2003 +0000
+++ b/graphics/glu/buildlink2.mk Tue Aug 26 01:43:48 2003 +0000
@@ -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_PACKAGES+= glu
+BUILDLINK_DEPENDS.glu?= glu>=${MESA_VERSION}
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"
Home |
Main Index |
Thread Index |
Old Index