Fri Sep 11 15:30:35 2015 UTC ()
Must disable EGL when disabling DRI (PR pkg/50232)


(tnn)
diff -r1.28 -r1.29 pkgsrc/graphics/MesaLib/PLIST
diff -r1.33 -r1.34 pkgsrc/graphics/MesaLib/options.mk
cvs diff -r1.28 -r1.29 pkgsrc/graphics/MesaLib/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/PLIST 2015/09/11 00:03:36 1.28
+++ pkgsrc/graphics/MesaLib/PLIST 2015/09/11 15:30:35 1.29
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1@comment $NetBSD: PLIST,v 1.28 2015/09/11 00:03:36 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.29 2015/09/11 15:30:35 tnn Exp $
2include/EGL/egl.h 2${PLIST.dri}include/EGL/egl.h
3include/EGL/eglext.h 3${PLIST.dri}include/EGL/eglext.h
4include/EGL/eglextchromium.h 4${PLIST.dri}include/EGL/eglextchromium.h
5include/EGL/eglmesaext.h 5${PLIST.dri}include/EGL/eglmesaext.h
6include/EGL/eglplatform.h 6${PLIST.dri}include/EGL/eglplatform.h
7include/GL/gl.h 7include/GL/gl.h
8include/GL/gl_mangle.h 8include/GL/gl_mangle.h
9include/GL/glcorearb.h 9include/GL/glcorearb.h
10include/GL/glext.h 10include/GL/glext.h
11include/GL/glx.h 11include/GL/glx.h
12include/GL/glx_mangle.h 12include/GL/glx_mangle.h
13include/GL/glxext.h 13include/GL/glxext.h
14${PLIST.dri}include/GL/internal/dri_interface.h 14${PLIST.dri}include/GL/internal/dri_interface.h
15include/GL/osmesa.h 15include/GL/osmesa.h
16include/GL/wglext.h 16include/GL/wglext.h
17include/KHR/khrplatform.h 17${PLIST.dri}include/KHR/khrplatform.h
18${PLIST.dri}include/gbm.h 18${PLIST.dri}include/gbm.h
19${PLIST.i915_dri}lib/dri/i915_dri.so 19${PLIST.i915_dri}lib/dri/i915_dri.so
20${PLIST.i965_dri}lib/dri/i965_dri.so 20${PLIST.i965_dri}lib/dri/i965_dri.so
21${PLIST.ilo}lib/dri/ilo_dri.so 21${PLIST.ilo}lib/dri/ilo_dri.so
22${PLIST.swrast}lib/dri/kms_swrast_dri.so 22${PLIST.swrast}lib/dri/kms_swrast_dri.so
23${PLIST.nouveau}lib/dri/nouveau_dri.so 23${PLIST.nouveau}lib/dri/nouveau_dri.so
24${PLIST.nouveau_dri}lib/dri/nouveau_vieux_dri.so 24${PLIST.nouveau_dri}lib/dri/nouveau_vieux_dri.so
25${PLIST.r200_dri}lib/dri/r200_dri.so 25${PLIST.r200_dri}lib/dri/r200_dri.so
26${PLIST.r300}lib/dri/r300_dri.so 26${PLIST.r300}lib/dri/r300_dri.so
27${PLIST.r600}lib/dri/r600_dri.so 27${PLIST.r600}lib/dri/r600_dri.so
28${PLIST.radeon_dri}lib/dri/radeon_dri.so 28${PLIST.radeon_dri}lib/dri/radeon_dri.so
29${PLIST.radeonsi}lib/dri/radeonsi_dri.so 29${PLIST.radeonsi}lib/dri/radeonsi_dri.so
30${PLIST.swrast_dri}lib/dri/swrast_dri.so 30${PLIST.swrast_dri}lib/dri/swrast_dri.so
31${PLIST.svga}lib/dri/vmwgfx_dri.so 31${PLIST.svga}lib/dri/vmwgfx_dri.so
32lib/libEGL.la 32${PLIST.dri}lib/libEGL.la
33lib/libGL.la 33lib/libGL.la
34${PLIST.dri}lib/libgbm.la 34${PLIST.dri}lib/libgbm.la
35${PLIST.dri}lib/libglapi.la 35${PLIST.dri}lib/libglapi.la
36${PLIST.dri}lib/pkgconfig/dri.pc 36${PLIST.dri}lib/pkgconfig/dri.pc
37lib/pkgconfig/egl.pc 37${PLIST.dri}lib/pkgconfig/egl.pc
38${PLIST.dri}lib/pkgconfig/gbm.pc 38${PLIST.dri}lib/pkgconfig/gbm.pc
39lib/pkgconfig/gl.pc 39lib/pkgconfig/gl.pc
40share/examples/MesaLib/drirc 40share/examples/MesaLib/drirc
cvs diff -r1.33 -r1.34 pkgsrc/graphics/MesaLib/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/options.mk 2015/09/11 00:03:36 1.33
+++ pkgsrc/graphics/MesaLib/options.mk 2015/09/11 15:30:35 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.33 2015/09/11 00:03:36 tnn Exp $ 1# $NetBSD: options.mk,v 1.34 2015/09/11 15:30:35 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib 3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
4PKG_SUPPORTED_OPTIONS= llvm dri 4PKG_SUPPORTED_OPTIONS= llvm dri
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-*) && ( \ 7.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-*) && ( \
8 ${MACHINE_ARCH} == "i386" || \ 8 ${MACHINE_ARCH} == "i386" || \
9 ${MACHINE_ARCH} == "x86_64" || \ 9 ${MACHINE_ARCH} == "x86_64" || \
10 ${MACHINE_ARCH} == "sparc64" || \ 10 ${MACHINE_ARCH} == "sparc64" || \
11 ${MACHINE_ARCH} == "powerpc" || \ 11 ${MACHINE_ARCH} == "powerpc" || \
12 !empty(MACHINE_ARCH:M*arm*)) 12 !empty(MACHINE_ARCH:M*arm*))
13#PKG_SUGGESTED_OPTIONS+= llvm 13#PKG_SUGGESTED_OPTIONS+= llvm
14.endif 14.endif
@@ -18,29 +18,37 @@ PKG_SUGGESTED_OPTIONS= @@ -18,29 +18,37 @@ PKG_SUGGESTED_OPTIONS=
18 ${OPSYS} == "SunOS") || ${OPSYS} == "NetBSD" 18 ${OPSYS} == "SunOS") || ${OPSYS} == "NetBSD"
19PKG_SUGGESTED_OPTIONS+= dri 19PKG_SUGGESTED_OPTIONS+= dri
20.endif 20.endif
21 21
22.include "../../mk/bsd.options.mk" 22.include "../../mk/bsd.options.mk"
23 23
24# gallium 24# gallium
25PLIST_VARS+= swrast svga ilo i915 i965 nouveau r300 r600 radeonsi 25PLIST_VARS+= swrast svga ilo i915 i965 nouveau r300 r600 radeonsi
26# classic DRI 26# classic DRI
27PLIST_VARS+= dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri 27PLIST_VARS+= dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri
28 28
29.if !empty(PKG_OPTIONS:Mdri) 29.if !empty(PKG_OPTIONS:Mdri)
30 30
31# (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so: 31CONFIGURE_ARGS+= --enable-dri
32# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model initial-exec and dlopen is not supported 32CONFIGURE_ARGS+= --enable-egl
 33
 34# use Thread Local Storage in GLX where it works.
 35.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-*) || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux"
 36# Not yet, needs more testing and xorg-server support.
 37#CONFIGURE_ARGS+= --enable-glx-tls
 38CONFIGURE_ARGS+= --disable-glx-tls
 39.else
