From 01b07e6216142dc1f5bf23f3f5bb55c40bfa1719 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Wed, 20 Apr 2022 15:35:37 +0200
Subject: [PATCH] 6.3.0

---
 .gitignore         |  1 +
 qt6-qtquick3d.spec | 37 +++++++++++++++++++++++++++++++++----
 sources            |  2 +-
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb599e5..3c67065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /qtquick3d-everywhere-src-6.2.1.tar.xz
 /qtquick3d-everywhere-src-6.2.2.tar.xz
 /qtquick3d-everywhere-src-6.2.3.tar.xz
+/qtquick3d-everywhere-src-6.3.0.tar.xz
diff --git a/qt6-qtquick3d.spec b/qt6-qtquick3d.spec
index 2b6128c..bffe684 100644
--- a/qt6-qtquick3d.spec
+++ b/qt6-qtquick3d.spec
@@ -6,10 +6,12 @@
 %global prerelease rc2
 %endif
 
+#global examples 1
+
 Summary: Qt6 - Quick3D Libraries and utilities
 Name:    qt6-%{qt_module}
-Version: 6.2.3
-Release: 2%{?dist}
+Version: 6.3.0
+Release: 1%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://doc.qt.io/qt-5/licensing.html
@@ -33,6 +35,8 @@ BuildRequires: qt6-qtbase-static >= %{version}
 BuildRequires: qt6-qtbase-private-devel
 %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
 BuildRequires: qt6-qtdeclarative-devel
+BuildRequires: qt6-qtdeclarative-static
+BuildRequires: qt6-qtquicktimeline-devel
 BuildRequires: qt6-qtshadertools-devel
 #if 0{?fedora}
 # BuildRequires: pkgconfig(assimp) >= 5.0.0
@@ -50,12 +54,14 @@ Requires: qt6-qtdeclarative-devel%{?_isa}
 %{summary}.
 
 %ifnarch s390x
+%if 0%{?examples}
 %package examples
 Summary: Programming examples for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %{summary}.
 %endif
+%endif
 
 %prep
 %autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
@@ -71,6 +77,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %cmake_qt6 \
 %ifarch s390x
   -DQT_BUILD_EXAMPLES=OFF
+%else
+  -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
 %endif
 #   -DQT_FEATURE_system_assimp=ON
 
@@ -85,7 +93,7 @@ mkdir %{buildroot}%{_bindir}
 pushd %{buildroot}%{_qt6_bindir}
 for i in * ; do
   case "${i}" in
-    balsam|meshdebug|shadergen|balsamui|instancer)
+    balsam|meshdebug|shadergen|balsamui|instancer|materialeditor|shapegen)
       ln -v  ${i} %{buildroot}%{_bindir}/${i}-qt6
       ;;
     *)
@@ -121,6 +129,8 @@ popd
 %{_qt6_libdir}/libQt6Quick3DAssetUtils.so.6*
 %{_qt6_libdir}/libQt6Quick3DEffects.so.6*
 %{_qt6_libdir}/libQt6Quick3DHelpers.so.6*
+%{_qt6_libdir}/libQt6Quick3DParticleEffects.so.6*
+%{_qt6_libdir}/libQt6Quick3DGlslParser.so.6*
 %dir %{_qt6_qmldir}/QtQuick3D/
 %{_qt6_qmldir}/QtQuick3D/
 %{_qt6_plugindir}/assetimporters/*.so
@@ -131,11 +141,15 @@ popd
 %{_bindir}/shadergen-qt6
 %{_bindir}/balsamui-qt6
 %{_bindir}/instancer-qt6
+%{_bindir}/materialeditor-qt6
+%{_bindir}/shapegen-qt6
 %{_qt6_bindir}/balsam
 %{_qt6_bindir}/meshdebug
 %{_qt6_bindir}/shadergen
 %{_qt6_bindir}/balsamui
 %{_qt6_bindir}/instancer
+%{_qt6_bindir}/materialeditor
+%{_qt6_bindir}/shapegen
 %{_qt6_archdatadir}/mkspecs/modules/*.pri
 %{_qt6_datadir}/modules/*.json
 %{_qt6_includedir}/QtQuick3D/
@@ -146,12 +160,14 @@ popd
 %{_qt6_includedir}/QtQuick3DUtils/
 %{_qt6_includedir}/QtQuick3DAssetUtils/
 %{_qt6_includedir}/QtQuick3DHelpers/
+%{_qt6_includedir}/QtQuick3DGlslParser/
 %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/*.cmake
+%{_qt6_libdir}/cmake/Qt6Qml/*.cmake
 %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
 %dir %{_qt6_libdir}/cmake/Qt6Quick3D/
 %{_qt6_libdir}/cmake/Qt6Quick3D/*.cmake
@@ -169,6 +185,10 @@ popd
 %{_qt6_libdir}/cmake/Qt6Quick3DEffects/*.cmake
 %dir %{_qt6_libdir}/cmake/Qt6Quick3DHelpers/
 %{_qt6_libdir}/cmake/Qt6Quick3DHelpers/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6Quick3DGlslParserPrivate
+%{_qt6_libdir}/cmake/Qt6Quick3DGlslParserPrivate/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6Quick3DParticleEffects
+%{_qt6_libdir}/cmake/Qt6Quick3DParticleEffects/*.cmake
 %{_qt6_libdir}/libQt6Quick3D.prl
 %{_qt6_libdir}/libQt6Quick3D.so
 %{_qt6_libdir}/libQt6Quick3DAssetImport.prl
@@ -187,16 +207,25 @@ popd
 %{_qt6_libdir}/libQt6Quick3DEffects.so
 %{_qt6_libdir}/libQt6Quick3DHelpers.prl
 %{_qt6_libdir}/libQt6Quick3DHelpers.so
+%{_qt6_libdir}/libQt6Quick3DGlslParser.prl
+%{_qt6_libdir}/libQt6Quick3DGlslParser.so
+%{_qt6_libdir}/libQt6Quick3DParticleEffects.prl
+%{_qt6_libdir}/libQt6Quick3DParticleEffects.so
 %{_qt6_libdir}/metatypes/qt6*_metatypes.json
+%{_qt6_plugindir}/qmltooling/libqmldbg_quick3dprofiler.so
+
 
 %ifnarch s390x
-%if 0%{?_qt6_examplesdir:1}
+%if 0%{?examples}
 %files examples
 %{_qt6_examplesdir}/
 %endif
 %endif
 
 %changelog
+* Wed Apr 13 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.0-1
+- 6.3.0
+
 * Fri Feb 25 2022 Jan Grulich <jgrulich@redhat.com> - 6.2.3-2
 - Enable s390x builds
 
diff --git a/sources b/sources
index 0d966e5..55febae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtquick3d-everywhere-src-6.2.3.tar.xz) = abfe167091e5e04f336cb54a4cd4ddb1d4091133decbdb37efb60eaadac34e751e577773e878a2a1bfbe3595b35a6cacdd0197efee1a4241d5feb110fecafb7a
+SHA512 (qtquick3d-everywhere-src-6.3.0.tar.xz) = 7579243bceeeaf5f599866faffccf00d6baaa7c4c0467f5f0b514c16f0d9a74fea83182c3566a8773596382753ac2345d9cfbcf7c7f2632801e6825d26f8ebbe