gentoo auto-resync : 14:02:2024 - 17:36:28

6 files changed, 88 insertions, 3 deletions

diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index 2dd1da443757..671258a3c2a6 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -1,6 +1,9 @@
+AUX qtquick3d-6.6.2-gcc14.patch 953 BLAKE2B 0119092790be34134af0989a7e4b78d565a741e3a72f0ae76c48106f68fb6867b3395706951e93e86343d3214c5d02b3b21eea175c1460e8c38d44c8f36ec605 SHA512 13352dc71f986888e5017f2e4a6267e1bc10c81c419d607de673212cb7d16132566e11a040c6ebfa5bde9834043eb1b38d6723f890c707af76f6490c1a8b3ffa
 DIST qtquick3d-everywhere-src-6.6.1.tar.xz 59170016 BLAKE2B dc4bf8552a5b6f227778a288fa49c822c42fcf3f53a9a0502c9ee2f97caebaeb5d00bf3c2be67dbdaeac9ddeb9771d3361c7dec39fbaf080074cc64bb051e2ef SHA512 1a663920b3d2010de1b38ed559a2391d31a5c42dfdb0c414723acdf778c1fce2f6f74295bb260201d0a9ac64ff30570599e8d8b97229f6c5f33229a19a1fe763
+DIST qtquick3d-everywhere-src-6.6.2.tar.xz 65602548 BLAKE2B e1ee955a1f66c669d52a73513c7442b70863b6fa738f6e1716dfab1c7dc41f5f09780ec97f7c5fd6c452ed3ea9809ab0d907dbe28f0425d208508f69b61d50ac SHA512 d8b32ec1a5f9233e79612b5d9b56890c04a921edcc6369f4a047f8e58af92f5e6dc936fdde707df4afca81da53f9fb8959f03b00af24077c3dc723f3445e8123
 EBUILD qtquick3d-6.6.1.ebuild 959 BLAKE2B fb313412ee358a1ca765f81ad98715978d8423e42df5ee2962a014f9ffc17ab3ea197b5e0a55b5b81325d8b5f3f52a73278801b8fe3d08856fa1fd00db963f61 SHA512 905c899a8961342b8eaced2006ab5fda3005ad4ba2f6ece97ab9adcb6802b20a99715ba5f6afa3de0c6f896f9877ef41e71571642ba00245717d94f67176f58e
