commit: 419e95657ac6c35a3d529a24899ef6458482f68a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 8 05:51:17 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Sep 8 05:56:55 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419e9565
dev-qt/qtquick3d: allow using assimp-6.x
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch | 11 +++++++++++
dev-qt/qtquick3d/qtquick3d-6.10.9999.ebuild | 14 +++++++-------
.../{qtquick3d-6.9.2.ebuild => qtquick3d-6.9.2-r1.ebuild} | 14 +++++++-------
dev-qt/qtquick3d/qtquick3d-6.9.9999.ebuild | 14 +++++++-------
dev-qt/qtquick3d/qtquick3d-6.9999.ebuild | 11 ++++++-----
5 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
b/dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
new file mode 100644
index 000000000000..61348e3e1c1a
--- /dev/null
+++ b/dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
@@ -0,0 +1,11 @@
+Qt bundles assimp-6.x but the system library check still enforces
+the major version (5) rather than only check minimum. Ignore version
+for simplicity (we don't package incompatible <5.1.6 versions).
+--- a/src/plugins/assetimporters/configure.cmake
++++ b/src/plugins/assetimporters/configure.cmake
+@@ -16 +16 @@
+-qt_find_package(WrapQuick3DAssimp 5.1.6 PROVIDED_TARGETS
WrapQuick3DAssimp::WrapQuick3DAssimp MODULE_NAME assetimporters QMAKE_LIB
quick3d_assimp)
++qt_find_package(WrapQuick3DAssimp PROVIDED_TARGETS
WrapQuick3DAssimp::WrapQuick3DAssimp MODULE_NAME assetimporters QMAKE_LIB
quick3d_assimp)
+@@ -38 +38 @@
+- PACKAGES PACKAGE WrapQuick3DAssimp 5.1.6)
++ PACKAGES PACKAGE WrapQuick3DAssimp)
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
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9.2.ebuild
b/dev-qt/qtquick3d/qtquick3d-6.9.2-r1.ebuild
similarity index 93%
rename from dev-qt/qtquick3d/qtquick3d-6.9.2.ebuild
rename to dev-qt/qtquick3d/qtquick3d-6.9.2-r1.ebuild
index d1434ddd7fe5..a09c7ff67fb2 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9.2.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9.2-r1.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
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9.9999.ebuild
b/dev-qt/qtquick3d/qtquick3d-6.9.9999.ebuild
index d1434ddd7fe5..a09c7ff67fb2 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9.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
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
index 31e5f6b3ae63..a09c7ff67fb2 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
@@ -33,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
