commit: 2353a4bf3d3c51230d1f8ca3d2a188310f6102fd
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 8 05:28:06 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=2353a4bf
dev-qt/qt3d: allow using assimp-6.x
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qt3d/files/qt3d-6.9.2-assimp6.patch | 11 +++++++++++
dev-qt/qt3d/qt3d-6.10.9999.ebuild | 7 +++++--
dev-qt/qt3d/{qt3d-6.9.2.ebuild => qt3d-6.9.2-r1.ebuild} | 7 +++++--
dev-qt/qt3d/qt3d-6.9.9999.ebuild | 7 +++++--
dev-qt/qt3d/qt3d-6.9999.ebuild | 4 ++++
5 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qt3d/files/qt3d-6.9.2-assimp6.patch
b/dev-qt/qt3d/files/qt3d-6.9.2-assimp6.patch
new file mode 100644
index 000000000000..a1532b113881
--- /dev/null
+++ b/dev-qt/qt3d/files/qt3d-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 versions).
+--- a/src/core/configure.cmake
++++ b/src/core/configure.cmake
+@@ -16 +16 @@
+-qt_find_package(WrapQt3DAssimp 5 PROVIDED_TARGETS
WrapQt3DAssimp::WrapQt3DAssimp MODULE_NAME 3dcore QMAKE_LIB qt3d-assimp)
++qt_find_package(WrapQt3DAssimp PROVIDED_TARGETS
WrapQt3DAssimp::WrapQt3DAssimp MODULE_NAME 3dcore QMAKE_LIB qt3d-assimp)
+@@ -23 +23 @@
+- PACKAGES PACKAGE WrapQt3DAssimp 5
++ PACKAGES PACKAGE WrapQt3DAssimp
diff --git a/dev-qt/qt3d/qt3d-6.10.9999.ebuild
b/dev-qt/qt3d/qt3d-6.10.9999.ebuild
index 67844ebdab56..895f0e26acfa 100644
--- a/dev-qt/qt3d/qt3d-6.10.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.10.9999.ebuild
@@ -15,11 +15,10 @@ fi
IUSE="gles2-only qml vulkan"
-# <assimp-6: https://bugreports.qt.io/browse/QTBUG-137996
RDEPEND="
~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
~dev-qt/qtshadertools-${PV}:6
- <media-libs/assimp-6:=
+ media-libs/assimp:=
qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
"
DEPEND="
@@ -27,6 +26,10 @@ DEPEND="
vulkan? ( dev-util/vulkan-headers )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.9.2-assimp6.patch
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package qml Qt6Qml)
diff --git a/dev-qt/qt3d/qt3d-6.9.2.ebuild b/dev-qt/qt3d/qt3d-6.9.2-r1.ebuild
similarity index 90%
rename from dev-qt/qt3d/qt3d-6.9.2.ebuild
rename to dev-qt/qt3d/qt3d-6.9.2-r1.ebuild
index 67844ebdab56..895f0e26acfa 100644
--- a/dev-qt/qt3d/qt3d-6.9.2.ebuild
+++ b/dev-qt/qt3d/qt3d-6.9.2-r1.ebuild
@@ -15,11 +15,10 @@ fi
IUSE="gles2-only qml vulkan"
-# <assimp-6: https://bugreports.qt.io/browse/QTBUG-137996
RDEPEND="
~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
~dev-qt/qtshadertools-${PV}:6
- <media-libs/assimp-6:=
+ media-libs/assimp:=
qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
"
DEPEND="
@@ -27,6 +26,10 @@ DEPEND="
vulkan? ( dev-util/vulkan-headers )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.9.2-assimp6.patch
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package qml Qt6Qml)
diff --git a/dev-qt/qt3d/qt3d-6.9.9999.ebuild b/dev-qt/qt3d/qt3d-6.9.9999.ebuild
index 67844ebdab56..895f0e26acfa 100644
--- a/dev-qt/qt3d/qt3d-6.9.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.9.9999.ebuild
@@ -15,11 +15,10 @@ fi
IUSE="gles2-only qml vulkan"
-# <assimp-6: https://bugreports.qt.io/browse/QTBUG-137996
RDEPEND="
~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
~dev-qt/qtshadertools-${PV}:6
- <media-libs/assimp-6:=
+ media-libs/assimp:=
qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
"
DEPEND="
@@ -27,6 +26,10 @@ DEPEND="
vulkan? ( dev-util/vulkan-headers )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.9.2-assimp6.patch
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package qml Qt6Qml)
diff --git a/dev-qt/qt3d/qt3d-6.9999.ebuild b/dev-qt/qt3d/qt3d-6.9999.ebuild
index e24eb983b7f6..895f0e26acfa 100644
--- a/dev-qt/qt3d/qt3d-6.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.9999.ebuild
@@ -26,6 +26,10 @@ DEPEND="
vulkan? ( dev-util/vulkan-headers )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.9.2-assimp6.patch
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package qml Qt6Qml)
