Qt: disable OpenGL support by default (#4962)

* Qt: disable OpenGL support by default

* Fix qt+opengl build
This commit is contained in:
Adam J. Stewart 2017-08-04 09:36:02 -05:00 committed by GitHub
parent f8dfb6a486
commit 408dfc8e86

View file

@ -53,8 +53,6 @@ class Qt(Package):
# OpenSpeedShop project # OpenSpeedShop project
variant('krellpatch', default=False, variant('krellpatch', default=False,
description="Build with openspeedshop based patch.") description="Build with openspeedshop based patch.")
variant('mesa', default=False,
description="Depend on mesa.")
variant('gtk', default=False, variant('gtk', default=False,
description="Build with gtkplus.") description="Build with gtkplus.")
variant('webkit', default=False, variant('webkit', default=False,
@ -65,7 +63,7 @@ class Qt(Package):
description="Build with D-Bus support.") description="Build with D-Bus support.")
variant('phonon', default=False, variant('phonon', default=False,
description="Build with phonon support.") description="Build with phonon support.")
variant('opengl', default=True, variant('opengl', default=False,
description="Build with OpenGL support.") description="Build with OpenGL support.")
patch('qt3krell.patch', when='@3.3.8b+krellpatch') patch('qt3krell.patch', when='@3.3.8b+krellpatch')
@ -109,7 +107,7 @@ class Qt(Package):
depends_on("python", when='@5.7.0:', type='build') depends_on("python", when='@5.7.0:', type='build')
# OpenGL hardware acceleration # OpenGL hardware acceleration
depends_on("mesa", when='@4:+mesa') depends_on("mesa", when='@4:+opengl')
depends_on("libxcb", when=sys.platform != 'darwin') depends_on("libxcb", when=sys.platform != 'darwin')
depends_on("libx11", when=sys.platform != 'darwin') depends_on("libx11", when=sys.platform != 'darwin')