[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: e1e77488d70751ba6a99ef136b4809d26895ba19 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Nov 23 09:38:20 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 2 18:09:22 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e1e77488 dev-qt/qt3d: rename USE=gles2 to USE=gles2-only Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 4 +--- dev-qt/qt3d/qt3d-5.14..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5.15..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5..ebuild| 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index bdb6f1b0..ff8a21d9 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,9 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware via - dev-qt/qtgamepad - Use GLES 2.0 or later instead of full OpenGL + Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 041c6d78f94e2ebc66ad2b9ef5cc60580212c504 Author: Jimi Huotari gentoo org> AuthorDate: Mon Aug 26 10:34:27 2019 + Commit: Jimi Huotari gentoo org> CommitDate: Mon Aug 26 10:50:07 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=041c6d78 dev-qt/qt3d: add USE="gamepad" Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qt3d/metadata.xml | 2 ++ dev-qt/qt3d/qt3d-5.12..ebuild | 6 -- dev-qt/qt3d/qt3d-5.13..ebuild | 6 -- dev-qt/qt3d/qt3d-5.14..ebuild | 6 -- dev-qt/qt3d/qt3d-5..ebuild| 6 -- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 987a6dc2..bdb6f1b0 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,6 +6,8 @@ Gentoo Qt Project + Add support for gamepad hardware via + dev-qt/qtgamepad Use GLES 2.0 or later instead of full OpenGL Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.12..ebuild b/dev-qt/qt3d/qt3d-5.12..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.12..ebuild +++ b/dev-qt/qt3d/qt3d-5.12..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.13..ebuild b/dev-qt/qt3d/qt3d-5.13..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.13..ebuild +++ b/dev-qt/qt3d/qt3d-5.13..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: dd21364799d3056319c23776abdcc2bba0dfc6c3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 12 14:10:08 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:13:34 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dd213647 dev-qt/qt3d: Add IUSE="vulkan" tied to dev-qt/qtgui, add slot op Uses private headers from dev-qt/qtgui. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> (cherry picked from commit e0a2412fad307e4d5713f384463ba0cc6dd00cb7) dev-qt/qt3d/metadata.xml | 1 + dev-qt/qt3d/qt3d-5.15..ebuild | 12 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ff8a21d9..ea85517d 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -8,6 +8,7 @@ Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings + Enable support for Vulkan https://bugreports.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index a66bb2cc..ffeb1aa5 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,18 +11,20 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2-only qml" +IUSE="gamepad gles2-only qml vulkan" -DEPEND=" +RDEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + ~dev-qt/qtgui-${PV}:5=[vulkan=] ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: b410c1c2c1fc58cb7b61562bed4acb502e2c513f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 25 22:21:52 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:22:03 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b410c1c2 dev-qt/qt3d: metadata.xml typo fix Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ea85517d..d359595b 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,7 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware viadev-qt/qtgamepad + Add support for gamepad hardware via dev-qt/qtgamepad Build QML/QtQuick bindings Enable support for Vulkan
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 04f6e9ca89ae4b3b3b6dd192da3ef759a357c952 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Feb 25 18:53:19 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 17 20:39:18 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=04f6e9ca dev-qt/qt3d: Keyword 5.15.2-r11 arm, #833799 Signed-off-by: Arthur Zamarin gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index 81824562..c1bef6e9 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 6693fee3bb8a7c97e336a2f516da35a32accdf7d Author: Han Gao gmail com> AuthorDate: Wed Mar 30 19:09:26 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 1 18:23:28 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6693fee3 dev-qt/qt3d: ~riscv keyworing Closes: https://github.com/gentoo/gentoo/pull/24508 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Han Gao gmail.com> Signed-off-by: Yixun Lan gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index c1bef6e9..3981e194 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: a93b901209070ed6cc8438d828f669e165b11212 Author: Joonas Niilola gentoo org> AuthorDate: Fri Jun 3 12:28:40 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 18 14:21:19 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a93b9012 dev-qt/qt3d: subslot binder media-libs/assimp:= Signed-off-by: Joonas Niilola gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.5..ebuild b/dev-qt/qt3d/qt3d-5.15.5..ebuild index 3981e194..0da2ac57 100644 --- a/dev-qt/qt3d/qt3d-5.15.5..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.5..ebuild @@ -19,7 +19,7 @@ RDEPEND=" =dev-qt/qtcore-${QT5_PV}* =dev-qt/qtgui-${QT5_PV}*:5=[vulkan=] =dev-qt/qtnetwork-${QT5_PV}* - >=media-libs/assimp-4.0.0 + >=media-libs/assimp-4.0.0:= gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* ) qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 5f3051c780e2e6f21ab419f1defd108db66a2969 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 26 08:42:48 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 26 12:10:00 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5f3051c7 dev-qt/qt3d: Force -system-assimp Bug: https://bugs.gentoo.org/810439 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15..ebuild | 8 1 file changed, 8 insertions(+) diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index bd8f016c..3099e711 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -35,3 +35,11 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + -- + -system-assimp + ) + qt5-build_src_configure +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 2d8e963d72e0a4b008b27e064ba73ac91a17cfa3 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 11 12:34:40 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 11 12:36:10 2017 + 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..ebuild | 15 +-- dev-qt/qt3d/qt3d-5.9.0.ebuild| 9 +++-- dev-qt/qt3d/qt3d-5.9..ebuild | 9 +++-- dev-qt/qt3d/qt3d-5..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 @@ Use GLES 2.0 or later instead of full OpenGL + Build QML/QtQuick bindings https://bugreports.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.7..ebuild b/dev-qt/qt3d/qt3d-5.7..ebuild index f9541fd1..e4ff1a89 100644 --- a/dev-qt/qt3d/qt3d-5.7..ebuild +++ b/dev-qt/qt3d/qt3d-5.7..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..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..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..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..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 }
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 0f31a6ee6abee52c8a830c019fa2ec46daadb177 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 14:55:38 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0f31a6ee dev-qt/qt3d: raise media-libs/assimp dependency Gentoo-bug: 625298 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 2 +- dev-qt/qt3d/qt3d-5.9..ebuild | 2 +- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 94b5f2eb1a25b873b26cecd8bef84ead8669cb2d Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 15:07:11 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=94b5f2eb dev-qt/qt3d: 5.9 updates Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 6 ++ dev-qt/qt3d/qt3d-5.9..ebuild | 6 ++ dev-qt/qt3d/qt3d-5..ebuild | 6 ++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare }
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: dbccbce4bc15601befa65063402134d58d3dc1e2 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 15:08:02 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dbccbce4 dev-qt/qt3d: remove sys-libs/zlib dependency sys-libs/zlib is currently only used by bundled assimp, which we unbundle. Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 1 - dev-qt/qt3d/qt3d-5.9..ebuild | 1 - dev-qt/qt3d/qt3d-5..ebuild | 1 - 3 files changed, 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 31b55f7450b9036a72e19b65361beab8c0f7a735 Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:55:36 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:26 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=31b55f74 dev-qt/qt3d: add new dependency on dev-qt/qtconcurrent Used in src/render. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 1 + dev-qt/qt3d/qt3d-5.8..ebuild | 1 + dev-qt/qt3d/qt3d-5..ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 75d59570ba516067fa1cb9307e1e54553504135c Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:58:24 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=75d59570 dev-qt/qt3d: qtdeclarative is mandatory Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 3 ++- dev-qt/qt3d/qt3d-5.8..ebuild | 3 ++- dev-qt/qt3d/qt3d-5..ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 0a58752b8d33dab6e8a88051c5697bc8a7313d37 Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 03:09:01 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0a58752b dev-qt/qt3d: add gles handling There's a lot of QT_OPENGL_ES_2 ifdefs. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/metadata.xml | 3 +++ dev-qt/qt3d/qt3d-5.8.0.ebuild| 6 +++--- dev-qt/qt3d/qt3d-5.8..ebuild | 6 +++--- dev-qt/qt3d/qt3d-5..ebuild | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 08d85fc4..496a2546 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -5,6 +5,9 @@ q...@gentoo.org Gentoo Qt Project + + Use GLES 2.0 or later instead of full OpenGL + https://bugreports.qt.io/ http://doc.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 130b857abae7d59970828532ee59b55f65e4c34e Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:54:03 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:26 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=130b857a dev-qt/qt3d: ensure that system media-libs/assimp is used Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 7 +++ dev-qt/qt3d/qt3d-5.8..ebuild | 9 - dev-qt/qt3d/qt3d-5..ebuild | 9 - 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 4f238ff7..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index aad66b97..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..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 # $Id$ @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index aad66b97..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..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 # $Id$ @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 267c9c22d8c23d7db16476a570810f10cefb618a Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:56:49 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=267c9c22 dev-qt/qt3d: add note about missing support for gamepad Used in src/input/frontend and and src/quick3d/imports/input Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 2 +- dev-qt/qt3d/qt3d-5.8..ebuild | 2 +- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND=" diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND=" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND="
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 04457b0390e18b9517e10c4e27bcc914fd97fd09 Author: Davide Pesavento gentoo org> AuthorDate: Sat Sep 27 21:35:00 2014 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Sep 27 21:35:00 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=04457b03 [dev-qt/qt3d] Change DESCRIPTION. Package-Manager: portage-2.2.14_rc1 --- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index dcd4841..b0b5917 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit qt5-build -DESCRIPTION="3D library built on top of Qt OpenGL" +DESCRIPTION="The 3D module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == live ]]; then KEYWORDS=""
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 403859343e41e506fafe12c70f21392410c83049 Author: Davide Pesavento gentoo org> AuthorDate: Mon Jan 7 19:25:43 2019 + Commit: Davide Pesavento gentoo org> CommitDate: Mon Jan 7 19:25:43 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=40385934 dev-qt/qt3d: tweak DESCRIPTION Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Davide Pesavento gentoo.org> dev-qt/qt3d/qt3d-5.12.0.ebuild| 4 ++-- dev-qt/qt3d/qt3d-5.12..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5..ebuild| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.12.0.ebuild b/dev-qt/qt3d/qt3d-5.12.0.ebuild index 40cf9458..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5.12.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.12.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" diff --git a/dev-qt/qt3d/qt3d-5.12..ebuild b/dev-qt/qt3d/qt3d-5.12..ebuild index e6563090..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5.12..ebuild +++ b/dev-qt/qt3d/qt3d-5.12..ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index e6563090..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 04457b0390e18b9517e10c4e27bcc914fd97fd09 Author: Davide Pesavento gentoo org> AuthorDate: Sat Sep 27 21:35:00 2014 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Sep 27 21:35:00 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=04457b03 [dev-qt/qt3d] Change DESCRIPTION. Package-Manager: portage-2.2.14_rc1 --- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index dcd4841..b0b5917 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit qt5-build -DESCRIPTION="3D library built on top of Qt OpenGL" +DESCRIPTION="The 3D module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == live ]]; then KEYWORDS=""
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 403859343e41e506fafe12c70f21392410c83049 Author: Davide Pesavento gentoo org> AuthorDate: Mon Jan 7 19:25:43 2019 + Commit: Davide Pesavento gentoo org> CommitDate: Mon Jan 7 19:25:43 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=40385934 dev-qt/qt3d: tweak DESCRIPTION Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Davide Pesavento gentoo.org> dev-qt/qt3d/qt3d-5.12.0.ebuild| 4 ++-- dev-qt/qt3d/qt3d-5.12..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5..ebuild| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.12.0.ebuild b/dev-qt/qt3d/qt3d-5.12.0.ebuild index 40cf9458..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5.12.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.12.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" diff --git a/dev-qt/qt3d/qt3d-5.12..ebuild b/dev-qt/qt3d/qt3d-5.12..ebuild index e6563090..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5.12..ebuild +++ b/dev-qt/qt3d/qt3d-5.12..ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index e6563090..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 0f31a6ee6abee52c8a830c019fa2ec46daadb177 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 14:55:38 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0f31a6ee dev-qt/qt3d: raise media-libs/assimp dependency Gentoo-bug: 625298 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 2 +- dev-qt/qt3d/qt3d-5.9..ebuild | 2 +- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 94b5f2eb1a25b873b26cecd8bef84ead8669cb2d Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 15:07:11 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=94b5f2eb dev-qt/qt3d: 5.9 updates Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 6 ++ dev-qt/qt3d/qt3d-5.9..ebuild | 6 ++ dev-qt/qt3d/qt3d-5..ebuild | 6 ++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare }
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: dbccbce4bc15601befa65063402134d58d3dc1e2 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 15:08:02 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dbccbce4 dev-qt/qt3d: remove sys-libs/zlib dependency sys-libs/zlib is currently only used by bundled assimp, which we unbundle. Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 1 - dev-qt/qt3d/qt3d-5.9..ebuild | 1 - dev-qt/qt3d/qt3d-5..ebuild | 1 - 3 files changed, 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 2d8e963d72e0a4b008b27e064ba73ac91a17cfa3 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 11 12:34:40 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 11 12:36:10 2017 + 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..ebuild | 15 +-- dev-qt/qt3d/qt3d-5.9.0.ebuild| 9 +++-- dev-qt/qt3d/qt3d-5.9..ebuild | 9 +++-- dev-qt/qt3d/qt3d-5..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 @@ Use GLES 2.0 or later instead of full OpenGL + Build QML/QtQuick bindings https://bugreports.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.7..ebuild b/dev-qt/qt3d/qt3d-5.7..ebuild index f9541fd1..e4ff1a89 100644 --- a/dev-qt/qt3d/qt3d-5.7..ebuild +++ b/dev-qt/qt3d/qt3d-5.7..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..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..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..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..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 }
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 31b55f7450b9036a72e19b65361beab8c0f7a735 Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:55:36 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:26 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=31b55f74 dev-qt/qt3d: add new dependency on dev-qt/qtconcurrent Used in src/render. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 1 + dev-qt/qt3d/qt3d-5.8..ebuild | 1 + dev-qt/qt3d/qt3d-5..ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 75d59570ba516067fa1cb9307e1e54553504135c Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:58:24 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=75d59570 dev-qt/qt3d: qtdeclarative is mandatory Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 3 ++- dev-qt/qt3d/qt3d-5.8..ebuild | 3 ++- dev-qt/qt3d/qt3d-5..ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 0a58752b8d33dab6e8a88051c5697bc8a7313d37 Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 03:09:01 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0a58752b dev-qt/qt3d: add gles handling There's a lot of QT_OPENGL_ES_2 ifdefs. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/metadata.xml | 3 +++ dev-qt/qt3d/qt3d-5.8.0.ebuild| 6 +++--- dev-qt/qt3d/qt3d-5.8..ebuild | 6 +++--- dev-qt/qt3d/qt3d-5..ebuild | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 08d85fc4..496a2546 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -5,6 +5,9 @@ q...@gentoo.org Gentoo Qt Project + + Use GLES 2.0 or later instead of full OpenGL + https://bugreports.qt.io/ http://doc.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 130b857abae7d59970828532ee59b55f65e4c34e Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:54:03 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:26 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=130b857a dev-qt/qt3d: ensure that system media-libs/assimp is used Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 7 +++ dev-qt/qt3d/qt3d-5.8..ebuild | 9 - dev-qt/qt3d/qt3d-5..ebuild | 9 - 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 4f238ff7..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index aad66b97..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..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 # $Id$ @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index aad66b97..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..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 # $Id$ @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 267c9c22d8c23d7db16476a570810f10cefb618a Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:56:49 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=267c9c22 dev-qt/qt3d: add note about missing support for gamepad Used in src/input/frontend and and src/quick3d/imports/input Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 2 +- dev-qt/qt3d/qt3d-5.8..ebuild | 2 +- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND=" diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND=" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND="
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: a93b901209070ed6cc8438d828f669e165b11212 Author: Joonas Niilola gentoo org> AuthorDate: Fri Jun 3 12:28:40 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 18 14:21:19 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a93b9012 dev-qt/qt3d: subslot binder media-libs/assimp:= Signed-off-by: Joonas Niilola gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.5..ebuild b/dev-qt/qt3d/qt3d-5.15.5..ebuild index 3981e194..0da2ac57 100644 --- a/dev-qt/qt3d/qt3d-5.15.5..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.5..ebuild @@ -19,7 +19,7 @@ RDEPEND=" =dev-qt/qtcore-${QT5_PV}* =dev-qt/qtgui-${QT5_PV}*:5=[vulkan=] =dev-qt/qtnetwork-${QT5_PV}* - >=media-libs/assimp-4.0.0 + >=media-libs/assimp-4.0.0:= gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* ) qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 04f6e9ca89ae4b3b3b6dd192da3ef759a357c952 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Feb 25 18:53:19 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 17 20:39:18 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=04f6e9ca dev-qt/qt3d: Keyword 5.15.2-r11 arm, #833799 Signed-off-by: Arthur Zamarin gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index 81824562..c1bef6e9 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 04f6e9ca89ae4b3b3b6dd192da3ef759a357c952 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Feb 25 18:53:19 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 17 20:39:18 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=04f6e9ca dev-qt/qt3d: Keyword 5.15.2-r11 arm, #833799 Signed-off-by: Arthur Zamarin gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index 81824562..c1bef6e9 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: a93b901209070ed6cc8438d828f669e165b11212 Author: Joonas Niilola gentoo org> AuthorDate: Fri Jun 3 12:28:40 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 18 14:21:19 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a93b9012 dev-qt/qt3d: subslot binder media-libs/assimp:= Signed-off-by: Joonas Niilola gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.5..ebuild b/dev-qt/qt3d/qt3d-5.15.5..ebuild index 3981e194..0da2ac57 100644 --- a/dev-qt/qt3d/qt3d-5.15.5..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.5..ebuild @@ -19,7 +19,7 @@ RDEPEND=" =dev-qt/qtcore-${QT5_PV}* =dev-qt/qtgui-${QT5_PV}*:5=[vulkan=] =dev-qt/qtnetwork-${QT5_PV}* - >=media-libs/assimp-4.0.0 + >=media-libs/assimp-4.0.0:= gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* ) qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: dd21364799d3056319c23776abdcc2bba0dfc6c3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 12 14:10:08 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:13:34 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dd213647 dev-qt/qt3d: Add IUSE="vulkan" tied to dev-qt/qtgui, add slot op Uses private headers from dev-qt/qtgui. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> (cherry picked from commit e0a2412fad307e4d5713f384463ba0cc6dd00cb7) dev-qt/qt3d/metadata.xml | 1 + dev-qt/qt3d/qt3d-5.15..ebuild | 12 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ff8a21d9..ea85517d 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -8,6 +8,7 @@ Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings + Enable support for Vulkan https://bugreports.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index a66bb2cc..ffeb1aa5 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,18 +11,20 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2-only qml" +IUSE="gamepad gles2-only qml vulkan" -DEPEND=" +RDEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + ~dev-qt/qtgui-${PV}:5=[vulkan=] ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: b410c1c2c1fc58cb7b61562bed4acb502e2c513f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 25 22:21:52 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:22:03 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b410c1c2 dev-qt/qt3d: metadata.xml typo fix Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ea85517d..d359595b 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,7 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware viadev-qt/qtgamepad + Add support for gamepad hardware via dev-qt/qtgamepad Build QML/QtQuick bindings Enable support for Vulkan
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 6693fee3bb8a7c97e336a2f516da35a32accdf7d Author: Han Gao gmail com> AuthorDate: Wed Mar 30 19:09:26 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 1 18:23:28 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6693fee3 dev-qt/qt3d: ~riscv keyworing Closes: https://github.com/gentoo/gentoo/pull/24508 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Han Gao gmail.com> Signed-off-by: Yixun Lan gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index c1bef6e9..3981e194 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 5f3051c780e2e6f21ab419f1defd108db66a2969 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 26 08:42:48 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 26 12:10:00 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5f3051c7 dev-qt/qt3d: Force -system-assimp Bug: https://bugs.gentoo.org/810439 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15..ebuild | 8 1 file changed, 8 insertions(+) diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index bd8f016c..3099e711 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -35,3 +35,11 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + -- + -system-assimp + ) + qt5-build_src_configure +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: e1e77488d70751ba6a99ef136b4809d26895ba19 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Nov 23 09:38:20 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 2 18:09:22 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e1e77488 dev-qt/qt3d: rename USE=gles2 to USE=gles2-only Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 4 +--- dev-qt/qt3d/qt3d-5.14..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5.15..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5..ebuild| 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index bdb6f1b0..ff8a21d9 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,9 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware via - dev-qt/qtgamepad - Use GLES 2.0 or later instead of full OpenGL + Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: dd21364799d3056319c23776abdcc2bba0dfc6c3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 12 14:10:08 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:13:34 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dd213647 dev-qt/qt3d: Add IUSE="vulkan" tied to dev-qt/qtgui, add slot op Uses private headers from dev-qt/qtgui. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> (cherry picked from commit e0a2412fad307e4d5713f384463ba0cc6dd00cb7) dev-qt/qt3d/metadata.xml | 1 + dev-qt/qt3d/qt3d-5.15..ebuild | 12 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ff8a21d9..ea85517d 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -8,6 +8,7 @@ Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings + Enable support for Vulkan https://bugreports.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index a66bb2cc..ffeb1aa5 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,18 +11,20 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2-only qml" +IUSE="gamepad gles2-only qml vulkan" -DEPEND=" +RDEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + ~dev-qt/qtgui-${PV}:5=[vulkan=] ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: b410c1c2c1fc58cb7b61562bed4acb502e2c513f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 25 22:21:52 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:22:03 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b410c1c2 dev-qt/qt3d: metadata.xml typo fix Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ea85517d..d359595b 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,7 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware viadev-qt/qtgamepad + Add support for gamepad hardware via dev-qt/qtgamepad Build QML/QtQuick bindings Enable support for Vulkan
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 5f3051c780e2e6f21ab419f1defd108db66a2969 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 26 08:42:48 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 26 12:10:00 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5f3051c7 dev-qt/qt3d: Force -system-assimp Bug: https://bugs.gentoo.org/810439 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15..ebuild | 8 1 file changed, 8 insertions(+) diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index bd8f016c..3099e711 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -35,3 +35,11 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + -- + -system-assimp + ) + qt5-build_src_configure +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 6693fee3bb8a7c97e336a2f516da35a32accdf7d Author: Han Gao gmail com> AuthorDate: Wed Mar 30 19:09:26 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 1 18:23:28 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6693fee3 dev-qt/qt3d: ~riscv keyworing Closes: https://github.com/gentoo/gentoo/pull/24508 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Han Gao gmail.com> Signed-off-by: Yixun Lan gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index c1bef6e9..3981e194 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 041c6d78f94e2ebc66ad2b9ef5cc60580212c504 Author: Jimi Huotari gentoo org> AuthorDate: Mon Aug 26 10:34:27 2019 + Commit: Jimi Huotari gentoo org> CommitDate: Mon Aug 26 10:50:07 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=041c6d78 dev-qt/qt3d: add USE="gamepad" Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qt3d/metadata.xml | 2 ++ dev-qt/qt3d/qt3d-5.12..ebuild | 6 -- dev-qt/qt3d/qt3d-5.13..ebuild | 6 -- dev-qt/qt3d/qt3d-5.14..ebuild | 6 -- dev-qt/qt3d/qt3d-5..ebuild| 6 -- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 987a6dc2..bdb6f1b0 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,6 +6,8 @@ Gentoo Qt Project + Add support for gamepad hardware via + dev-qt/qtgamepad Use GLES 2.0 or later instead of full OpenGL Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.12..ebuild b/dev-qt/qt3d/qt3d-5.12..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.12..ebuild +++ b/dev-qt/qt3d/qt3d-5.12..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.13..ebuild b/dev-qt/qt3d/qt3d-5.13..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.13..ebuild +++ b/dev-qt/qt3d/qt3d-5.13..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 0f31a6ee6abee52c8a830c019fa2ec46daadb177 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 14:55:38 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0f31a6ee dev-qt/qt3d: raise media-libs/assimp dependency Gentoo-bug: 625298 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 2 +- dev-qt/qt3d/qt3d-5.9..ebuild | 2 +- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 94b5f2eb1a25b873b26cecd8bef84ead8669cb2d Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 15:07:11 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=94b5f2eb dev-qt/qt3d: 5.9 updates Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 6 ++ dev-qt/qt3d/qt3d-5.9..ebuild | 6 ++ dev-qt/qt3d/qt3d-5..ebuild | 6 ++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare }
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: dbccbce4bc15601befa65063402134d58d3dc1e2 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 15:08:02 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dbccbce4 dev-qt/qt3d: remove sys-libs/zlib dependency sys-libs/zlib is currently only used by bundled assimp, which we unbundle. Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 1 - dev-qt/qt3d/qt3d-5.9..ebuild | 1 - dev-qt/qt3d/qt3d-5..ebuild | 1 - 3 files changed, 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: e1e77488d70751ba6a99ef136b4809d26895ba19 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Nov 23 09:38:20 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 2 18:09:22 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e1e77488 dev-qt/qt3d: rename USE=gles2 to USE=gles2-only Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 4 +--- dev-qt/qt3d/qt3d-5.14..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5.15..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5..ebuild| 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index bdb6f1b0..ff8a21d9 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,9 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware via - dev-qt/qtgamepad - Use GLES 2.0 or later instead of full OpenGL + Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 2d8e963d72e0a4b008b27e064ba73ac91a17cfa3 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 11 12:34:40 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 11 12:36:10 2017 + 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..ebuild | 15 +-- dev-qt/qt3d/qt3d-5.9.0.ebuild| 9 +++-- dev-qt/qt3d/qt3d-5.9..ebuild | 9 +++-- dev-qt/qt3d/qt3d-5..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 @@ Use GLES 2.0 or later instead of full OpenGL + Build QML/QtQuick bindings https://bugreports.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.7..ebuild b/dev-qt/qt3d/qt3d-5.7..ebuild index f9541fd1..e4ff1a89 100644 --- a/dev-qt/qt3d/qt3d-5.7..ebuild +++ b/dev-qt/qt3d/qt3d-5.7..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..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..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..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..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 }
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 31b55f7450b9036a72e19b65361beab8c0f7a735 Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:55:36 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:26 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=31b55f74 dev-qt/qt3d: add new dependency on dev-qt/qtconcurrent Used in src/render. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 1 + dev-qt/qt3d/qt3d-5.8..ebuild | 1 + dev-qt/qt3d/qt3d-5..ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 75d59570ba516067fa1cb9307e1e54553504135c Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:58:24 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=75d59570 dev-qt/qt3d: qtdeclarative is mandatory Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 3 ++- dev-qt/qt3d/qt3d-5.8..ebuild | 3 ++- dev-qt/qt3d/qt3d-5..ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 0a58752b8d33dab6e8a88051c5697bc8a7313d37 Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 03:09:01 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0a58752b dev-qt/qt3d: add gles handling There's a lot of QT_OPENGL_ES_2 ifdefs. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/metadata.xml | 3 +++ dev-qt/qt3d/qt3d-5.8.0.ebuild| 6 +++--- dev-qt/qt3d/qt3d-5.8..ebuild | 6 +++--- dev-qt/qt3d/qt3d-5..ebuild | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 08d85fc4..496a2546 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -5,6 +5,9 @@ q...@gentoo.org Gentoo Qt Project + + Use GLES 2.0 or later instead of full OpenGL + https://bugreports.qt.io/ http://doc.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 130b857abae7d59970828532ee59b55f65e4c34e Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:54:03 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:26 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=130b857a dev-qt/qt3d: ensure that system media-libs/assimp is used Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 7 +++ dev-qt/qt3d/qt3d-5.8..ebuild | 9 - dev-qt/qt3d/qt3d-5..ebuild | 9 - 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 4f238ff7..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index aad66b97..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..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 # $Id$ @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index aad66b97..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..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 # $Id$ @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 267c9c22d8c23d7db16476a570810f10cefb618a Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:56:49 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=267c9c22 dev-qt/qt3d: add note about missing support for gamepad Used in src/input/frontend and and src/quick3d/imports/input Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 2 +- dev-qt/qt3d/qt3d-5.8..ebuild | 2 +- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND=" diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND=" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND="
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 041c6d78f94e2ebc66ad2b9ef5cc60580212c504 Author: Jimi Huotari gentoo org> AuthorDate: Mon Aug 26 10:34:27 2019 + Commit: Jimi Huotari gentoo org> CommitDate: Mon Aug 26 10:50:07 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=041c6d78 dev-qt/qt3d: add USE="gamepad" Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qt3d/metadata.xml | 2 ++ dev-qt/qt3d/qt3d-5.12..ebuild | 6 -- dev-qt/qt3d/qt3d-5.13..ebuild | 6 -- dev-qt/qt3d/qt3d-5.14..ebuild | 6 -- dev-qt/qt3d/qt3d-5..ebuild| 6 -- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 987a6dc2..bdb6f1b0 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,6 +6,8 @@ Gentoo Qt Project + Add support for gamepad hardware via + dev-qt/qtgamepad Use GLES 2.0 or later instead of full OpenGL Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.12..ebuild b/dev-qt/qt3d/qt3d-5.12..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.12..ebuild +++ b/dev-qt/qt3d/qt3d-5.12..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.13..ebuild b/dev-qt/qt3d/qt3d-5.13..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.13..ebuild +++ b/dev-qt/qt3d/qt3d-5.13..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 5f3051c780e2e6f21ab419f1defd108db66a2969 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 26 08:42:48 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 26 12:10:00 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5f3051c7 dev-qt/qt3d: Force -system-assimp Bug: https://bugs.gentoo.org/810439 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15..ebuild | 8 1 file changed, 8 insertions(+) diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index bd8f016c..3099e711 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -35,3 +35,11 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + -- + -system-assimp + ) + qt5-build_src_configure +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 04f6e9ca89ae4b3b3b6dd192da3ef759a357c952 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Feb 25 18:53:19 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 17 20:39:18 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=04f6e9ca dev-qt/qt3d: Keyword 5.15.2-r11 arm, #833799 Signed-off-by: Arthur Zamarin gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index 81824562..c1bef6e9 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: e1e77488d70751ba6a99ef136b4809d26895ba19 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Nov 23 09:38:20 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 2 18:09:22 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e1e77488 dev-qt/qt3d: rename USE=gles2 to USE=gles2-only Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 4 +--- dev-qt/qt3d/qt3d-5.14..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5.15..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5..ebuild| 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index bdb6f1b0..ff8a21d9 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,9 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware via - dev-qt/qtgamepad - Use GLES 2.0 or later instead of full OpenGL + Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: dd21364799d3056319c23776abdcc2bba0dfc6c3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 12 14:10:08 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:13:34 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dd213647 dev-qt/qt3d: Add IUSE="vulkan" tied to dev-qt/qtgui, add slot op Uses private headers from dev-qt/qtgui. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> (cherry picked from commit e0a2412fad307e4d5713f384463ba0cc6dd00cb7) dev-qt/qt3d/metadata.xml | 1 + dev-qt/qt3d/qt3d-5.15..ebuild | 12 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ff8a21d9..ea85517d 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -8,6 +8,7 @@ Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings + Enable support for Vulkan https://bugreports.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index a66bb2cc..ffeb1aa5 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,18 +11,20 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2-only qml" +IUSE="gamepad gles2-only qml vulkan" -DEPEND=" +RDEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + ~dev-qt/qtgui-${PV}:5=[vulkan=] ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: b410c1c2c1fc58cb7b61562bed4acb502e2c513f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 25 22:21:52 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:22:03 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b410c1c2 dev-qt/qt3d: metadata.xml typo fix Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ea85517d..d359595b 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,7 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware viadev-qt/qtgamepad + Add support for gamepad hardware via dev-qt/qtgamepad Build QML/QtQuick bindings Enable support for Vulkan
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 403859343e41e506fafe12c70f21392410c83049 Author: Davide Pesavento gentoo org> AuthorDate: Mon Jan 7 19:25:43 2019 + Commit: Davide Pesavento gentoo org> CommitDate: Mon Jan 7 19:25:43 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=40385934 dev-qt/qt3d: tweak DESCRIPTION Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Davide Pesavento gentoo.org> dev-qt/qt3d/qt3d-5.12.0.ebuild| 4 ++-- dev-qt/qt3d/qt3d-5.12..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5..ebuild| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.12.0.ebuild b/dev-qt/qt3d/qt3d-5.12.0.ebuild index 40cf9458..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5.12.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.12.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" diff --git a/dev-qt/qt3d/qt3d-5.12..ebuild b/dev-qt/qt3d/qt3d-5.12..ebuild index e6563090..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5.12..ebuild +++ b/dev-qt/qt3d/qt3d-5.12..ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index e6563090..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 0f31a6ee6abee52c8a830c019fa2ec46daadb177 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 14:55:38 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0f31a6ee dev-qt/qt3d: raise media-libs/assimp dependency Gentoo-bug: 625298 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 2 +- dev-qt/qt3d/qt3d-5.9..ebuild | 2 +- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 94b5f2eb1a25b873b26cecd8bef84ead8669cb2d Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 15:07:11 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=94b5f2eb dev-qt/qt3d: 5.9 updates Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 6 ++ dev-qt/qt3d/qt3d-5.9..ebuild | 6 ++ dev-qt/qt3d/qt3d-5..ebuild | 6 ++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare }
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: dbccbce4bc15601befa65063402134d58d3dc1e2 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 15:08:02 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dbccbce4 dev-qt/qt3d: remove sys-libs/zlib dependency sys-libs/zlib is currently only used by bundled assimp, which we unbundle. Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 1 - dev-qt/qt3d/qt3d-5.9..ebuild | 1 - dev-qt/qt3d/qt3d-5..ebuild | 1 - 3 files changed, 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 041c6d78f94e2ebc66ad2b9ef5cc60580212c504 Author: Jimi Huotari gentoo org> AuthorDate: Mon Aug 26 10:34:27 2019 + Commit: Jimi Huotari gentoo org> CommitDate: Mon Aug 26 10:50:07 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=041c6d78 dev-qt/qt3d: add USE="gamepad" Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qt3d/metadata.xml | 2 ++ dev-qt/qt3d/qt3d-5.12..ebuild | 6 -- dev-qt/qt3d/qt3d-5.13..ebuild | 6 -- dev-qt/qt3d/qt3d-5.14..ebuild | 6 -- dev-qt/qt3d/qt3d-5..ebuild| 6 -- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 987a6dc2..bdb6f1b0 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,6 +6,8 @@ Gentoo Qt Project + Add support for gamepad hardware via + dev-qt/qtgamepad Use GLES 2.0 or later instead of full OpenGL Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.12..ebuild b/dev-qt/qt3d/qt3d-5.12..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.12..ebuild +++ b/dev-qt/qt3d/qt3d-5.12..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.13..ebuild b/dev-qt/qt3d/qt3d-5.13..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.13..ebuild +++ b/dev-qt/qt3d/qt3d-5.13..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 2d8e963d72e0a4b008b27e064ba73ac91a17cfa3 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 11 12:34:40 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 11 12:36:10 2017 + 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..ebuild | 15 +-- dev-qt/qt3d/qt3d-5.9.0.ebuild| 9 +++-- dev-qt/qt3d/qt3d-5.9..ebuild | 9 +++-- dev-qt/qt3d/qt3d-5..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 @@ Use GLES 2.0 or later instead of full OpenGL + Build QML/QtQuick bindings https://bugreports.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.7..ebuild b/dev-qt/qt3d/qt3d-5.7..ebuild index f9541fd1..e4ff1a89 100644 --- a/dev-qt/qt3d/qt3d-5.7..ebuild +++ b/dev-qt/qt3d/qt3d-5.7..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..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..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..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..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 }
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 31b55f7450b9036a72e19b65361beab8c0f7a735 Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:55:36 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:26 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=31b55f74 dev-qt/qt3d: add new dependency on dev-qt/qtconcurrent Used in src/render. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 1 + dev-qt/qt3d/qt3d-5.8..ebuild | 1 + dev-qt/qt3d/qt3d-5..ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index e869a76b..5a1e6f36 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -15,6 +15,7 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 75d59570ba516067fa1cb9307e1e54553504135c Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:58:24 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=75d59570 dev-qt/qt3d: qtdeclarative is mandatory Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 3 ++- dev-qt/qt3d/qt3d-5.8..ebuild | 3 ++- dev-qt/qt3d/qt3d-5..ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 8d61f429..efcc5f73 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, qml, tools +# TODO: egl, gamepad, tools IUSE="" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 0a58752b8d33dab6e8a88051c5697bc8a7313d37 Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 03:09:01 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0a58752b dev-qt/qt3d: add gles handling There's a lot of QT_OPENGL_ES_2 ifdefs. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/metadata.xml | 3 +++ dev-qt/qt3d/qt3d-5.8.0.ebuild| 6 +++--- dev-qt/qt3d/qt3d-5.8..ebuild | 6 +++--- dev-qt/qt3d/qt3d-5..ebuild | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 08d85fc4..496a2546 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -5,6 +5,9 @@ q...@gentoo.org Gentoo Qt Project + + Use GLES 2.0 or later instead of full OpenGL + https://bugreports.qt.io/ http://doc.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1 diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index efcc5f73..287c9b91 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, gamepad, tools -IUSE="" +# TODO: gamepad, tools +IUSE="gles2" DEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtdeclarative-${PV}[gles2=] ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-3.1.1
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 130b857abae7d59970828532ee59b55f65e4c34e Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:54:03 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:26 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=130b857a dev-qt/qt3d: ensure that system media-libs/assimp is used Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 7 +++ dev-qt/qt3d/qt3d-5.8..ebuild | 9 - dev-qt/qt3d/qt3d-5..ebuild | 9 - 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 4f238ff7..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index aad66b97..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..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 # $Id$ @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index aad66b97..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..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 # $Id$ @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 267c9c22d8c23d7db16476a570810f10cefb618a Author: Michael Palimaka gentoo org> AuthorDate: Sun Feb 26 02:56:49 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 26 03:09:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=267c9c22 dev-qt/qt3d: add note about missing support for gamepad Used in src/input/frontend and and src/quick3d/imports/input Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild| 2 +- dev-qt/qt3d/qt3d-5.8..ebuild | 2 +- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND=" diff --git a/dev-qt/qt3d/qt3d-5.8..ebuild b/dev-qt/qt3d/qt3d-5.8..ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5.8..ebuild +++ b/dev-qt/qt3d/qt3d-5.8..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND=" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 5a1e6f36..8d61f429 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -# TODO: egl, qml, tools +# TODO: egl, gamepad, qml, tools IUSE="" DEPEND="
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 403859343e41e506fafe12c70f21392410c83049 Author: Davide Pesavento gentoo org> AuthorDate: Mon Jan 7 19:25:43 2019 + Commit: Davide Pesavento gentoo org> CommitDate: Mon Jan 7 19:25:43 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=40385934 dev-qt/qt3d: tweak DESCRIPTION Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Davide Pesavento gentoo.org> dev-qt/qt3d/qt3d-5.12.0.ebuild| 4 ++-- dev-qt/qt3d/qt3d-5.12..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5..ebuild| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.12.0.ebuild b/dev-qt/qt3d/qt3d-5.12.0.ebuild index 40cf9458..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5.12.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.12.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" diff --git a/dev-qt/qt3d/qt3d-5.12..ebuild b/dev-qt/qt3d/qt3d-5.12..ebuild index e6563090..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5.12..ebuild +++ b/dev-qt/qt3d/qt3d-5.12..ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index e6563090..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 04457b0390e18b9517e10c4e27bcc914fd97fd09 Author: Davide Pesavento gentoo org> AuthorDate: Sat Sep 27 21:35:00 2014 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Sep 27 21:35:00 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=04457b03 [dev-qt/qt3d] Change DESCRIPTION. Package-Manager: portage-2.2.14_rc1 --- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index dcd4841..b0b5917 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit qt5-build -DESCRIPTION="3D library built on top of Qt OpenGL" +DESCRIPTION="The 3D module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == live ]]; then KEYWORDS=""
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 0f31a6ee6abee52c8a830c019fa2ec46daadb177 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 14:55:38 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0f31a6ee dev-qt/qt3d: raise media-libs/assimp dependency Gentoo-bug: 625298 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 2 +- dev-qt/qt3d/qt3d-5.9..ebuild | 2 +- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 94b5f2eb1a25b873b26cecd8bef84ead8669cb2d Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 15:07:11 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=94b5f2eb dev-qt/qt3d: 5.9 updates Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 6 ++ dev-qt/qt3d/qt3d-5.9..ebuild | 6 ++ dev-qt/qt3d/qt3d-5..ebuild | 6 ++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare }
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: dbccbce4bc15601befa65063402134d58d3dc1e2 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 15:08:02 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dbccbce4 dev-qt/qt3d: remove sys-libs/zlib dependency sys-libs/zlib is currently only used by bundled assimp, which we unbundle. Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 1 - dev-qt/qt3d/qt3d-5.9..ebuild | 1 - dev-qt/qt3d/qt3d-5..ebuild | 1 - 3 files changed, 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index be0ee17e..02ffa8ef 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -19,7 +19,6 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 - sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 2d8e963d72e0a4b008b27e064ba73ac91a17cfa3 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 11 12:34:40 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 11 12:36:10 2017 + 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..ebuild | 15 +-- dev-qt/qt3d/qt3d-5.9.0.ebuild| 9 +++-- dev-qt/qt3d/qt3d-5.9..ebuild | 9 +++-- dev-qt/qt3d/qt3d-5..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 @@ Use GLES 2.0 or later instead of full OpenGL + Build QML/QtQuick bindings https://bugreports.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.7..ebuild b/dev-qt/qt3d/qt3d-5.7..ebuild index f9541fd1..e4ff1a89 100644 --- a/dev-qt/qt3d/qt3d-5.7..ebuild +++ b/dev-qt/qt3d/qt3d-5.7..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..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..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..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 8d560430..f17dda81 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..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 }
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 041c6d78f94e2ebc66ad2b9ef5cc60580212c504 Author: Jimi Huotari gentoo org> AuthorDate: Mon Aug 26 10:34:27 2019 + Commit: Jimi Huotari gentoo org> CommitDate: Mon Aug 26 10:50:07 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=041c6d78 dev-qt/qt3d: add USE="gamepad" Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qt3d/metadata.xml | 2 ++ dev-qt/qt3d/qt3d-5.12..ebuild | 6 -- dev-qt/qt3d/qt3d-5.13..ebuild | 6 -- dev-qt/qt3d/qt3d-5.14..ebuild | 6 -- dev-qt/qt3d/qt3d-5..ebuild| 6 -- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 987a6dc2..bdb6f1b0 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,6 +6,8 @@ Gentoo Qt Project + Add support for gamepad hardware via + dev-qt/qtgamepad Use GLES 2.0 or later instead of full OpenGL Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.12..ebuild b/dev-qt/qt3d/qt3d-5.12..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.12..ebuild +++ b/dev-qt/qt3d/qt3d-5.12..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.13..ebuild b/dev-qt/qt3d/qt3d-5.13..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.13..ebuild +++ b/dev-qt/qt3d/qt3d-5.13..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 403859343e41e506fafe12c70f21392410c83049 Author: Davide Pesavento gentoo org> AuthorDate: Mon Jan 7 19:25:43 2019 + Commit: Davide Pesavento gentoo org> CommitDate: Mon Jan 7 19:25:43 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=40385934 dev-qt/qt3d: tweak DESCRIPTION Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Davide Pesavento gentoo.org> dev-qt/qt3d/qt3d-5.12.0.ebuild| 4 ++-- dev-qt/qt3d/qt3d-5.12..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5..ebuild| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.12.0.ebuild b/dev-qt/qt3d/qt3d-5.12.0.ebuild index 40cf9458..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5.12.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.12.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" diff --git a/dev-qt/qt3d/qt3d-5.12..ebuild b/dev-qt/qt3d/qt3d-5.12..ebuild index e6563090..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5.12..ebuild +++ b/dev-qt/qt3d/qt3d-5.12..ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index e6563090..875c47d5 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit qt5-build -DESCRIPTION="The 3D module for the Qt5 framework" +DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 04f6e9ca89ae4b3b3b6dd192da3ef759a357c952 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Feb 25 18:53:19 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 17 20:39:18 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=04f6e9ca dev-qt/qt3d: Keyword 5.15.2-r11 arm, #833799 Signed-off-by: Arthur Zamarin gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index 81824562..c1bef6e9 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: a93b901209070ed6cc8438d828f669e165b11212 Author: Joonas Niilola gentoo org> AuthorDate: Fri Jun 3 12:28:40 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 18 14:21:19 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a93b9012 dev-qt/qt3d: subslot binder media-libs/assimp:= Signed-off-by: Joonas Niilola gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.5..ebuild b/dev-qt/qt3d/qt3d-5.15.5..ebuild index 3981e194..0da2ac57 100644 --- a/dev-qt/qt3d/qt3d-5.15.5..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.5..ebuild @@ -19,7 +19,7 @@ RDEPEND=" =dev-qt/qtcore-${QT5_PV}* =dev-qt/qtgui-${QT5_PV}*:5=[vulkan=] =dev-qt/qtnetwork-${QT5_PV}* - >=media-libs/assimp-4.0.0 + >=media-libs/assimp-4.0.0:= gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* ) qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 6693fee3bb8a7c97e336a2f516da35a32accdf7d Author: Han Gao gmail com> AuthorDate: Wed Mar 30 19:09:26 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 1 18:23:28 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6693fee3 dev-qt/qt3d: ~riscv keyworing Closes: https://github.com/gentoo/gentoo/pull/24508 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Han Gao gmail.com> Signed-off-by: Yixun Lan gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index c1bef6e9..3981e194 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 04f6e9ca89ae4b3b3b6dd192da3ef759a357c952 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Feb 25 18:53:19 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 17 20:39:18 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=04f6e9ca dev-qt/qt3d: Keyword 5.15.2-r11 arm, #833799 Signed-off-by: Arthur Zamarin gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index 81824562..c1bef6e9 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 6693fee3bb8a7c97e336a2f516da35a32accdf7d Author: Han Gao gmail com> AuthorDate: Wed Mar 30 19:09:26 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 1 18:23:28 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6693fee3 dev-qt/qt3d: ~riscv keyworing Closes: https://github.com/gentoo/gentoo/pull/24508 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Han Gao gmail.com> Signed-off-by: Yixun Lan gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index c1bef6e9..3981e194 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: a93b901209070ed6cc8438d828f669e165b11212 Author: Joonas Niilola gentoo org> AuthorDate: Fri Jun 3 12:28:40 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 18 14:21:19 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a93b9012 dev-qt/qt3d: subslot binder media-libs/assimp:= Signed-off-by: Joonas Niilola gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.5..ebuild b/dev-qt/qt3d/qt3d-5.15.5..ebuild index 3981e194..0da2ac57 100644 --- a/dev-qt/qt3d/qt3d-5.15.5..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.5..ebuild @@ -19,7 +19,7 @@ RDEPEND=" =dev-qt/qtcore-${QT5_PV}* =dev-qt/qtgui-${QT5_PV}*:5=[vulkan=] =dev-qt/qtnetwork-${QT5_PV}* - >=media-libs/assimp-4.0.0 + >=media-libs/assimp-4.0.0:= gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* ) qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: e1e77488d70751ba6a99ef136b4809d26895ba19 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Nov 23 09:38:20 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 2 18:09:22 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e1e77488 dev-qt/qt3d: rename USE=gles2 to USE=gles2-only Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 4 +--- dev-qt/qt3d/qt3d-5.14..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5.15..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5..ebuild| 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index bdb6f1b0..ff8a21d9 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,9 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware via - dev-qt/qtgamepad - Use GLES 2.0 or later instead of full OpenGL + Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: dd21364799d3056319c23776abdcc2bba0dfc6c3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 12 14:10:08 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:13:34 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dd213647 dev-qt/qt3d: Add IUSE="vulkan" tied to dev-qt/qtgui, add slot op Uses private headers from dev-qt/qtgui. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> (cherry picked from commit e0a2412fad307e4d5713f384463ba0cc6dd00cb7) dev-qt/qt3d/metadata.xml | 1 + dev-qt/qt3d/qt3d-5.15..ebuild | 12 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ff8a21d9..ea85517d 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -8,6 +8,7 @@ Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings + Enable support for Vulkan https://bugreports.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index a66bb2cc..ffeb1aa5 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,18 +11,20 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2-only qml" +IUSE="gamepad gles2-only qml vulkan" -DEPEND=" +RDEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + ~dev-qt/qtgui-${PV}:5=[vulkan=] ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: b410c1c2c1fc58cb7b61562bed4acb502e2c513f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 25 22:21:52 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:22:03 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b410c1c2 dev-qt/qt3d: metadata.xml typo fix Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ea85517d..d359595b 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,7 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware viadev-qt/qtgamepad + Add support for gamepad hardware via dev-qt/qtgamepad Build QML/QtQuick bindings Enable support for Vulkan
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 5f3051c780e2e6f21ab419f1defd108db66a2969 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 26 08:42:48 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 26 12:10:00 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5f3051c7 dev-qt/qt3d: Force -system-assimp Bug: https://bugs.gentoo.org/810439 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15..ebuild | 8 1 file changed, 8 insertions(+) diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index bd8f016c..3099e711 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -35,3 +35,11 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + -- + -system-assimp + ) + qt5-build_src_configure +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 04457b0390e18b9517e10c4e27bcc914fd97fd09 Author: Davide Pesavento gentoo org> AuthorDate: Sat Sep 27 21:35:00 2014 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Sep 27 21:35:00 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=04457b03 [dev-qt/qt3d] Change DESCRIPTION. Package-Manager: portage-2.2.14_rc1 --- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index dcd4841..b0b5917 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit qt5-build -DESCRIPTION="3D library built on top of Qt OpenGL" +DESCRIPTION="The 3D module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == live ]]; then KEYWORDS=""
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: a93b901209070ed6cc8438d828f669e165b11212 Author: Joonas Niilola gentoo org> AuthorDate: Fri Jun 3 12:28:40 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 18 14:21:19 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a93b9012 dev-qt/qt3d: subslot binder media-libs/assimp:= Signed-off-by: Joonas Niilola gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.5..ebuild b/dev-qt/qt3d/qt3d-5.15.5..ebuild index 3981e194..0da2ac57 100644 --- a/dev-qt/qt3d/qt3d-5.15.5..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.5..ebuild @@ -19,7 +19,7 @@ RDEPEND=" =dev-qt/qtcore-${QT5_PV}* =dev-qt/qtgui-${QT5_PV}*:5=[vulkan=] =dev-qt/qtnetwork-${QT5_PV}* - >=media-libs/assimp-4.0.0 + >=media-libs/assimp-4.0.0:= gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* ) qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 6693fee3bb8a7c97e336a2f516da35a32accdf7d Author: Han Gao gmail com> AuthorDate: Wed Mar 30 19:09:26 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 1 18:23:28 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6693fee3 dev-qt/qt3d: ~riscv keyworing Closes: https://github.com/gentoo/gentoo/pull/24508 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Han Gao gmail.com> Signed-off-by: Yixun Lan gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15.3..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5.15.3..ebuild b/dev-qt/qt3d/qt3d-5.15.3..ebuild index c1bef6e9..3981e194 100644 --- a/dev-qt/qt3d/qt3d-5.15.3..ebuild +++ b/dev-qt/qt3d/qt3d-5.15.3..ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="3D rendering module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi # TODO: tools
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 04457b0390e18b9517e10c4e27bcc914fd97fd09 Author: Davide Pesavento gentoo org> AuthorDate: Sat Sep 27 21:35:00 2014 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Sep 27 21:35:00 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=04457b03 [dev-qt/qt3d] Change DESCRIPTION. Package-Manager: portage-2.2.14_rc1 --- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index dcd4841..b0b5917 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit qt5-build -DESCRIPTION="3D library built on top of Qt OpenGL" +DESCRIPTION="The 3D module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == live ]]; then KEYWORDS=""
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: e1e77488d70751ba6a99ef136b4809d26895ba19 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Nov 23 09:38:20 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 2 18:09:22 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e1e77488 dev-qt/qt3d: rename USE=gles2 to USE=gles2-only Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 4 +--- dev-qt/qt3d/qt3d-5.14..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5.15..ebuild | 4 ++-- dev-qt/qt3d/qt3d-5..ebuild| 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index bdb6f1b0..ff8a21d9 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,9 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware via - dev-qt/qtgamepad - Use GLES 2.0 or later instead of full OpenGL + Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 431e2685..a66bb2cc 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2 qml" +IUSE="gamepad gles2-only qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) + qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 5f3051c780e2e6f21ab419f1defd108db66a2969 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 26 08:42:48 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 26 12:10:00 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5f3051c7 dev-qt/qt3d: Force -system-assimp Bug: https://bugs.gentoo.org/810439 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/qt3d-5.15..ebuild | 8 1 file changed, 8 insertions(+) diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index bd8f016c..3099e711 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -35,3 +35,11 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + -- + -system-assimp + ) + qt5-build_src_configure +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: dd21364799d3056319c23776abdcc2bba0dfc6c3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 12 14:10:08 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:13:34 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dd213647 dev-qt/qt3d: Add IUSE="vulkan" tied to dev-qt/qtgui, add slot op Uses private headers from dev-qt/qtgui. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> (cherry picked from commit e0a2412fad307e4d5713f384463ba0cc6dd00cb7) dev-qt/qt3d/metadata.xml | 1 + dev-qt/qt3d/qt3d-5.15..ebuild | 12 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ff8a21d9..ea85517d 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -8,6 +8,7 @@ Add support for gamepad hardware viadev-qt/qtgamepad Build QML/QtQuick bindings + Enable support for Vulkan https://bugreports.qt.io/ diff --git a/dev-qt/qt3d/qt3d-5.15..ebuild b/dev-qt/qt3d/qt3d-5.15..ebuild index a66bb2cc..ffeb1aa5 100644 --- a/dev-qt/qt3d/qt3d-5.15..ebuild +++ b/dev-qt/qt3d/qt3d-5.15..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,18 +11,20 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: tools -IUSE="gamepad gles2-only qml" +IUSE="gamepad gles2-only qml vulkan" -DEPEND=" +RDEPEND=" ~dev-qt/qtconcurrent-${PV} ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + ~dev-qt/qtgui-${PV}:5=[vulkan=] ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: b410c1c2c1fc58cb7b61562bed4acb502e2c513f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 25 22:21:52 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 22:22:03 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b410c1c2 dev-qt/qt3d: metadata.xml typo fix Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt3d/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index ea85517d..d359595b 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,7 +6,7 @@ Gentoo Qt Project - Add support for gamepad hardware viadev-qt/qtgamepad + Add support for gamepad hardware via dev-qt/qtgamepad Build QML/QtQuick bindings Enable support for Vulkan
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 041c6d78f94e2ebc66ad2b9ef5cc60580212c504 Author: Jimi Huotari gentoo org> AuthorDate: Mon Aug 26 10:34:27 2019 + Commit: Jimi Huotari gentoo org> CommitDate: Mon Aug 26 10:50:07 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=041c6d78 dev-qt/qt3d: add USE="gamepad" Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qt3d/metadata.xml | 2 ++ dev-qt/qt3d/qt3d-5.12..ebuild | 6 -- dev-qt/qt3d/qt3d-5.13..ebuild | 6 -- dev-qt/qt3d/qt3d-5.14..ebuild | 6 -- dev-qt/qt3d/qt3d-5..ebuild| 6 -- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index 987a6dc2..bdb6f1b0 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -6,6 +6,8 @@ Gentoo Qt Project + Add support for gamepad hardware via + dev-qt/qtgamepad Use GLES 2.0 or later instead of full OpenGL Build QML/QtQuick bindings diff --git a/dev-qt/qt3d/qt3d-5.12..ebuild b/dev-qt/qt3d/qt3d-5.12..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.12..ebuild +++ b/dev-qt/qt3d/qt3d-5.12..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.13..ebuild b/dev-qt/qt3d/qt3d-5.13..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.13..ebuild +++ b/dev-qt/qt3d/qt3d-5.13..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5.14..ebuild b/dev-qt/qt3d/qt3d-5.14..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5.14..ebuild +++ b/dev-qt/qt3d/qt3d-5.14..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 0f61b942..431e2685 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm64 ~x86" fi -# TODO: gamepad, tools -IUSE="gles2 qml" +# TODO: tools +IUSE="gamepad gles2 qml" DEPEND=" ~dev-qt/qtconcurrent-${PV} @@ -19,6 +19,7 @@ DEPEND=" ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} >=media-libs/assimp-4.0.0 + gamepad? ( ~dev-qt/qtgamepad-${PV} ) qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " RDEPEND="${DEPEND}" @@ -26,6 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri qt_use_disable_mod qml quick src/src.pro qt5-build_src_prepare
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 0f31a6ee6abee52c8a830c019fa2ec46daadb177 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 14:55:38 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0f31a6ee dev-qt/qt3d: raise media-libs/assimp dependency Gentoo-bug: 625298 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 2 +- dev-qt/qt3d/qt3d-5.9..ebuild | 2 +- dev-qt/qt3d/qt3d-5..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) " diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f17dda81..f3fae18f 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -18,7 +18,7 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-3.1.1 + >=media-libs/assimp-4.0.0 sys-libs/zlib qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
commit: 94b5f2eb1a25b873b26cecd8bef84ead8669cb2d Author: Michael Palimaka gentoo org> AuthorDate: Tue Jul 25 15:07:11 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jul 25 15:09:25 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=94b5f2eb dev-qt/qt3d: 5.9 updates Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qt3d/qt3d-5.9.1.ebuild| 6 ++ dev-qt/qt3d/qt3d-5.9..ebuild | 6 ++ dev-qt/qt3d/qt3d-5..ebuild | 6 ++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5.9..ebuild b/dev-qt/qt3d/qt3d-5.9..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5.9..ebuild +++ b/dev-qt/qt3d/qt3d-5.9..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare } diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index f3fae18f..be0ee17e 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}" src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die - qt5-build_src_prepare + qt_use_disable_mod qml quick src/src.pro - if ! use qml; then - sed -i -e "/quick3d/s/^/#/" src/src.pro || die - fi + qt5-build_src_prepare }