diff options
| author | Kevin Bowling <kbowling@FreeBSD.org> | 2021-07-15 19:45:28 +0000 |
|---|---|---|
| committer | Kevin Bowling <kbowling@FreeBSD.org> | 2021-07-15 19:48:27 +0000 |
| commit | 5343f55d875779eca78236446cd19d67f58c4bce (patch) | |
| tree | fe3ccb791928e0f2e18ca5e08ec3784e682a09e0 | |
| parent | 56fadc6bf9fabb26fc7016f7ea1b1a5f786ec14d (diff) | |
| download | ports-5343f55d875779eca78236446cd19d67f58c4bce.tar.gz ports-5343f55d875779eca78236446cd19d67f58c4bce.zip | |
Mk/bsd.default-versions: Remove libglvnd optionality
glvnd is becoming increasingly required by mesa and various FreeBSD
Ports implementation decisions. Remove the tuple to avoid unexpected
and unsupported combinations.
Reviewed by: x11 (manu, zeising)
Differential Revision: https://reviews.freebsd.org/D30930
| -rw-r--r-- | Mk/Uses/gl.mk | 10 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 4 | ||||
| -rw-r--r-- | graphics/mesa-devel/Makefile | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk index 2c6e36d86bd1..8ecd95a4403a 100644 --- a/Mk/Uses/gl.mk +++ b/Mk/Uses/gl.mk @@ -13,12 +13,12 @@ .if !defined(_INCLUDE_USES_GL_MK) _INCLUDE_USES_GL_MK=yes -_GL_egl_LIB_DEPENDS= libEGL.so:graphics/${GL_DEFAULT:S/,/ /g:[1]} -_GL_gbm_LIB_DEPENDS= libgbm.so:graphics/${GL_DEFAULT:S/,/ /g:[-1]} -_GL_gl_LIB_DEPENDS= libGL.so:graphics/${GL_DEFAULT:S/,/ /g:[1]} +_GL_egl_LIB_DEPENDS= libEGL.so:graphics/libglvnd +_GL_gbm_LIB_DEPENDS= libgbm.so:graphics/${GL_DEFAULT} +_GL_gl_LIB_DEPENDS= libGL.so:graphics/libglvnd _GL_gl_USE_XORG= xorgproto -_GL_glesv1_LIB_DEPENDS= libGLESv1_CM.so:graphics/${GL_DEFAULT:S/,/ /g:[1]} -_GL_glesv2_LIB_DEPENDS= libGLESv2.so:graphics/${GL_DEFAULT:S/,/ /g:[1]} +_GL_glesv1_LIB_DEPENDS= libGLESv1_CM.so:graphics/libglvnd +_GL_glesv2_LIB_DEPENDS= libGLESv2.so:graphics/libglvnd _GL_glew_LIB_DEPENDS= libGLEW.so:graphics/glew _GL_glu_LIB_DEPENDS= libGLU.so:graphics/libGLU _GL_glu_USE_XORG= xorgproto diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 73d4a908c65c..d68d453170c4 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -52,8 +52,8 @@ GCC_DEFAULT?= 8 .else GCC_DEFAULT?= 10 .endif -# Possible values (tuple): libglvnd, mesa-libs, mesa-devel -GL_DEFAULT?= libglvnd,mesa-libs +# Possible values: mesa-libs, mesa-devel +GL_DEFAULT?= mesa-libs # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl # Possible values: 6, 6-nox11, 7, 7-nox11 diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 87a4ed3532fe..b77533fa2818 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -63,9 +63,8 @@ OPTIONS_EXCLUDE_powerpc64= ${"${/usr/bin/ld:L:tA}"==/usr/bin/ld.lld:?LTO:} # LLV OPTIONS_EXCLUDE+= ${ARCH:Namd64:Ni386:Nx86_64:C/.+/anv crocus i965 iris/} OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Ni386:Npowerpc64:Npowerpc64le:Nx86_64:C/.+/LIBUNWIND/} OPTIONS_EXCLUDE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:} -OPTIONS_EXCLUDE+= ${"${GL_DEFAULT:S/,/ /g:[1]}"!=libglvnd:?GLVND:} OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:} -OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[1]}"==libglvnd:?GLVND:} +OPTIONS_SLAVE+= GLVND OPTIONS_SUB= yes # Convert options to -D<type>-drivers=<driver1,driver2,etc> |