ports/144954: [patch] add 'glew' component to USE_GL in bsd.port.mk
Pietro Cerutti
gahr at FreeBSD.org
Mon Mar 22 11:10:02 UTC 2010
>Number: 144954
>Category: ports
>Synopsis: [patch] add 'glew' component to USE_GL in bsd.port.mk
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 22 11:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Pietro Cerutti
>Release: FreeBSD 9.0-CURRENT sparc64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD tucana.bfh.ch 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Thu Dec 3 19:51:47 CET 2009 root at tucana.bfh.ch:/usr/obj/usr/src/sys/TUCANA sparc64
>Description:
The USE_GL variable in bsd.port.mk allows ports to depend on selected an OpenGL/Mesa component.
The OpenGL Extension Wrangler Library is currently not part of the component selectable via USE_GL.
The attached patch fixed the problem:
- 'glew' is added to bsd.port.mk as a valid component to USE_GL
- the ports that currently explicitely depend on the GLEW.1 shlib are converted to USE_GL
- a note on the new 'glew' component is added to the porter's handbook
>How-To-Repeat:
>Fix:
Index: ports/Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.635
diff -u -r1.635 bsd.port.mk
--- ports/Mk/bsd.port.mk 5 Feb 2010 21:18:15 -0000 1.635
+++ ports/Mk/bsd.port.mk 22 Mar 2010 10:28:59 -0000
@@ -383,7 +383,7 @@
# USE_GL - A list of Mesa or GL related dependencies needed by the port.
# Supported components are: glut, glu, glw, gl and linux.
# If set to "yes", this is equivalent to "glu". Note that
-# glut depends on glu, glw and glu depend on gl.
+# glew and glut depend on glu, glw and glu depend on gl.
# USE_MOTIF - If set, this port uses a Motif toolkit. Implies USE_XORG+= xpm
# NO_OPENMOTIF - If set, this port uses a custom Motif toolkit
# instead of Openmotif.
@@ -2004,6 +2004,7 @@
PLIST_SUB+= XAWVER=${XAWVER}
_GL_gl_LIB_DEPENDS= GL.1:${PORTSDIR}/graphics/libGL
+_GL_glew_LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew
_GL_glu_LIB_DEPENDS= GLU.1:${PORTSDIR}/graphics/libGLU
_GL_glw_LIB_DEPENDS= GLw.1:${PORTSDIR}/graphics/libGLw
_GL_glut_LIB_DEPENDS= glut.3:${PORTSDIR}/graphics/libglut
Index: ports/editors/koffice-kde4/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/koffice-kde4/Makefile,v
retrieving revision 1.125
diff -u -r1.125 Makefile
--- ports/editors/koffice-kde4/Makefile 5 Feb 2010 11:36:32 -0000 1.125
+++ ports/editors/koffice-kde4/Makefile 22 Mar 2010 10:44:09 -0000
@@ -33,7 +33,6 @@
qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
boost_thread.4:${PORTSDIR}/devel/boost-libs \
qca.2:${PORTSDIR}/devel/qca \
- GLEW.1:${PORTSDIR}/graphics/glew \
gsl:${PORTSDIR}/math/gsl \
wv2.4:${PORTSDIR}/textproc/wv2 \
kipi.6:${PORTSDIR}/graphics/kdegraphics4
@@ -46,7 +45,7 @@
USE_QT_VER= 4
QT_COMPONENTS= corelib phonon qmake_build moc_build porting_build rcc_build uic_build \
uic3_build
-USE_GL= glut
+USE_GL= glut glew
USE_LDCONFIG= yes
CMAKE_VERBOSE= yes
Index: ports/emulators/openmsx/Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/openmsx/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ports/emulators/openmsx/Makefile 23 Feb 2010 18:03:44 -0000 1.21
+++ ports/emulators/openmsx/Makefile 22 Mar 2010 10:45:28 -0000
@@ -16,7 +16,6 @@
LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \
jack:${PORTSDIR}/audio/jack \
- GLEW:${PORTSDIR}/graphics/glew \
png:${PORTSDIR}/graphics/png
MAKE_ARGS+= INSTALL_BINARY_DIR=${PREFIX}/bin \
@@ -25,6 +24,7 @@
OPENMSX_CXX=${CXX}
MAKEFILE= GNUmakefile
+USE_GL= glew
USE_GMAKE= yes
USE_TCL= 84+
USE_SDL= sdl image ttf
Index: ports/games/balazar/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/balazar/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- ports/games/balazar/Makefile 30 Jan 2010 09:42:47 -0000 1.15
+++ ports/games/balazar/Makefile 22 Mar 2010 10:46:22 -0000
@@ -16,7 +16,6 @@
COMMENT= 3D adventure and roleplaying game
LIB_DEPENDS= cal3d.12:${PORTSDIR}/graphics/cal3d \
- GLEW.1:${PORTSDIR}/graphics/glew \
freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS= soya_editor:${PORTSDIR}/graphics/py-soya3d \
${PYTHON_SITELIBDIR}/_openal.so:${PORTSDIR}/audio/py-openal \
@@ -28,7 +27,7 @@
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_TWISTED= yes
-USE_GL= yes
+USE_GL= glew
USE_SDL= sdl mixer
USE_GETTEXT= yes
Index: ports/games/balazarbrothers/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/balazarbrothers/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ports/games/balazarbrothers/Makefile 13 Jun 2009 15:46:12 -0000 1.10
+++ ports/games/balazarbrothers/Makefile 22 Mar 2010 10:46:51 -0000
@@ -16,7 +16,6 @@
COMMENT= Balazar Brother is a free software 3D puzzle game
LIB_DEPENDS= cal3d.12:${PORTSDIR}/graphics/cal3d \
- GLEW.1:${PORTSDIR}/graphics/glew \
freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cerealizer/__init__.py:${PORTSDIR}/security/py-cerealizer \
${PYTHON_SITELIBDIR}/soya/__init__.py:${PORTSDIR}/graphics/py-soya3d \
@@ -28,7 +27,7 @@
USE_PYTHON= yes
USE_PYDISTUTILS=yes
USE_TWISTED= yes
-USE_GL= yes
+USE_GL= glew
USE_GMAKE= yes
PYDISTUTILS_PKGNAME= BalazarBrothers
Index: ports/games/slune/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/slune/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- ports/games/slune/Makefile 12 Mar 2010 19:47:43 -0000 1.16
+++ ports/games/slune/Makefile 22 Mar 2010 10:47:23 -0000
@@ -19,15 +19,14 @@
${PYTHON_SITELIBDIR}/_openal.so:${PORTSDIR}/audio/py-openal \
${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis \
${PYTHON_SITELIBDIR}/py2play/level.py:${PORTSDIR}/net-p2p/py-py2play
-LIB_DEPENDS= cal3d.12:${PORTSDIR}/graphics/cal3d \
- GLEW.1:${PORTSDIR}/graphics/glew
+LIB_DEPENDS= cal3d.12:${PORTSDIR}/graphics/cal3d
USE_BZIP2= yes
USE_DOS2UNIX= *.po *.mo
USE_GETTEXT= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-USE_GL= yes
+USE_GL= glew
USE_SDL= sdl mixer
PYDISTUTILS_PKGNAME= Slune
Index: ports/games/spring/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/spring/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- ports/games/spring/Makefile 5 Feb 2010 11:37:55 -0000 1.31
+++ ports/games/spring/Makefile 22 Mar 2010 10:48:21 -0000
@@ -16,7 +16,6 @@
COMMENT= A project aiming to create a new and versatile RTS Engine
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
- GLEW.1:${PORTSDIR}/graphics/glew \
boost_thread.4:${PORTSDIR}/devel/boost-libs \
IL.2:${PORTSDIR}/graphics/devil \
ogg.6:${PORTSDIR}/audio/libogg \
@@ -29,7 +28,7 @@
USE_SDL= sdl
USE_OPENAL= al
-USE_GL= gl glu
+USE_GL= glew
USE_XORG= x11 xcursor
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
Index: ports/games/tnl/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/tnl/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- ports/games/tnl/Makefile 5 Feb 2010 11:37:57 -0000 1.11
+++ ports/games/tnl/Makefile 22 Mar 2010 10:48:47 -0000
@@ -22,15 +22,14 @@
RUN_DEPENDS= ${BUILD_DEPENDS}
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
CEGUIBase.3:${PORTSDIR}/graphics/cegui \
- png.5:${PORTSDIR}/graphics/png \
- GLEW.1:${PORTSDIR}/graphics/glew
+ png.5:${PORTSDIR}/graphics/png
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl
USE_GCC= 4.2+
-USE_GL= yes
+USE_GL= glew
USE_OPENAL= al alut
CONFIGURE_ARGS= --with-io-cflags="-I${LOCALBASE}/include/io" \
Index: ports/games/vdrift/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/vdrift/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- ports/games/vdrift/Makefile 5 Feb 2010 11:38:01 -0000 1.28
+++ ports/games/vdrift/Makefile 22 Mar 2010 10:49:11 -0000
@@ -18,12 +18,11 @@
BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons \
${LOCALBASE}/lib/libbulletcollision.a:${PORTSDIR}/devel/bullet
-LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
- GLEW:${PORTSDIR}/graphics/glew
+LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis
RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/settings/VDrift.config:${PORTSDIR}/games/vdrift-data
USE_BZIP2= yes
-USE_GL= yes
+USE_GL= glew
USE_SDL= sdl image net gfx
SCONS_ARGS= prefix=${PREFIX} \
Index: ports/games/windstille/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/windstille/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ports/games/windstille/Makefile 5 Feb 2010 11:38:03 -0000 1.14
+++ ports/games/windstille/Makefile 22 Mar 2010 10:49:44 -0000
@@ -18,7 +18,6 @@
ogg.6:${PORTSDIR}/audio/libogg \
vorbis.4:${PORTSDIR}/audio/libvorbis \
png.5:${PORTSDIR}/graphics/png \
- GLEW.1:${PORTSDIR}/graphics/glew \
squirrel.0:${PORTSDIR}/lang/squirrel \
freetype.9:${PORTSDIR}/print/freetype2
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
@@ -26,7 +25,7 @@
USE_BZIP2= yes
USE_SCONS= yes
USE_OPENAL= al
-USE_GL= gl
+USE_GL= glew
USE_SDL= sdl image
USE_BISON= build
MAKE_JOBS_SAFE= yes
Index: ports/graphics/blender/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/blender/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- ports/graphics/blender/Makefile 5 Feb 2010 11:38:13 -0000 1.39
+++ ports/graphics/blender/Makefile 22 Mar 2010 10:51:17 -0000
@@ -19,13 +19,12 @@
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
- GLEW.1:${PORTSDIR}/graphics/glew \
IlmThread.6:${PORTSDIR}/graphics/ilmbase
USE_XORG= x11 xext xmu xi
USE_PYTHON= 2.5+
USE_SDL= sdl
-USE_GL= gl glu
+USE_GL= glew
USE_GMAKE= yes
MAKE_JOBS_UNSAFE= yes
Index: ports/graphics/enblend/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/enblend/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- ports/graphics/enblend/Makefile 5 Feb 2010 11:38:21 -0000 1.17
+++ ports/graphics/enblend/Makefile 22 Mar 2010 10:51:54 -0000
@@ -17,8 +17,7 @@
BUILD_DEPENDS= ${LOCALBASE}/include/boost/pool/pool.hpp:${PORTSDIR}/devel/boost-libs \
OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR
-LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew \
- jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
lcms:${PORTSDIR}/graphics/lcms \
xmi.1:${PORTSDIR}/graphics/plotutils \
tiff.4:${PORTSDIR}/graphics/tiff
@@ -32,7 +31,7 @@
# http://groups.google.com/group/hugin-ptx/browse_thread/thread/725b1581c9889e37/50abe3387d61541a#50abe3387d61541a
# Gerald Pfeifer <gerald at pfeifer.com> asked to use 4.4+ instead of 4.3+
USE_GCC= 4.4+
-USE_GL= glut
+USE_GL= glew glut
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: ports/graphics/hugin/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/hugin/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- ports/graphics/hugin/Makefile 20 Feb 2010 16:30:00 -0000 1.43
+++ ports/graphics/hugin/Makefile 22 Mar 2010 10:53:00 -0000
@@ -21,8 +21,6 @@
exiv2:${PORTSDIR}/graphics/exiv2 \
pano13:${PORTSDIR}/graphics/libpano13 \
boost_python:${PORTSDIR}/devel/boost-python-libs \
- GLEW:${PORTSDIR}/graphics/glew \
- glut:${PORTSDIR}/graphics/libglut \
IlmImf:${PORTSDIR}/graphics/OpenEXR \
Imath:${PORTSDIR}/graphics/ilmbase
# gmake is really needed at _runtime_, do not remove it from below
@@ -44,6 +42,8 @@
USE_GETTEXT= yes
+USE_GL= glew glut
+
MAN1= \
PTBatcherGUI.1 \
align_image_stack.1 \
Index: ports/graphics/py-amanith/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/py-amanith/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ports/graphics/py-amanith/Makefile 5 Feb 2010 11:39:17 -0000 1.7
+++ ports/graphics/py-amanith/Makefile 22 Mar 2010 10:56:37 -0000
@@ -17,10 +17,10 @@
MAINTAINER= acm at FreeBSD.org
COMMENT= Python wrapper for the amanith 2D vector graphics library
-LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew \
- amanith.1:${PORTSDIR}/graphics/amanith
+LIB_DEPENDS= amanith.1:${PORTSDIR}/graphics/amanith
BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13
+USE_GL= glew
USE_PYTHON= 2.4+
USE_PYDISTUTILS=yes
PYDISTUTILS_PKGNAME= PyAmanith
Index: ports/graphics/py-glewpy/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/py-glewpy/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ports/graphics/py-glewpy/Makefile 22 Aug 2009 00:23:06 -0000 1.9
+++ ports/graphics/py-glewpy/Makefile 22 Mar 2010 10:57:05 -0000
@@ -20,8 +20,8 @@
COMMENT= Advanced OpenGL extensions to Python
BUILD_DEPENDS= pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew
+USE_GL= glew
USE_PYTHON= 2.4+
USE_PYDISTUTILS=yes
Index: ports/graphics/py-soya3d/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/py-soya3d/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- ports/graphics/py-soya3d/Makefile 5 Feb 2010 11:39:20 -0000 1.34
+++ ports/graphics/py-soya3d/Makefile 22 Mar 2010 10:57:35 -0000
@@ -21,7 +21,6 @@
BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode \
${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
LIB_DEPENDS= cal3d.12:${PORTSDIR}/graphics/cal3d \
- GLEW.1:${PORTSDIR}/graphics/glew \
freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-editobj \
${PYTHON_SITELIBDIR}/tofu/client.py:${PORTSDIR}/net/py-tofu \
@@ -31,7 +30,7 @@
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_OPENAL= al alut
-USE_GL= gl
+USE_GL= glew
USE_GMAKE= yes
USE_SDL= sdl
Index: ports/graphics/reallyslick/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/reallyslick/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ports/graphics/reallyslick/Makefile 5 Feb 2010 11:39:23 -0000 1.21
+++ ports/graphics/reallyslick/Makefile 22 Mar 2010 10:58:52 -0000
@@ -46,7 +46,7 @@
.endif
.if defined(WITH_GLEW)
-LIB_DEPENDS+= GLEW.1:${PORTSDIR}/graphics/glew
+USE_GL+= glew
.else
CONFIGURE_ENV+= ac_cv_header_GL_glew_h=no
.endif
Index: ports/graphics/tulip/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/tulip/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- ports/graphics/tulip/Makefile 22 Mar 2010 02:26:03 -0000 1.46
+++ ports/graphics/tulip/Makefile 22 Mar 2010 11:00:07 -0000
@@ -19,14 +19,13 @@
MAINTAINER= gahr at FreeBSD.org
COMMENT= A system dedicated to the visualization of huge graphs
-LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew \
- freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_BZIP2= yes
USE_QT_VER= 4
QT_COMPONENTS= corelib moc_build uic_build rcc_build gui opengl xml network \
designer assistant assistantclient
-USE_GL= glut
+USE_GL= glew glut
USE_GMAKE= yes
USE_GNOME= libxml2
USE_AUTOTOOLS= libtool:22
Index: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml
===================================================================
RCS file: /home/dcvs/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v
retrieving revision 1.1054
diff -u -r1.1054 book.sgml
--- doc/en_US.ISO8859-1/books/porters-handbook/book.sgml 2 Mar 2010 02:00:07 -0000 1.1054
+++ doc/en_US.ISO8859-1/books/porters-handbook/book.sgml 22 Mar 2010 10:42:30 -0000
@@ -5149,7 +5149,7 @@
<para>The Mesa Project is an effort to provide free OpenGL
implementation. You can specify a dependency on various components
of this project with <makevar>USE_GL</makevar> variable.
- Valid options are: <literal>glut, glu, glw, gl</literal> and
+ Valid options are: <literal>glut, glu, glw, glew, gl</literal> and
<literal>linux</literal>. For backwards compatibility, the value
of <literal>yes</literal> maps to <literal>glu</literal>.</para>
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list