From 013a99acd729c4526caa9c2c79547fad3921e53e Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Sun, 11 Jun 2017 22:29:39 +1000 Subject: [PATCH] dev-qt/qt3d: add missing deps Gentoo-bug: 621492 Package-Manager: Portage-2.3.5, Repoman-2.3.2 --- dev-qt/qt3d/metadata.xml | 4 ++++ .../{qt3d-5.7.1.ebuild => qt3d-5.7.1-r1.ebuild} | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) rename dev-qt/qt3d/{qt3d-5.7.1.ebuild => qt3d-5.7.1-r1.ebuild} (53%) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 08d85fc4c258..b30c5e322777 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -5,6 +5,10 @@ qt@gentoo.org Gentoo Qt Project + + Use GLES 2.0 or later instead of full OpenGL + Build QML/QtQuick bindings + https://bugreports.qt.io/ http://doc.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.7.1.ebuild b/dev-qt/qt3d/qt3d-5.7.1-r1.ebuild similarity index 53% rename from dev-qt/qt3d/qt3d-5.7.1.ebuild rename to dev-qt/qt3d/qt3d-5.7.1-r1.ebuild index 4d78b5a20cb8..17152f1a0586 100644 --- a/dev-qt/qt3d/qt3d-5.7.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.7.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,12 +10,23 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools -IUSE="" +# TODO: egl, 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 +} -- 2.26.2