Date: Thu, 15 Jul 2021 21:25:50 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d21dac54b851 - main - graphics/mesa-devel: drop libglvnd conditionals after 5343f55d8757 Message-ID: <202107152125.16FLPo9S053834@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d21dac54b8512e3071c44ef232ae766c39a40987 commit d21dac54b8512e3071c44ef232ae766c39a40987 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-07-15 20:55:03 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-07-15 21:24:10 +0000 graphics/mesa-devel: drop libglvnd conditionals after 5343f55d8757 --- graphics/mesa-devel/Makefile | 9 ++---- graphics/mesa-devel/files/libmap.conf.in | 17 ++++------- graphics/mesa-devel/pkg-plist | 51 +++++--------------------------- 3 files changed, 15 insertions(+), 62 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index b77533fa2818..680b9c4cfadd 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -23,7 +23,8 @@ ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= Limited scope: no old drivers and no software rendering. \ See also https://mesamatrix.net/ -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} +BUILD_DEPENDS= libglvnd>=1.3.2:graphics/libglvnd \ + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} LIB_DEPENDS= libdrm.so:graphics/libdrm \ libexpat.so:textproc/expat2 .if !exists(/usr/lib/libelf.so) @@ -41,6 +42,7 @@ MESON_ARGS= -Dgallium-omx=disabled \ -Dgallium-opencl=disabled \ -Dgallium-xa=disabled \ -Dgallium-xvmc=disabled \ + -Dglvnd=true \ -Dplatforms=${PLATFORMS:O:[-1..1]:ts,} \ ${BINARY_ALIAS:D--native-file=binary_alias.ini} \ ${NULL} @@ -64,7 +66,6 @@ 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_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:} -OPTIONS_SLAVE+= GLVND OPTIONS_SUB= yes # Convert options to -D<type>-drivers=<driver1,driver2,etc> @@ -96,10 +97,6 @@ COINST_SUB_FILES= libmap.conf COINST_SUB_LIST= SUFFIX=${PKGNAMESUFFIX} COINST_PLIST_SUB_OFF= SUFFIX= -GLVND_DESC= GL Vendor-Neutral Dispatch support -GLVND_BUILD_DEPENDS= libglvnd>=1.3.2:graphics/libglvnd -GLVND_MESON_TRUE= glvnd - LIBUNWIND_DESC= Use libunwind for stacktraces LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind LIBUNWIND_MESON_ENABLED= libunwind diff --git a/graphics/mesa-devel/files/libmap.conf.in b/graphics/mesa-devel/files/libmap.conf.in index 5a128afea92a..23d917613731 100644 --- a/graphics/mesa-devel/files/libmap.conf.in +++ b/graphics/mesa-devel/files/libmap.conf.in @@ -1,16 +1,9 @@ -%%NO_GLVND%%# EGL/GLX built with -Dglvnd=false -%%NO_GLVND%%libEGL.so.1 libEGL%%SUFFIX%%.so.1 -%%NO_GLVND%%%%X11%%libGL.so.1 libGL%%SUFFIX%%.so.1 -%%NO_GLVND%%libGLESv1_CM.so.1 libGLESv1_CM%%SUFFIX%%.so.1 -%%NO_GLVND%%libGLESv2.so.2 libGLESv2%%SUFFIX%%.so.2 +# Xorg sets GLX_EXT_libglvnd to "mesa" by default +libEGL_mesa.so.0 libEGL_mesa%%SUFFIX%%.so.0 +%%X11%%libGLX_mesa.so.0 libGLX_mesa%%SUFFIX%%.so.0 -%%GLVND%%# EGL/GLX built with -Dglvnd=true -%%GLVND%%# Xorg sets GLX_EXT_libglvnd to "mesa" by default -%%GLVND%%libEGL_mesa.so.0 libEGL_mesa%%SUFFIX%%.so.0 -%%GLVND%%%%X11%%libGLX_mesa.so.0 libGLX_mesa%%SUFFIX%%.so.0 - -%%GLVND%%%%X11%%# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist -%%GLVND%%%%X11%%libGLX_indirect.so.0 libGLX_mesa%%SUFFIX%%.so.0 +%%X11%%# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist +%%X11%%libGLX_indirect.so.0 libGLX_mesa%%SUFFIX%%.so.0 # GBM clients like kmscube and wlroots fail otherwise libgbm.so.1 libgbm%%SUFFIX%%.so.1 diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist index 91a785ea696e..fd66c9eaeb42 100644 --- a/graphics/mesa-devel/pkg-plist +++ b/graphics/mesa-devel/pkg-plist @@ -1,29 +1,8 @@ %%VKLAYERS%%bin/mesa-overlay-control.py %%COINST%%@sample etc/libmap.d/mesa%%SUFFIX%%.conf.sample -%%NO_GLVND%%%%NO_COINST%%include/EGL/egl.h -%%NO_GLVND%%%%NO_COINST%%include/EGL/eglext.h %%NO_COINST%%include/EGL/eglextchromium.h %%NO_COINST%%include/EGL/eglmesaext.h -%%NO_GLVND%%%%NO_COINST%%include/EGL/eglplatform.h -%%NO_GLVND%%%%NO_COINST%%include/GL/gl.h -%%NO_GLVND%%%%NO_COINST%%include/GL/glcorearb.h -%%NO_GLVND%%%%NO_COINST%%include/GL/glext.h -%%NO_GLVND%%%%NO_COINST%%%%X11%%include/GL/glx.h -%%NO_GLVND%%%%NO_COINST%%%%X11%%include/GL/glxext.h %%NO_COINST%%include/GL/internal/dri_interface.h -%%NO_GLVND%%%%NO_COINST%%include/GLES/egl.h -%%NO_GLVND%%%%NO_COINST%%include/GLES/gl.h -%%NO_GLVND%%%%NO_COINST%%include/GLES/glext.h -%%NO_GLVND%%%%NO_COINST%%include/GLES/glplatform.h -%%NO_GLVND%%%%NO_COINST%%include/GLES2/gl2.h -%%NO_GLVND%%%%NO_COINST%%include/GLES2/gl2ext.h -%%NO_GLVND%%%%NO_COINST%%include/GLES2/gl2platform.h -%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl3.h -%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl31.h -%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl32.h -%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl3ext.h -%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl3platform.h -%%NO_GLVND%%%%NO_COINST%%include/KHR/khrplatform.h %%NO_COINST%%include/gbm.h %%i965%%lib/dri%%SUFFIX%%/i965_dri.so %%crocus%%lib/dri%%SUFFIX%%/crocus_dri.so @@ -32,24 +11,12 @@ %%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_dri.so %%VAAPI%%%%r600%%lib/dri%%SUFFIX%%/r600_drv_video.so %%VAAPI%%%%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_drv_video.so -%%NO_GLVND%%%%NO_COINST%%lib/libEGL%%SUFFIX%%.so -%%NO_GLVND%%lib/libEGL%%SUFFIX%%.so.1 -%%NO_GLVND%%lib/libEGL%%SUFFIX%%.so.1.0.0 -%%GLVND%%%%NO_COINST%%lib/libEGL_mesa%%SUFFIX%%.so -%%GLVND%%lib/libEGL_mesa%%SUFFIX%%.so.0 -%%GLVND%%lib/libEGL_mesa%%SUFFIX%%.so.0.0.0 -%%NO_GLVND%%%%X11%%%%NO_COINST%%lib/libGL%%SUFFIX%%.so -%%NO_GLVND%%%%X11%%lib/libGL%%SUFFIX%%.so.1 -%%NO_GLVND%%%%X11%%lib/libGL%%SUFFIX%%.so.1.2.0 -%%NO_GLVND%%%%NO_COINST%%lib/libGLESv1_CM%%SUFFIX%%.so -%%NO_GLVND%%lib/libGLESv1_CM%%SUFFIX%%.so.1 -%%NO_GLVND%%lib/libGLESv1_CM%%SUFFIX%%.so.1.1.0 -%%NO_GLVND%%%%NO_COINST%%lib/libGLESv2%%SUFFIX%%.so -%%NO_GLVND%%lib/libGLESv2%%SUFFIX%%.so.2 -%%NO_GLVND%%lib/libGLESv2%%SUFFIX%%.so.2.0.0 -%%GLVND%%%%X11%%%%NO_COINST%%lib/libGLX_mesa%%SUFFIX%%.so -%%GLVND%%%%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0 -%%GLVND%%%%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0.0.0 +%%NO_COINST%%lib/libEGL_mesa%%SUFFIX%%.so +lib/libEGL_mesa%%SUFFIX%%.so.0 +lib/libEGL_mesa%%SUFFIX%%.so.0.0.0 +%%X11%%%%NO_COINST%%lib/libGLX_mesa%%SUFFIX%%.so +%%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0 +%%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0.0.0 %%VKLAYERS%%lib/libVkLayer_MESA_device_select.so %%VKLAYERS%%lib/libVkLayer_MESA_overlay.so %%NO_COINST%%lib/libgbm%%SUFFIX%%.so @@ -69,13 +36,9 @@ lib/libglapi%%SUFFIX%%.so.0.0.0 %%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0 %%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0.0 %%NO_COINST%%libdata/pkgconfig/dri.pc -%%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/egl.pc %%NO_COINST%%libdata/pkgconfig/gbm.pc -%%NO_GLVND%%%%NO_COINST%%%%X11%%libdata/pkgconfig/gl.pc -%%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/glesv1_cm.pc -%%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/glesv2.pc share/drirc.d/00-mesa%%SUFFIX%%-defaults.conf -%%GLVND%%%%NO_COINST%%share/glvnd/egl_vendor.d/50_mesa.json +%%NO_COINST%%share/glvnd/egl_vendor.d/50_mesa.json %%VKLAYERS%%share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json %%anv%%%%NO_COINST%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json %%radv%%%%NO_COINST%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107152125.16FLPo9S053834>