summaryrefslogtreecommitdiff
path: root/dev-qt/qtquick3d/qtquick3d-6.10.9999.ebuild
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2025-09-08 01:51:17 -0400
committerIonen Wolkens <ionen@gentoo.org>2025-09-08 01:56:55 -0400
commit419e95657ac6c35a3d529a24899ef6458482f68a (patch)
tree4b02453d63fc418c3025594141de5e319a8f3ba4 /dev-qt/qtquick3d/qtquick3d-6.10.9999.ebuild
parent2353a4bf3d3c51230d1f8ca3d2a188310f6102fd (diff)
downloadgentoo-419e95657ac6c35a3d529a24899ef6458482f68a.tar.gz
gentoo-419e95657ac6c35a3d529a24899ef6458482f68a.tar.bz2
gentoo-419e95657ac6c35a3d529a24899ef6458482f68a.zip
dev-qt/qtquick3d: allow using assimp-6.x
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtquick3d/qtquick3d-6.10.9999.ebuild')
-rw-r--r--dev-qt/qtquick3d/qtquick3d-6.10.9999.ebuild14
1 files changed, 7 insertions, 7 deletions
diff --git a/dev-qt/qtquick3d/qtquick3d-6.10.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.10.9999.ebuild
index d1434ddd7fe5..a09c7ff67fb2 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.10.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.10.9999.ebuild
@@ -16,13 +16,12 @@ fi
IUSE="opengl vulkan"
-# <assimp-6: https://bugreports.qt.io/browse/QTBUG-137996 (same as qt3d)
RDEPEND="
~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
~dev-qt/qtdeclarative-${PV}:6
~dev-qt/qtquicktimeline-${PV}:6
~dev-qt/qtshadertools-${PV}:6
- <media-libs/assimp-6:=
+ media-libs/assimp:=
sys-libs/zlib:=
"
DEPEND="
@@ -34,17 +33,18 @@ BDEPEND="
~dev-qt/qtshadertools-${PV}:6
"
-PATCHES=(
- "${FILESDIR}"/${PN}-6.6.2-gcc14.patch
- "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
-)
-
CMAKE_SKIP_TESTS=(
# needs off-by-default assimp[collada] that is masked on some profiles,
# not worth the extra trouble
tst_qquick3dassetimport
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.6.2-gcc14.patch
+ "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
+ "${FILESDIR}"/${PN}-6.9.2-assimp6.patch
+)
+
src_configure() {
local mycmakeargs=(
# TODO: if someone wants it, openxr should likely have its own