Page MenuHomeFreeBSD
Files F148057722

D16774.diff
No OneTemporary
Actions

D16774.diff
View Options

Index: head/Mk/Uses/gl.mk
===================================================================
--- head/Mk/Uses/gl.mk
+++ head/Mk/Uses/gl.mk
@@ -0,0 +1,50 @@
+# $FreeBSD$
+#
+# Use OpenGL and related libraries and ports
+#
+# Feature: gl
+# Usage: USES=gl
+# USE_GL=egl glesv2 glut glu glw gl
+#
+# USE_GL specifies which GL components to add as dependencies.
+# Not specifying USE_GL with USES=gl is an error.
+# USE_GL=yes implies USE_GL=glu. This is deprecated
+#
+# MAINTAINER: x11@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_GL_MK)
+_INCLUDE_USES_GL_MK=yes
+
+_GL_gbm_LIB_DEPENDS= libgbm.so:graphics/mesa-libs
+_GL_glesv2_LIB_DEPENDS= libGLESv2.so:graphics/mesa-libs
+_GL_egl_LIB_DEPENDS= libEGL.so:graphics/mesa-libs
+_GL_gl_LIB_DEPENDS= libGL.so:graphics/mesa-libs
+_GL_gl_USE_XORG= xorgproto
+_GL_glew_LIB_DEPENDS= libGLEW.so:graphics/glew
+_GL_glu_LIB_DEPENDS= libGLU.so:graphics/libGLU
+_GL_glu_USE_XORG= xorgproto
+_GL_glw_LIB_DEPENDS= libGLw.so:graphics/libGLw
+_GL_glut_LIB_DEPENDS= libglut.so:graphics/freeglut
+
+.if !empty(gl_ARGS)
+IGNORE= USES=gl takes no arguments
+.endif
+
+.if !defined(USE_GL)
+IGNORE= need to specify gl component with USE_GL
+.elif ${USE_GL:tl} == yes
+DEV_WARNING+= "USE_GL=yes is deprecated, please add USE_GL=glu (default) or specify component"
+USE_GL= glu
+.endif
+
+.for _component in ${USE_GL}
+.if !defined(_GL_${_component}_LIB_DEPENDS)
+IGNORE= uses unknown GL component
+.else
+USE_XORG+= ${_GL_${_component}_USE_XORG}
+LIB_DEPENDS+= ${_GL_${_component}_LIB_DEPENDS}
+.endif
+.endfor
+
+# _INCLUDE_USES_GL_MK
+.endif
Index: head/Mk/bsd.port.mk
===================================================================
--- head/Mk/bsd.port.mk
+++ head/Mk/bsd.port.mk
@@ -363,11 +363,6 @@
# CXXFLAGS_${ARCH}
# Append the cxxflags to CXXFLAGS only on the specified architecture
##
-# USE_GL - A list of Mesa or GL related dependencies needed by the port.
-# Supported components are: egl, glesv2, glut, glu, glw, and gl.
-# If set to "yes", this is equivalent to "glu". Note that
-# glew and glut depend on glu, glw and glu depend on gl.
-##
# USE_SDL - If set, this port uses the sdl libraries.
# See bsd.sdl.mk for more information.
##
@@ -1426,6 +1421,11 @@
USES+= mate
.endif
+.if defined(USE_GL) && (!defined(USES) || !${USES:Mgl})
+DEV_WARNING+= "Setting USE_GL without USES=gl is deprecated"
+USES+= gl
+.endif
+
.if defined(USE_MYSQL)
USE_MYSQL:= ${USE_MYSQL:N[yY][eE][sS]:Nclient}
.if defined(WANT_MYSQL_VER)
@@ -1889,36 +1889,6 @@
.endif
PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist'
-
-_GL_gbm_LIB_DEPENDS= libgbm.so:graphics/mesa-libs
-_GL_glesv2_BUILD_DEPENDS= ${LOCALBASE}/lib/libGLESv2.so:graphics/mesa-libs
-_GL_glesv2_RUN_DEPENDS= ${LOCALBASE}/lib/libGLESv2.so:graphics/mesa-libs
-_GL_egl_BUILD_DEPENDS= ${LOCALBASE}/lib/libEGL.so:graphics/mesa-libs
-_GL_egl_RUN_DEPENDS= ${LOCALBASE}/lib/libEGL.so:graphics/mesa-libs
-_GL_gl_BUILD_DEPENDS= ${LOCALBASE}/lib/libGL.so:graphics/mesa-libs
-_GL_gl_RUN_DEPENDS= ${LOCALBASE}/lib/libGL.so:graphics/mesa-libs
-_GL_gl_USE_XORG= xorgproto
-_GL_glew_LIB_DEPENDS= libGLEW.so:graphics/glew
-_GL_glu_LIB_DEPENDS= libGLU.so:graphics/libGLU
-_GL_glu_USE_XORG= xorgproto
-_GL_glw_LIB_DEPENDS= libGLw.so:graphics/libGLw
-_GL_glut_LIB_DEPENDS= libglut.so:graphics/freeglut
-.if defined(USE_GL)
-. if ${USE_GL:tl} == "yes"
-USE_GL= glu
-. endif
-. for _component in ${USE_GL}
-. if !defined(_GL_${_component}_LIB_DEPENDS) && \
- !defined(_GL_${_component}_RUN_DEPENDS)
-IGNORE= uses unknown GL component
-. else
-USE_XORG+= ${_GL_${_component}_USE_XORG}
-BUILD_DEPENDS+= ${_GL_${_component}_BUILD_DEPENDS}
-LIB_DEPENDS+= ${_GL_${_component}_LIB_DEPENDS}
-RUN_DEPENDS+= ${_GL_${_component}_RUN_DEPENDS}
-. endif
-. endfor
-.endif
.if defined(_DESTDIR_VIA_ENV)
MAKE_ENV+= ${DESTDIRNAME}=${STAGEDIR}
Index: head/games/q3cellshading/Makefile
===================================================================
--- head/games/q3cellshading/Makefile
+++ head/games/q3cellshading/Makefile
@@ -36,7 +36,7 @@
GAMELIBS_DESC= Force building game libraries
SMP_CLIENT_DESC= Build SMP (threaded) client
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${ARCH} == "i386"
BUILD_DEPENDS+= nasm:devel/nasm
@@ -79,6 +79,8 @@
MAKE_ENV+= SMP=YES
Q3BIN+= quake3-smp
.endif
+
+.include <bsd.port.pre.mk>
post-patch:
@${REINPLACE_CMD} -e 's|botlib\.log|/dev/null|' \

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 16, 11:45 AM (19 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29769165
Default Alt Text
D16774.diff (4 KB)

Event Timeline