freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mk/bsd.default-versions: Remove libglvnd optionality

Browse Source 
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
This commit is contained in:
Kevin Bowling
2021-07-15 12:45:28 -07:00
parent 56fadc6bf9
commit 5343f55d87
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Mk/Uses/gl.mk
View File

@@ -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

4
Mk/bsd.default-versions.mk
View File

@@ -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

3
graphics/mesa-devel/Makefile
View File

@@ -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>