diff options
| author | tnn <tnn> | 2015-09-11 15:30:35 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-09-11 15:30:35 +0000 |
| commit | da88db8948bd3a62dbe21183c71d53149b4c360a (patch) | |
| tree | 1ea371b4b8b7e73574e8b7ef4765d4c2e295e7d0 /graphics | |
| parent | 4398f7cc35bc281941d7060584d2b576dccd2826 (diff) | |
| download | pkgsrc-da88db8948bd3a62dbe21183c71d53149b4c360a.tar.gz | |
Must disable EGL when disabling DRI (PR pkg/50232)
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/MesaLib/PLIST | 18 | ||||
| -rw-r--r-- | graphics/MesaLib/options.mk | 15 |
2 files changed, 21 insertions, 12 deletions
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST index 233ff73c8a3..3197eb768fb 100644 --- a/graphics/MesaLib/PLIST +++ b/graphics/MesaLib/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.28 2015/09/11 00:03:36 tnn Exp $ -include/EGL/egl.h -include/EGL/eglext.h -include/EGL/eglextchromium.h -include/EGL/eglmesaext.h -include/EGL/eglplatform.h +@comment $NetBSD: PLIST,v 1.29 2015/09/11 15:30:35 tnn Exp $ +${PLIST.dri}include/EGL/egl.h +${PLIST.dri}include/EGL/eglext.h +${PLIST.dri}include/EGL/eglextchromium.h +${PLIST.dri}include/EGL/eglmesaext.h +${PLIST.dri}include/EGL/eglplatform.h include/GL/gl.h include/GL/gl_mangle.h include/GL/glcorearb.h @@ -14,7 +14,7 @@ include/GL/glxext.h ${PLIST.dri}include/GL/internal/dri_interface.h include/GL/osmesa.h include/GL/wglext.h -include/KHR/khrplatform.h +${PLIST.dri}include/KHR/khrplatform.h ${PLIST.dri}include/gbm.h ${PLIST.i915_dri}lib/dri/i915_dri.so ${PLIST.i965_dri}lib/dri/i965_dri.so @@ -29,12 +29,12 @@ ${PLIST.radeon_dri}lib/dri/radeon_dri.so ${PLIST.radeonsi}lib/dri/radeonsi_dri.so ${PLIST.swrast_dri}lib/dri/swrast_dri.so ${PLIST.svga}lib/dri/vmwgfx_dri.so -lib/libEGL.la +${PLIST.dri}lib/libEGL.la lib/libGL.la ${PLIST.dri}lib/libgbm.la ${PLIST.dri}lib/libglapi.la ${PLIST.dri}lib/pkgconfig/dri.pc -lib/pkgconfig/egl.pc +${PLIST.dri}lib/pkgconfig/egl.pc ${PLIST.dri}lib/pkgconfig/gbm.pc lib/pkgconfig/gl.pc share/examples/MesaLib/drirc diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk index 4af5756efc7..350970b8d01 100644 --- a/graphics/MesaLib/options.mk +++ b/graphics/MesaLib/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.33 2015/09/11 00:03:36 tnn Exp $ +# $NetBSD: options.mk,v 1.34 2015/09/11 15:30:35 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib PKG_SUPPORTED_OPTIONS= llvm dri @@ -28,9 +28,17 @@ PLIST_VARS+= dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri .if !empty(PKG_OPTIONS:Mdri) -# (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so: -# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model initial-exec and dlopen is not supported +CONFIGURE_ARGS+= --enable-dri +CONFIGURE_ARGS+= --enable-egl + +# use Thread Local Storage in GLX where it works. +.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-*) || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" +# Not yet, needs more testing and xorg-server support. +#CONFIGURE_ARGS+= --enable-glx-tls +CONFIGURE_ARGS+= --disable-glx-tls +.else CONFIGURE_ARGS+= --disable-glx-tls +.endif PLIST.dri= yes @@ -126,5 +134,6 @@ CONFIGURE_ARGS+= --with-gallium-drivers= CONFIGURE_ARGS+= --with-dri-drivers= CONFIGURE_ARGS+= --disable-dri CONFIGURE_ARGS+= --disable-dri3 +CONFIGURE_ARGS+= --disable-egl CONFIGURE_ARGS+= --enable-xlib-glx .endif |