Sync from SUSE:SLFO:Main libqt5-qt3d revision 8aec964ffaa5671abb6d9a09c9d3f907

_service

@@ -1,12 +1,12 @@
 <services>
   <service name="obs_scm" mode="disabled">
    <param name="changesgenerate">enable</param>
-   <param name="versionformat">5.15.12+kde@TAG_OFFSET@</param>
+   <param name="versionformat">5.15.14+kde@TAG_OFFSET@</param>
    <param name="url">https://invent.kde.org/qt/qt/qt3d.git</param>
    <param name="scm">git</param>
    <param name="filename">qt3d-everywhere-src</param>
    <param name="revision">kde/5.15</param>
-   <param name="parent-tag">v5.15.12-lts-lgpl</param>
+   <param name="parent-tag">v5.15.14-lts-lgpl</param>
    <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="disabled"/>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://invent.kde.org/qt/qt/qt3d.git</param>
-              <param name="changesrevision">e1b1a0d2970fd384bd52c734a72536d8452ad070</param></service></servicedata>
+              <param name="changesrevision">9bf4d03e2515f7c454647d54542330b6e90f8191</param></service></servicedata>

libqt5-qt3d.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Jul 22 12:07:08 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Use system assimp unconditionally (boo#1228204)
+
+-------------------------------------------------------------------
+Wed May 29 06:24:45 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.14+kde0, rebased upstream:
+  * Blacklist tst_GraphicsHelperGL4::bindFrameBufferAttachment for SLES-15.4
+  * Blacklist tst_dynamicnodecreation::createEntityAndDynamicChild for sles 15.4
+  * Blacklist tst_GraphicsHelperGL4::bindFrameBufferAttachment for SLES-15
+  * Bump version to 5.15.14
+
+-------------------------------------------------------------------
+Tue Mar 19 09:55:18 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.13+kde0, rebased upstream:
+  * QText2DEntity: fix QTextureAtlas parenting that could lead to crashes
+  * QPaintedTextureImage: fill image with transparency by default
+  * Bump version to 5.15.13
+  * Handle nullptr returned from the shader manager
+
 -------------------------------------------------------------------
 Fri Dec 29 13:11:59 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
 

libqt5-qt3d.spec

@@ -21,12 +21,11 @@
 %define qt5_snapshot 1
 %define libname libQt53DCore5
 %define base_name libqt5
-%define real_version 5.15.12
+%define real_version 5.15.14
-%define so_version 5.15.12
+%define so_version 5.15.14
 %define tar_version qt3d-everywhere-src-%{version}
-%global enable_assimp (0%{?suse_version} >= 1550)
 Name:           libqt5-qt3d
-Version:        5.15.12+kde0
+Version:        5.15.14+kde0
 Release:        0
 Summary:        Qt 5 3D Addon
 # Legal: some files are GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -48,9 +47,7 @@ BuildRequires:  perl
 %endif
 BuildRequires:  pkgconfig
 BuildRequires:  xz
-%if %{enable_assimp}
 BuildRequires:  pkgconfig(assimp) > 3.3.1
-%endif
 BuildRequires:  pkgconfig(zlib)
 
 %description
@@ -62,6 +59,8 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica
 %prep
 %autosetup -p1 -n %{tar_version}
 
+rm -r src/3rdparty/assimp/{src,unzip}
+
 %package -n %{libname}
 Summary:        Qt 5 3D Addon
 Group:          System/Libraries
@@ -401,11 +400,7 @@ the exact Qt version.
 mkdir .git
 %endif
 %qmake5 -- \
-%if %{enable_assimp}
+  -system-assimp
-	-system-assimp \
-%else
-	-no-assimp \
-%endif
 
 %make_jobs
 
@@ -415,7 +410,6 @@ mkdir .git
 # kill .la files
 rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
 
-%if %{enable_assimp}
 # put all the binaries to %%_bindir and symlink them back to %%_qt5_bindir
 mkdir -p %{buildroot}%{_bindir}
 pushd %{buildroot}%{_libqt5_bindir}
@@ -424,7 +418,6 @@ for i in * ; do
       ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}
 done
 popd
-%endif
 
 %fdupes %{buildroot}
 
@@ -455,9 +448,7 @@ popd
 %dir %{_libqt5_libdir}/qt5/plugins/sceneparsers
 %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so
 %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneexport.so
-%if %{enable_assimp}
 %{_libqt5_libdir}/qt5/plugins/sceneparsers/libassimpsceneimport.so
-%endif
 %dir %{_libqt5_libdir}/qt5/plugins/geometryloaders
 %{_libqt5_libdir}/qt5/plugins/geometryloaders/libdefaultgeometryloader.so
 %{_libqt5_libdir}/qt5/plugins/geometryloaders/libgltfgeometryloader.so
@@ -504,11 +495,9 @@ popd
 %files tools
 %defattr(-,root,root,755)
 %license LICENSE.*
-%if %{enable_assimp}
 %{_bindir}/qgltf
 %{_bindir}/qgltf-qt5
 %{_libqt5_bindir}/qgltf
-%endif
 
 %files examples
 %defattr(-,root,root,755)

qt3d-everywhere-src.obsinfo

@@ -1,4 +1,4 @@
 name: qt3d-everywhere-src
-version: 5.15.12+kde0
+version: 5.15.14+kde0
-mtime: 1697029282
+mtime: 1715145273
-commit: e1b1a0d2970fd384bd52c734a72536d8452ad070
+commit: 9bf4d03e2515f7c454647d54542330b6e90f8191