From 982e714683cc9441c8a9b52e0df66caeddf16795 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 7 Nov 2024 05:54:38 +0000 Subject: [PATCH] qtquick3d: remove patch The fix was merged. Change-Id: I60d89a1bc8eda3c5ada3751969267c6d6e0b5e0c Reviewed-by: Mikko Gronoff --- ...mbree-properly-disable-avx-for-GCC14.patch | 31 ------------------- recipes-qt/qt6/qtquick3d_git.bb | 1 - 2 files changed, 32 deletions(-) delete mode 100644 recipes-qt/qt6/qtquick3d/0002-embree-properly-disable-avx-for-GCC14.patch diff --git a/recipes-qt/qt6/qtquick3d/0002-embree-properly-disable-avx-for-GCC14.patch b/recipes-qt/qt6/qtquick3d/0002-embree-properly-disable-avx-for-GCC14.patch deleted file mode 100644 index 279982c..0000000 --- a/recipes-qt/qt6/qtquick3d/0002-embree-properly-disable-avx-for-GCC14.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ae28850ddb92450e30e1fa6bbace00af0775e907 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Tue, 22 Oct 2024 10:24:11 +0000 -Subject: [PATCH] embree: properly disable avx for GCC14 - -GCC 14 does not keep avx disabled just by undef'ing __AVX__ . -Add pragma option to do this properly. - -Fixes: QTBUG-130381 -Change-Id: Ia2ae6edc50bfb24b83753fff184469c86daa88dc -Upstream-Status: Pending ---- - src/3rdparty/embree/common/sys/platform.h | 4 +++ - 2 files changed, 30 insertions(+) - create mode 100644 src/3rdparty/embree/patches/0004-embree-properly-disable-avx-for-GCC14.patch - -diff --git a/src/3rdparty/embree/common/sys/platform.h b/src/3rdparty/embree/common/sys/platform.h -index 78d8afce5..5e218fa37 100644 ---- a/src/3rdparty/embree/common/sys/platform.h -+++ b/src/3rdparty/embree/common/sys/platform.h -@@ -3,6 +3,10 @@ - - #pragma once - -+#if defined (__AVX__) -+#pragma GCC target("no-sse3") -+#endif -+ - #define _CRT_SECURE_NO_WARNINGS - - #include diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index 0e6abdf..322f96f 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -23,7 +23,6 @@ ASSIMP_BRANCH = "qt6_assimp" SRC_URI += " \ ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ file://0001-Skip-embree-on-mingw.patch \ - file://0002-embree-properly-disable-avx-for-GCC14.patch \ " DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native qtquick3d-native"