6.2.0 - beta4

.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

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
+%global unstable 1
-ExcludeArch: s390x
+%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}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+%global  qt_version %(echo %{version} | cut -d~ -f1)
 
+%if 0%{unstable}
+Source0: https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/submodules/%{qt_module}-everywhere-src-%{qt_version}-%{prerelease}.tar.xz
+%else
+Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+%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@redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
 * Thu Aug 12 2021 Jan Grulich <jgrulich@redhat.com> - 6.1.2-1
 - 6.1.2
 

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>
- // =======================================================================
+

sources

@@ -1 +1 @@
-SHA512 (qtquick3d-everywhere-src-6.1.2.tar.xz) = 9881feb858af095b7c4b65db059603c03161bdf80368ca241b70f3dd76fa7b1bfdc45720a5b48b6c3e073df47fb3d8e6ddc3fd400fe8c222c41cced9a0d2caac
+SHA512 (qtquick3d-everywhere-src-6.2.0-beta4.tar.xz) = 47c8e73c38ec2d10d9c55f4e22f31d62ee6850b08d74aff2dc043cfa882452dbf1d6f91ff3b440d665449de2e23a80e565fcda7db8f210082edcddb1f1784303