diff options
| author | Matthew Rezny <rezny@FreeBSD.org> | 2017-05-12 18:46:53 +0000 |
|---|---|---|
| committer | Matthew Rezny <rezny@FreeBSD.org> | 2017-05-12 18:46:53 +0000 |
| commit | e6acde078ce1b7bc02fb9d8eefbbf31b95dc03c1 (patch) | |
| tree | 6651ec21aaf32f47dda7b92dcfb61385f580c8c9 /Mk | |
| parent | a23420f8df8cc1c52c521c259b55df007d4fa211 (diff) | |
| download | ports-e6acde078ce1b7bc02fb9d8eefbbf31b95dc03c1.tar.gz ports-e6acde078ce1b7bc02fb9d8eefbbf31b95dc03c1.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Scripts/qa.sh | 8 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 19 | ||||
| -rw-r--r-- | Mk/bsd.xorg.mk | 2 |
3 files changed, 14 insertions, 15 deletions
diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index c3b8d15aa656..024fce7e8fa7 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -537,13 +537,13 @@ proxydeps_suggest_uses() { elif echo ${pkg} | grep -E '/sdl2_(gfx|image|mixer|net|ttf)$' > /dev/null; then warn "you need USE_SDL+=$(echo ${pkg} | sed -E 's|.*/sdl2_||')2" # gl-related - elif [ ${pkg} = 'graphics/libGL' ]; then + elif expr ${lib_file} : "${LOCALBASE}/lib/libGL.so.*$" > /dev/null; then warn "you need USE_GL+=gl" - elif [ ${pkg} = 'graphics/gbm' ]; then + elif expr ${lib_file} : "${LOCALBASE}/lib/libgbm.so.*$" > /dev/null; then warn "you need USE_GL+=gbm" - elif [ ${pkg} = 'graphics/libglesv2' ]; then + elif expr ${lib_file} : "${LOCALBASE}/lib/libGLESv2.so.*$" > /dev/null; then warn "you need USE_GL+=glesv2" - elif [ ${pkg} = 'graphics/libEGL' ]; then + elif expr ${lib_file} : "${LOCALBASE}/lib/libEGL.so.*$" > /dev/null; then warn "you need USE_GL+=egl" elif [ ${pkg} = 'graphics/glew' ]; then warn "you need USE_GL+=glew" diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 719aef6a1853..52bbdf1c1387 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1763,20 +1763,19 @@ IGNORE= has USE_LDCONFIG32 set to yes, which is not correct PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist' -_GL_gbm_LIB_DEPENDS= libgbm.so:graphics/gbm -_GL_glesv2_BUILD_DEPENDS= libglesv2>0:graphics/libglesv2 -_GL_glesv2_RUN_DEPENDS= libglesv2>0:graphics/libglesv2 -_GL_egl_BUILD_DEPENDS= libEGL>0:graphics/libEGL -_GL_egl_RUN_DEPENDS= libEGL>0:graphics/libEGL -_GL_gl_BUILD_DEPENDS= libGL>0:graphics/libGL -_GL_gl_RUN_DEPENDS= libGL>0:graphics/libGL -_GL_gl_USE_XORG= glproto dri2proto +_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= glproto dri2proto dri3proto _GL_glew_LIB_DEPENDS= libGLEW.so:graphics/glew _GL_glu_LIB_DEPENDS= libGLU.so:graphics/libGLU -_GL_glu_USE_XORG= glproto dri2proto +_GL_glu_USE_XORG= glproto dri2proto dri3proto _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 diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index b29a35ac1107..bf84b9cf3e11 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -97,7 +97,7 @@ USES+= pathfix CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb \ --with-fontrootdir=${LOCALBASE}/share/fonts -LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/dri +LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri USE_XORG+= fontutil:build . endif |