-EBUILD qtquick3d-6.6.9999.ebuild 960 BLAKE2B 6e2067a4d9f6b54c57ea2daa83e621cb10ab1250cf563a812b40486429a76f1af923c16ca6068cb04b84857eb0c47216da305ff3724f468b27d59e7be6f46813 SHA512 8a4c14da7d64e4aa29d1654d6ed6b2d14f889abde1a1c87ed8693ef48d663919db7877bc45213d31ed7ed87b99362d78b1e4f326e639e20d97e85460379af6fc
-EBUILD qtquick3d-6.7.9999.ebuild 960 BLAKE2B 6e2067a4d9f6b54c57ea2daa83e621cb10ab1250cf563a812b40486429a76f1af923c16ca6068cb04b84857eb0c47216da305ff3724f468b27d59e7be6f46813 SHA512 8a4c14da7d64e4aa29d1654d6ed6b2d14f889abde1a1c87ed8693ef48d663919db7877bc45213d31ed7ed87b99362d78b1e4f326e639e20d97e85460379af6fc
-EBUILD qtquick3d-6.9999.ebuild 960 BLAKE2B 6e2067a4d9f6b54c57ea2daa83e621cb10ab1250cf563a812b40486429a76f1af923c16ca6068cb04b84857eb0c47216da305ff3724f468b27d59e7be6f46813 SHA512 8a4c14da7d64e4aa29d1654d6ed6b2d14f889abde1a1c87ed8693ef48d663919db7877bc45213d31ed7ed87b99362d78b1e4f326e639e20d97e85460379af6fc
+EBUILD qtquick3d-6.6.2.ebuild 1012 BLAKE2B 3fdb7d92fcb9ac5aaab82717d6de9060ea512623c1af729591fae464dfef0c0dccd0aa3f85d45af306005708037938bc424de4e698868b2e6ccf48c7403c7152 SHA512 43c44a51591e196cc598d0bc6ac55856fb888618b5ea4e8c201643c3e59efc1fce370bf8788a9056ed62143110d901a329725b04927efb51f141fc206b2aa712
+EBUILD qtquick3d-6.6.9999.ebuild 1012 BLAKE2B 3fdb7d92fcb9ac5aaab82717d6de9060ea512623c1af729591fae464dfef0c0dccd0aa3f85d45af306005708037938bc424de4e698868b2e6ccf48c7403c7152 SHA512 43c44a51591e196cc598d0bc6ac55856fb888618b5ea4e8c201643c3e59efc1fce370bf8788a9056ed62143110d901a329725b04927efb51f141fc206b2aa712
+EBUILD qtquick3d-6.7.9999.ebuild 1012 BLAKE2B 3fdb7d92fcb9ac5aaab82717d6de9060ea512623c1af729591fae464dfef0c0dccd0aa3f85d45af306005708037938bc424de4e698868b2e6ccf48c7403c7152 SHA512 43c44a51591e196cc598d0bc6ac55856fb888618b5ea4e8c201643c3e59efc1fce370bf8788a9056ed62143110d901a329725b04927efb51f141fc206b2aa712
+EBUILD qtquick3d-6.9999.ebuild 1012 BLAKE2B 3fdb7d92fcb9ac5aaab82717d6de9060ea512623c1af729591fae464dfef0c0dccd0aa3f85d45af306005708037938bc424de4e698868b2e6ccf48c7403c7152 SHA512 43c44a51591e196cc598d0bc6ac55856fb888618b5ea4e8c201643c3e59efc1fce370bf8788a9056ed62143110d901a329725b04927efb51f141fc206b2aa712
 MISC metadata.xml 534 BLAKE2B 09cf606ee911d677c4a1fb8879a70bcbb527d23f81d39fb3263aef5ad6222b7b0027069cd50b76232f45322b1da0499f2eed6264ef636f3ff0d04c0a5793ec2b SHA512 66438122b8b1d1ce0b2a98b36925944806d3616ce7f653004d2b1a76ad4dee62759bcb8f342e0aefb730765648ca9ad193f833c3596252df3dbca596a8daff08
diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.6.2-gcc14.patch b/dev-qt/qtquick3d/files/qtquick3d-6.6.2-gcc14.patch
new file mode 100644
index 000000000000..f6362641a00c
--- /dev/null
+++ b/dev-qt/qtquick3d/files/qtquick3d-6.6.2-gcc14.patch
@@ -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
diff --git a/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild
new file mode 100644
index 000000000000..f1ff25e4b555
--- /dev/null
+++ b/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	EGIT_SUBMODULES=() # skip qtquick3d-assimp
+fi
+
+IUSE="opengl vulkan"
+
+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:=
+	sys-libs/zlib:=
+"
+DEPEND="
+	${RDEPEND}
+	test? ( ~dev-qt/qtbase-${PV}:6[network] )
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
+)
+
+CMAKE_SKIP_TESTS=(
+	# collada support is disabled in system media-libs/assimp (bug #891787)
+	tst_qquick3dassetimport
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_FEATURE_system_assimp=ON
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild
index d3388e178e73..f1ff25e4b555 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild
@@ -29,6 +29,10 @@ DEPEND="
 	vulkan? ( dev-util/vulkan-headers )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
+)
+
 CMAKE_SKIP_TESTS=(
 	# collada support is disabled in system media-libs/assimp (bug #891787)
 	tst_qquick3dassetimport
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
index d3388e178e73..f1ff25e4b555 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
@@ -29,6 +29,10 @@ DEPEND="
 	vulkan? ( dev-util/vulkan-headers )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
+)
+
 CMAKE_SKIP_TESTS=(
 	# collada support is disabled in system media-libs/assimp (bug #891787)
 	tst_qquick3dassetimport
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
index d3388e178e73..f1ff25e4b555 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
@@ -29,6 +29,10 @@ DEPEND="
 	vulkan? ( dev-util/vulkan-headers )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
+)
+
 CMAKE_SKIP_TESTS=(
 	# collada support is disabled in system media-libs/assimp (bug #891787)
 	tst_qquick3dassetimport