diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2021-06-16 15:48:02 +0000 |
|---|---|---|
| committer | Kevin Bowling <kbowling@FreeBSD.org> | 2021-06-17 04:25:27 +0000 |
| commit | b44acc9409bd3bdd92e86e35c06d50e2134b02f2 (patch) | |
| tree | 541e139ad2537bd3ccb935e1a4f358ed3985eb7a /graphics/mesa-libs | |
| parent | 68e805c64ee7ee7b4fc124287da7e1e96afb132f (diff) | |
| download | ports-b44acc9409bd3bdd92e86e35c06d50e2134b02f2.tar.gz ports-b44acc9409bd3bdd92e86e35c06d50e2134b02f2.zip | |
graphics/mesa-libs: enable libglvnd support
PR: 246767
Reviewed by: kbowling
Tested by: kbowling
Differential Revision: https://reviews.freebsd.org/D25020
Diffstat (limited to 'graphics/mesa-libs')
| -rw-r--r-- | graphics/mesa-libs/Makefile | 9 | ||||
| -rw-r--r-- | graphics/mesa-libs/pkg-plist | 76 |
2 files changed, 47 insertions, 38 deletions
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile index 02155a2ace99..5ebe41c1078e 100644 --- a/graphics/mesa-libs/Makefile +++ b/graphics/mesa-libs/Makefile @@ -2,11 +2,12 @@ PORTNAME= mesa-libs PORTVERSION= ${MESAVERSION} +PORTREVISION= 1 CATEGORIES= graphics COMMENT= OpenGL libraries that support GLX and EGL clients -CONFLICTS_INSTALL= libglvnd # include/GL/gl.h +BUILD_DEPENDS= libglvnd>0:graphics/libglvnd OPTIONS_GROUP= PLATFORM OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND @@ -43,6 +44,7 @@ MESON_ARGS+= -Dgallium-drivers="" \ -Degl=enabled \ -Dgbm=enabled \ -Dvulkan-drivers="" \ + -Dglvnd=true \ -Dprefer-iris=true # Building EGL and GBM requires a dri driver so add swrast MESON_ARGS+= -Ddri-drivers="swrast" @@ -72,4 +74,9 @@ USE_GCC= yes .include "${MASTERDIR}/Makefile.targets" +post-install: +# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist + @${ECHO_CMD} "libGLX_indirect.so.0 libGLX_mesa.so.0" \ + >${STAGEDIR}${PREFIX}/etc/libmap.d/mesa.conf + .include <bsd.port.post.mk> diff --git a/graphics/mesa-libs/pkg-plist b/graphics/mesa-libs/pkg-plist index 04dcaa4f87a5..4f4924cfd8b1 100644 --- a/graphics/mesa-libs/pkg-plist +++ b/graphics/mesa-libs/pkg-plist @@ -1,41 +1,42 @@ -include/EGL/egl.h -include/EGL/eglext.h +etc/libmap.d/mesa.conf +@comment include/EGL/egl.h +@comment include/EGL/eglext.h include/EGL/eglextchromium.h include/EGL/eglmesaext.h -include/EGL/eglplatform.h -include/GL/gl.h -include/GL/glcorearb.h -include/GL/glext.h -%%GLX%%include/GL/glx.h -%%GLX%%include/GL/glxext.h +@comment include/EGL/eglplatform.h +@comment include/GL/gl.h +@comment include/GL/glcorearb.h +@comment include/GL/glext.h +%%GLX%%@comment include/GL/glx.h +%%GLX%%@comment include/GL/glxext.h @comment include/GL/internal/dri_interface.h -include/GLES/egl.h -include/GLES/gl.h -include/GLES/glext.h -include/GLES/glplatform.h -include/GLES2/gl2.h -include/GLES2/gl2ext.h -include/GLES2/gl2platform.h -include/GLES3/gl3.h -include/GLES3/gl31.h -include/GLES3/gl32.h -include/GLES3/gl3ext.h -include/GLES3/gl3platform.h -include/KHR/khrplatform.h +@comment include/GLES/egl.h +@comment include/GLES/gl.h +@comment include/GLES/glext.h +@comment include/GLES/glplatform.h +@comment include/GLES2/gl2.h +@comment include/GLES2/gl2ext.h +@comment include/GLES2/gl2platform.h +@comment include/GLES3/gl3.h +@comment include/GLES3/gl31.h +@comment include/GLES3/gl32.h +@comment include/GLES3/gl3ext.h +@comment include/GLES3/gl3platform.h +@comment include/KHR/khrplatform.h include/gbm.h @comment lib/dri/swrast_dri.so -lib/libEGL.so -lib/libEGL.so.1 -lib/libEGL.so.1.0.0 -%%GLX%%lib/libGL.so -%%GLX%%lib/libGL.so.1 -%%GLX%%lib/libGL.so.1.2.0 -lib/libGLESv1_CM.so -lib/libGLESv1_CM.so.1 -lib/libGLESv1_CM.so.1.1.0 -lib/libGLESv2.so -lib/libGLESv2.so.2 -lib/libGLESv2.so.2.0.0 +lib/libEGL_mesa.so +lib/libEGL_mesa.so.0 +lib/libEGL_mesa.so.0.0.0 +@comment lib/libGLESv1_CM.so +@comment lib/libGLESv1_CM.so.1 +@comment lib/libGLESv1_CM.so.1.1.0 +@comment lib/libGLESv2.so +@comment lib/libGLESv2.so.2 +@comment lib/libGLESv2.so.2.0.0 +%%GLX%%lib/libGLX_mesa.so +%%GLX%%lib/libGLX_mesa.so.0 +%%GLX%%lib/libGLX_mesa.so.0.0.0 lib/libgbm.so lib/libgbm.so.1 lib/libgbm.so.1.0.0 @@ -43,9 +44,10 @@ lib/libglapi.so lib/libglapi.so.0 lib/libglapi.so.0.0.0 @comment libdata/pkgconfig/dri.pc -libdata/pkgconfig/egl.pc +@comment libdata/pkgconfig/egl.pc libdata/pkgconfig/gbm.pc -%%GLX%%libdata/pkgconfig/gl.pc -libdata/pkgconfig/glesv1_cm.pc -libdata/pkgconfig/glesv2.pc +%%GLX%%@comment libdata/pkgconfig/gl.pc +@comment libdata/pkgconfig/glesv1_cm.pc +@comment libdata/pkgconfig/glesv2.pc @comment share/drirc.d/00-mesa-defaults.conf +share/glvnd/egl_vendor.d/50_mesa.json |