Page MenuHomeFreeBSD
Files F109827152

D30930.diff
No OneTemporary
Actions

D30930.diff
View Options

diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk
--- 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
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -52,8 +52,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
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -63,9 +63,8 @@
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>

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 11, 1:14 AM (9 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16584188
Default Alt Text
D30930.diff (2 KB)

Event Timeline