commit: 2d8e963d72e0a4b008b27e064ba73ac91a17cfa3 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Jun 11 12:34:40 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Jun 11 12:36:10 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2d8e963d
dev-qt/qt3d: add missing deps Gentoo-bug: 621492 Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-qt/qt3d/metadata.xml | 1 + dev-qt/qt3d/qt3d-5.7.9999.ebuild | 15 +++++++++++++-- dev-qt/qt3d/qt3d-5.9.0.ebuild | 9 +++++++-- dev-qt/qt3d/qt3d-5.9.9999.ebuild | 9 +++++++-- dev-qt/qt3d/qt3d-5.9999.ebuild | 9 +++++++-- 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 496a2546..b30c5e32 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> + <flag name="qml">Build QML/QtQuick bindings</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qt3d/qt3d-5.7.9999.ebuild b/dev-qt/qt3d/qt3d-5.7.9999.ebuild index f9541fd1..e4ff1a89 100644 --- a/dev-qt/qt3d/qt3d-5.7.9999.ebuild +++ b/dev-qt/qt3d/qt3d-5.7.9999.ebuild @@ -10,12 +10,23 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools -IUSE="" +# TODO: tools +IUSE="gles2 qml" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + sys-libs/zlib + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" + +src_prepare() { + qt5-build_src_prepare + + if ! use qml; then + sed -i -e "/quick3d/s/^/#/" src/src.pro || die + fi +} diff --git a/dev-qt/qt3d/qt3d-5.9.0.ebuild b/dev-qt/qt3d/qt3d-5.9.0.ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5.9.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.0.ebuild @@ -11,15 +11,16 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: gamepad, tools -IUSE="gles2" +IUSE="gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 + sys-libs/zlib + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -27,4 +28,8 @@ src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die qt5-build_src_prepare + + if ! use qml; then + sed -i -e "/quick3d/s/^/#/" src/src.pro || die + fi } diff --git a/dev-qt/qt3d/qt3d-5.9.9999.ebuild b/dev-qt/qt3d/qt3d-5.9.9999.ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5.9.9999.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.9999.ebuild @@ -11,15 +11,16 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: gamepad, tools -IUSE="gles2" +IUSE="gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 + sys-libs/zlib + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -27,4 +28,8 @@ src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die qt5-build_src_prepare + + if ! use qml; then + sed -i -e "/quick3d/s/^/#/" src/src.pro || die + fi } diff --git a/dev-qt/qt3d/qt3d-5.9999.ebuild b/dev-qt/qt3d/qt3d-5.9999.ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5.9999.ebuild +++ b/dev-qt/qt3d/qt3d-5.9999.ebuild @@ -11,15 +11,16 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: gamepad, tools -IUSE="gles2" +IUSE="gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 + sys-libs/zlib + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -27,4 +28,8 @@ src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die qt5-build_src_prepare + + if ! use qml; then + sed -i -e "/quick3d/s/^/#/" src/src.pro || die + fi }