The package rpms/qt6-qtquick3d.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qt6-qtquick3d.git/commit/?id=351c....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 91212938c9597573b06bfe21b0af8f7c14cfe540
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Thu Sep 30 13:38:45 2021 +0200
6.2.0
diff --git a/.gitignore b/.gitignore
index fc91a46..91eadd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/qtquick3d-everywhere-src-6.2.0-beta4.tar.xz
/qtquick3d-everywhere-src-6.2.0-rc.tar.xz
/qtquick3d-everywhere-src-6.2.0-rc2.tar.xz
+/qtquick3d-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qtquick3d.spec b/qt6-qtquick3d.spec
index c6029dc..91d7d9f 100644
--- a/qt6-qtquick3d.spec
+++ b/qt6-qtquick3d.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qtquick3d
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
%global prerelease rc2
%endif
@@ -21,7 +21,7 @@ Url:
http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2)
%global qt_version %(echo %{version} | cut -d~ -f1)
-%if 0%{unstable}
+%if 0%{?unstable}
Source0:
https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/su...
%else
Source0:
https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodul...
@@ -200,6 +200,9 @@ popd
%endif
%changelog
+* Thu Sep 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0-1
+- 6.2.0
+
* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
- 6.2.0 - rc2
diff --git a/sources b/sources
index 54a5600..2ec38ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtquick3d-everywhere-src-6.2.0-rc2.tar.xz) =
1b34a040db2ff71f06900bd06be0678b407055f4f865f3749c9f82a975df016bdc697a6361cfd5c31060c44c97e086766b16e3b2d52014563b18f16b064797d7
+SHA512 (qtquick3d-everywhere-src-6.2.0.tar.xz) =
d1338e13920ca29292d3d68e8e155b0da5581ebfc03d479eeef3c641387ba0ea63bb0dc99ed8db534c8bc5fb11628391cb5d430cfaeb1d2627800388bf47e97d
commit 34bc06e0dc1b3b4056d82c8cf61c4274f54046e2
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 27 14:14:34 2021 +0200
6.2.0 - rc2
diff --git a/.gitignore b/.gitignore
index ed09190..fc91a46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/qtquick3d-everywhere-src-6.1.2.tar.xz
/qtquick3d-everywhere-src-6.2.0-beta4.tar.xz
/qtquick3d-everywhere-src-6.2.0-rc.tar.xz
+/qtquick3d-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qtquick3d.spec b/qt6-qtquick3d.spec
index d555037..c6029dc 100644
--- a/qt6-qtquick3d.spec
+++ b/qt6-qtquick3d.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Summary: Qt6 - Quick3D Libraries and utilities
@@ -200,6 +200,9 @@ popd
%endif
%changelog
+* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
- 6.2.0 - rc
diff --git a/sources b/sources
index 39a8934..54a5600 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtquick3d-everywhere-src-6.2.0-rc.tar.xz) =
3d7b4109135951d0e48ff6c0642acb7732ad4c090a7c8526544e786a53cfd6c9b4263893339640814d7c20b984c79582fea821764124804699545572a20b97c1
+SHA512 (qtquick3d-everywhere-src-6.2.0-rc2.tar.xz) =
1b34a040db2ff71f06900bd06be0678b407055f4f865f3749c9f82a975df016bdc697a6361cfd5c31060c44c97e086766b16e3b2d52014563b18f16b064797d7
commit 63b984e7fd9fdca5e321ec0a2fd542e5066607c9
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Sun Sep 19 13:28:05 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
index 4f4bc20..ed09190 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/qtquick3d-everywhere-src-6.1.1.tar.xz
/qtquick3d-everywhere-src-6.1.2.tar.xz
/qtquick3d-everywhere-src-6.2.0-beta4.tar.xz
+/qtquick3d-everywhere-src-6.2.0-rc.tar.xz
diff --git a/qt6-qtquick3d.spec b/qt6-qtquick3d.spec
index f078eaf..d555037 100644
--- a/qt6-qtquick3d.spec
+++ b/qt6-qtquick3d.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease beta4
+%global prerelease rc
%endif
Summary: Qt6 - Quick3D Libraries and utilities
@@ -200,6 +200,9 @@ popd
%endif
%changelog
+* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
+
* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
- 6.2.0 - beta4
diff --git a/sources b/sources
index 0d05ece..39a8934 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtquick3d-everywhere-src-6.2.0-beta4.tar.xz) =
47c8e73c38ec2d10d9c55f4e22f31d62ee6850b08d74aff2dc043cfa882452dbf1d6f91ff3b440d665449de2e23a80e565fcda7db8f210082edcddb1f1784303
+SHA512 (qtquick3d-everywhere-src-6.2.0-rc.tar.xz) =
3d7b4109135951d0e48ff6c0642acb7732ad4c090a7c8526544e786a53cfd6c9b4263893339640814d7c20b984c79582fea821764124804699545572a20b97c1
commit 351c8d8d921ace00dcf9e35683c112cf248605ce
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Tue Sep 14 09:24:09 2021 +0200
6.2.0 - beta4
diff --git a/.gitignore b/.gitignore
index 4839422..4f4bc20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/qtquick3d-everywhere-src-6.1.0.tar.xz
/qtquick3d-everywhere-src-6.1.1.tar.xz
/qtquick3d-everywhere-src-6.1.2.tar.xz
+/qtquick3d-everywhere-src-6.2.0-beta4.tar.xz
diff --git a/qt6-qtquick3d.spec b/qt6-qtquick3d.spec
index 06d6a69..f078eaf 100644
--- a/qt6-qtquick3d.spec
+++ b/qt6-qtquick3d.spec
@@ -1,11 +1,17 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG:
https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
%global qt_module qtquick3d
-# FIXME: there is a build failure on s390x
-ExcludeArch: s390x
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta4
+%endif
Summary: Qt6 - Quick3D Libraries and utilities
Name: qt6-%{qt_module}
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
@@ -13,8 +19,13 @@ Release: 1%{?dist}
License: GPLv3 with exceptions
Url:
http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2)
-Source0:
https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodul...
+%global qt_version %(echo %{version} | cut -d~ -f1)
+%if 0%{unstable}
+Source0:
https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/su...
+%else
+Source0:
https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodul...
+%endif
Patch0: qtquick3d-fix-build-with-gcc11.patch
BuildRequires: cmake
@@ -50,7 +61,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%endif
%prep
-%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
%build
@@ -77,7 +88,7 @@ mkdir %{buildroot}%{_bindir}
pushd %{buildroot}%{_qt6_bindir}
for i in * ; do
case "${i}" in
- balsam|meshdebug|shadergen)
+ balsam|meshdebug|shadergen|balsamui|instancer)
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6
;;
*)
@@ -110,6 +121,9 @@ popd
%{_qt6_libdir}/libQt6Quick3DUtils.so.6*
%{_qt6_libdir}/libQt6Quick3DIblBaker.so.6*
%{_qt6_libdir}/libQt6Quick3DParticles.so.6*
+%{_qt6_libdir}/libQt6Quick3DAssetUtils.so.6*
+%{_qt6_libdir}/libQt6Quick3DEffects.so.6*
+%{_qt6_libdir}/libQt6Quick3DHelpers.so.6*
%dir %{_qt6_qmldir}/QtQuick3D/
%{_qt6_qmldir}/QtQuick3D/
%{_qt6_plugindir}/assetimporters/*.so
@@ -118,9 +132,13 @@ popd
%{_bindir}/balsam-qt6
%{_bindir}/meshdebug-qt6
%{_bindir}/shadergen-qt6
+%{_bindir}/balsamui-qt6
+%{_bindir}/instancer-qt6
%{_qt6_bindir}/balsam
%{_qt6_bindir}/meshdebug
%{_qt6_bindir}/shadergen
+%{_qt6_bindir}/balsamui
+%{_qt6_bindir}/instancer
%{_qt6_archdatadir}/mkspecs/modules/*.pri
%{_qt6_datadir}/modules/*.json
%{_qt6_includedir}/QtQuick3D/
@@ -129,12 +147,14 @@ popd
%{_qt6_includedir}/QtQuick3DParticles
%{_qt6_includedir}/QtQuick3DRuntimeRender/
%{_qt6_includedir}/QtQuick3DUtils/
+%{_qt6_includedir}/QtQuick3DAssetUtils/
+%{_qt6_includedir}/QtQuick3DHelpers/
%dir %{_qt6_libdir}/cmake/Qt6Quick3DIblBaker
%{_qt6_libdir}/cmake/Qt6Quick3DIblBaker/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6Quick3DParticles
%{_qt6_libdir}/cmake/Qt6Quick3DParticles/*.cmake
%{_qt6_libdir}/cmake/Qt6/FindWrapQuick3DAssimp.cmake
-%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtQuick3DTestsConfig.cmake
+%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6Quick3D/
%{_qt6_libdir}/cmake/Qt6Quick3D/*.cmake
@@ -146,6 +166,12 @@ popd
%{_qt6_libdir}/cmake/Qt6Quick3DTools/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6Quick3DUtils/
%{_qt6_libdir}/cmake/Qt6Quick3DUtils/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6Quick3DAssetUtils/
+%{_qt6_libdir}/cmake/Qt6Quick3DAssetUtils/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6Quick3DEffects/
+%{_qt6_libdir}/cmake/Qt6Quick3DEffects/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6Quick3DHelpers/
+%{_qt6_libdir}/cmake/Qt6Quick3DHelpers/*.cmake
%{_qt6_libdir}/libQt6Quick3D.prl
%{_qt6_libdir}/libQt6Quick3D.so
%{_qt6_libdir}/libQt6Quick3DAssetImport.prl
@@ -158,6 +184,12 @@ popd
%{_qt6_libdir}/libQt6Quick3DIblBaker.so
%{_qt6_libdir}/libQt6Quick3DParticles.prl
%{_qt6_libdir}/libQt6Quick3DParticles.so
+%{_qt6_libdir}/libQt6Quick3DAssetUtils.prl
+%{_qt6_libdir}/libQt6Quick3DAssetUtils.so
+%{_qt6_libdir}/libQt6Quick3DEffects.prl
+%{_qt6_libdir}/libQt6Quick3DEffects.so
+%{_qt6_libdir}/libQt6Quick3DHelpers.prl
+%{_qt6_libdir}/libQt6Quick3DHelpers.so
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%ifnarch s390x
@@ -168,6 +200,9 @@ popd
%endif
%changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
* Thu Aug 12 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.1.2-1
- 6.1.2
diff --git a/qtquick3d-fix-build-with-gcc11.patch b/qtquick3d-fix-build-with-gcc11.patch
index edccf8a..f389f77 100644
--- a/qtquick3d-fix-build-with-gcc11.patch
+++ b/qtquick3d-fix-build-with-gcc11.patch
@@ -1,5 +1,5 @@
diff --git a/src/3rdparty/assimp/src/code/Common/Importer.cpp
b/src/3rdparty/assimp/src/code/Common/Importer.cpp
-index 38eb63f..7fed1ae 100644
+index a2ad041..6f2438f 100644
--- a/src/3rdparty/assimp/src/code/Common/Importer.cpp
+++ b/src/3rdparty/assimp/src/code/Common/Importer.cpp
@@ -46,6 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -7,18 +7,18 @@ index 38eb63f..7fed1ae 100644
#include <assimp/config.h>
#include <assimp/importerdesc.h>
+#include <exception>
-
+
//
------------------------------------------------------------------------------------------------
/* Uncomment this line to prevent Assimp from catching unknown exceptions.
diff --git a/src/3rdparty/assimp/src/include/assimp/Importer.hpp
b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
-index 9078fbf..45fc455 100644
+index 09b5b68..89eb071 100644
--- a/src/3rdparty/assimp/src/include/assimp/Importer.hpp
+++ b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
@@ -58,6 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
// Public ASSIMP data structures
#include <assimp/types.h>
+#include <exception>
-
- namespace Assimp {
- // =======================================================================
+
+ #include <exception>
+
diff --git a/sources b/sources
index 29ffe28..0d05ece 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtquick3d-everywhere-src-6.1.2.tar.xz) =
9881feb858af095b7c4b65db059603c03161bdf80368ca241b70f3dd76fa7b1bfdc45720a5b48b6c3e073df47fb3d8e6ddc3fd400fe8c222c41cced9a0d2caac
+SHA512 (qtquick3d-everywhere-src-6.2.0-beta4.tar.xz) =
47c8e73c38ec2d10d9c55f4e22f31d62ee6850b08d74aff2dc043cfa882452dbf1d6f91ff3b440d665449de2e23a80e565fcda7db8f210082edcddb1f1784303