33CONFIGURE_ARGS+= --disable-glx-tls 40CONFIGURE_ARGS+= --disable-glx-tls
 41.endif
34 42
35PLIST.dri= yes 43PLIST.dri= yes
36 44
37BUILDLINK_DEPMETHOD.libpciaccess= full 45BUILDLINK_DEPMETHOD.libpciaccess= full
38.include "../../sysutils/libpciaccess/buildlink3.mk" 46.include "../../sysutils/libpciaccess/buildlink3.mk"
39.include "../../graphics/MesaLib/dri.mk" 47.include "../../graphics/MesaLib/dri.mk"
40 48
41# Linux supports dri3 49# Linux supports dri3
42.if ${OPSYS} == "Linux" 50.if ${OPSYS} == "Linux"
43CONFIGURE_ARGS+= --enable-dri3 51CONFIGURE_ARGS+= --enable-dri3
44# DRI on Linux needs either sysfs or udev 52# DRI on Linux needs either sysfs or udev
45CONFIGURE_ARGS+= --enable-sysfs 53CONFIGURE_ARGS+= --enable-sysfs
46.else 54.else
@@ -116,15 +124,16 @@ CONFIGURE_ARGS+= --enable-gallium-llvm @@ -116,15 +124,16 @@ CONFIGURE_ARGS+= --enable-gallium-llvm
116CONFIGURE_ARGS+= --enable-r600-llvm-compiler 124CONFIGURE_ARGS+= --enable-r600-llvm-compiler
117.include "../../devel/libelf/buildlink3.mk" 125.include "../../devel/libelf/buildlink3.mk"
118.include "../../lang/libLLVM/buildlink3.mk" 126.include "../../lang/libLLVM/buildlink3.mk"
119CONFIGURE_ENV+= ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH} 127CONFIGURE_ENV+= ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH}
120.else # !llvm 128.else # !llvm
121CONFIGURE_ARGS+= --disable-gallium-llvm 129CONFIGURE_ARGS+= --disable-gallium-llvm
122CONFIGURE_ARGS+= --disable-r600-llvm-compiler 130CONFIGURE_ARGS+= --disable-r600-llvm-compiler
123.endif # llvm 131.endif # llvm
124.else # !dri 132.else # !dri
125CONFIGURE_ARGS+= --with-gallium-drivers= 133CONFIGURE_ARGS+= --with-gallium-drivers=
126CONFIGURE_ARGS+= --with-dri-drivers= 134CONFIGURE_ARGS+= --with-dri-drivers=
127CONFIGURE_ARGS+= --disable-dri 135CONFIGURE_ARGS+= --disable-dri
128CONFIGURE_ARGS+= --disable-dri3 136CONFIGURE_ARGS+= --disable-dri3
 137CONFIGURE_ARGS+= --disable-egl
129CONFIGURE_ARGS+= --enable-xlib-glx 138CONFIGURE_ARGS+= --enable-xlib-glx
130.endif 139.endif