Tue Apr 28 21:06:32 2015 UTC ()
PR pkg/49867: circular dependency between MesaLib and libva on Linux.
I probably added libva as a dependency at some point in wip/ since
configure wanted it. Not sure what it's used for so just remove it.


(tnn)
diff -r1.29 -r1.30 pkgsrc/graphics/MesaLib/options.mk
cvs diff -r1.29 -r1.30 pkgsrc/graphics/MesaLib/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/options.mk 2015/04/26 08:00:40 1.29
+++ pkgsrc/graphics/MesaLib/options.mk 2015/04/28 21:06:32 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.29 2015/04/26 08:00:40 tnn Exp $ 1# $NetBSD: options.mk,v 1.30 2015/04/28 21:06:32 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
@@ -27,30 +27,26 @@ PLIST_VARS+= swrast svga ilo i915 i965  @@ -27,30 +27,26 @@ PLIST_VARS+= swrast svga ilo i915 i965
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: 31# (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so:
32# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model initial-exec and dlopen is not supported 32# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model initial-exec and dlopen is not supported
33CONFIGURE_ARGS+= --disable-glx-tls 33CONFIGURE_ARGS+= --disable-glx-tls
34 34
35PLIST.dri= yes 35PLIST.dri= yes
36BUILDLINK_DEPMETHOD.libpciaccess= full 36BUILDLINK_DEPMETHOD.libpciaccess= full
37.include "../../sysutils/libpciaccess/buildlink3.mk" 37.include "../../sysutils/libpciaccess/buildlink3.mk"
38.include "../../graphics/MesaLib/dri.mk" 38.include "../../graphics/MesaLib/dri.mk"
39 39
40.if ${OPSYS} == "Linux" 
41.include "../../multimedia/libva/buildlink3.mk" 
42.endif 
43 
44DRI_DRIVERS= # 40DRI_DRIVERS= #
45PLIST.swrast_dri= yes 41PLIST.swrast_dri= yes
46DRI_DRIVERS+= swrast 42DRI_DRIVERS+= swrast
47 43
48# Software rasterizer 44# Software rasterizer
49GALLIUM_DRIVERS= # 45GALLIUM_DRIVERS= #
50PLIST.swrast= yes 46PLIST.swrast= yes
51GALLIUM_DRIVERS+= swrast 47GALLIUM_DRIVERS+= swrast
52 48
53.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 49.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
54# svga / VMWare driver 50# svga / VMWare driver
55PLIST.svga= yes 51PLIST.svga= yes
56GALLIUM_DRIVERS+= svga 52GALLIUM_DRIVERS+= svga