Add dev-qt from an older version of the gentoo repo
Qt5 has been removed, we restore it since we still use it.
This commit is contained in:
23
dev-qt/qtquick3d/files/qtquick3d-6.6.2-gcc14.patch
Normal file
23
dev-qt/qtquick3d/files/qtquick3d-6.6.2-gcc14.patch
Normal file
@ -0,0 +1,23 @@
|
||||
Qt undefs __AVX__ and others[1] to prevent bundled embree from using
|
||||
AVX/SSE4.2 code paths and result in linking errors, but this appears
|
||||
insufficient with gcc14[2].
|
||||
|
||||
Until Qt improves this, for simplicity pass -mno-* to bundled embree
|
||||
as a workaround which lets the compiler disable these instead and
|
||||
that includes other features which depend on these.
|
||||
|
||||
(note that embree is only used on amd64 and aarch64)
|
||||
|
||||
Ideal would be to unbundle this and let system embree use the full
|
||||
feature set, but there is no machinery to easily allow it.
|
||||
|
||||
[1] https://github.com/qt/qtquick3d/commit/7980cfd0
|
||||
[2] https://bugs.gentoo.org/917407
|
||||
--- a/src/3rdparty/embree/CMakeLists.txt
|
||||
+++ b/src/3rdparty/embree/CMakeLists.txt
|
||||
@@ -64,2 +64,5 @@
|
||||
# Use SSE2 only, ignore AVX/SSE4.2 for now
|
||||
+if (TEST_architecture_arch STREQUAL x86_64)
|
||||
+ qt_internal_extend_target(BundledEmbree COMPILE_OPTIONS -mno-avx -mno-sse4.2)
|
||||
+endif()
|
||||
qt_internal_extend_target(BundledEmbree DEFINES
|
||||
12
dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch
Normal file
12
dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch
Normal file
@ -0,0 +1,12 @@
|
||||
https://bugs.gentoo.org/926094
|
||||
https://bugreports.qt.io/browse/QTBUG-122955
|
||||
|
||||
https://bugs.gentoo.org/926093
|
||||
https://github.com/embree/embree/issues/477
|
||||
--- a/src/3rdparty/embree/common/sys/platform.h
|
||||
+++ b/src/3rdparty/embree/common/sys/platform.h
|
||||
@@ -34,3 +34,3 @@
|
||||
/* detect 64 bit platform */
|
||||
-#if defined(__X86_64__) || defined(__aarch64__)
|
||||
+#if (defined(__X86_64__) || defined(__aarch64__)) && ! defined(__ILP32__)
|
||||
#define __64BIT__
|
||||
15
dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
Normal file
15
dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
Normal file
@ -0,0 +1,15 @@
|
||||
Seems that the '5' enforces the major version and it refuses to find
|
||||
system's assimp-6.0.2 (which is perfectly usable given Qt 6.9.2 bundles
|
||||
that version without it).
|
||||
|
||||
We don't package older ones, so drop the check as a quick workaround.
|
||||
|
||||
https://bugreports.qt.io/browse/QTBUG-137996
|
||||
--- 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)
|
||||
Reference in New Issue
Block a user