From 35a63e0db89c678a6ba576a81f23f5013b797ca4cc0eeea12a03d4e5b109e601 Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe+obs@krop.fr>
Date: Tue, 2 Jan 2024 09:53:15 +0000
Subject: [PATCH] Accepting request 1135706 from home:Vogtinator:qt5.15

Qt 5.15.12 (+ some .16), untested

OBS-URL: https://build.opensuse.org/request/show/1135706
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qt3d?expand=0&rev=29
---
 _service                                 |  4 ++--
 _servicedata                             |  2 +-
 libqt5-qt3d.changes                      | 15 +++++++++++++++
 libqt5-qt3d.spec                         |  6 +++---
 qt3d-everywhere-src-5.15.11+kde0.obscpio |  3 ---
 qt3d-everywhere-src-5.15.12+kde0.obscpio |  3 +++
 qt3d-everywhere-src.obsinfo              |  6 +++---
 7 files changed, 27 insertions(+), 12 deletions(-)
 delete mode 100644 qt3d-everywhere-src-5.15.11+kde0.obscpio
 create mode 100644 qt3d-everywhere-src-5.15.12+kde0.obscpio

diff --git a/_service b/_service
index e60da77..3b614cc 100644
--- a/_service
+++ b/_service
@@ -1,12 +1,12 @@
 <services>
   <service name="obs_scm" mode="disabled">
    <param name="changesgenerate">enable</param>
-   <param name="versionformat">5.15.11+kde@TAG_OFFSET@</param>
+   <param name="versionformat">5.15.12+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.11-lts-lgpl</param>
+   <param name="parent-tag">v5.15.12-lts-lgpl</param>
    <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="disabled"/>
diff --git a/_servicedata b/_servicedata
index 658004b..094efc0 100644
--- a/_servicedata
+++ b/_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">c1f8fa2578d99e07f5e581f26bd532695b9534f9</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">e1b1a0d2970fd384bd52c734a72536d8452ad070</param></service></servicedata>
\ No newline at end of file
diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes
index a936d77..cef01b4 100644
--- a/libqt5-qt3d.changes
+++ b/libqt5-qt3d.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Dec 29 13:11:59 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.12+kde0, rebased upstream:
+  * Blacklist 1 tests in tst_RayCasting on ubuntu-20.04
+  * OpenGL SubmissionContext: reset defaultFBO every time we begin drawing
+  * Unpin previously used image units during render command parameter setup
+  * Scene3DItem: increase number of frames needed to flush pipeline
+  * ShaderParameterPack: check we only store a single UBO/SSBO per BlockBinding
+  * OpenGL graphics helpers fixes
+  * Quick3DNodeInstantiator: fix crash when using async
+  * GLTFGeometryLoader: prevent early return on option bufferview target property
+  * Scene3DRenderer: reset OpenGL state when skipping frames
+  * Bump version to 5.15.12
+
 -------------------------------------------------------------------
 Fri Oct  6 06:35:32 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec
index 5c969c0..6f3b19e 100644
--- a/libqt5-qt3d.spec
+++ b/libqt5-qt3d.spec
@@ -21,12 +21,12 @@
 %define qt5_snapshot 1
 %define libname libQt53DCore5
 %define base_name libqt5
-%define real_version 5.15.11
-%define so_version 5.15.11
+%define real_version 5.15.12
+%define so_version 5.15.12
 %define tar_version qt3d-everywhere-src-%{version}
 %global enable_assimp (0%{?suse_version} >= 1550)
 Name:           libqt5-qt3d
-Version:        5.15.11+kde0
+Version:        5.15.12+kde0
 Release:        0
 Summary:        Qt 5 3D Addon
 # Legal: some files are GPL-3.0-only WITH Qt-GPL-exception-1.0
diff --git a/qt3d-everywhere-src-5.15.11+kde0.obscpio b/qt3d-everywhere-src-5.15.11+kde0.obscpio
deleted file mode 100644
index 2c39b8d..0000000
--- a/qt3d-everywhere-src-5.15.11+kde0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2ea337868d1a7414e1307cc3012bd52995b95bb482072cd6f5aeb2e40d46e29a
-size 239267342
diff --git a/qt3d-everywhere-src-5.15.12+kde0.obscpio b/qt3d-everywhere-src-5.15.12+kde0.obscpio
new file mode 100644
index 0000000..ba65ad9
--- /dev/null
+++ b/qt3d-everywhere-src-5.15.12+kde0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2571cc0a44d0196371f86c3f85f4fad908f7c9877da8fe827de8d45fe018fc5
+size 239275022
diff --git a/qt3d-everywhere-src.obsinfo b/qt3d-everywhere-src.obsinfo
index 2b2049d..8a0d4ab 100644
--- a/qt3d-everywhere-src.obsinfo
+++ b/qt3d-everywhere-src.obsinfo
@@ -1,4 +1,4 @@
 name: qt3d-everywhere-src
-version: 5.15.11+kde0
-mtime: 1686319710
-commit: c1f8fa2578d99e07f5e581f26bd532695b9534f9
+version: 5.15.12+kde0
+mtime: 1697029282
+commit: e1b1a0d2970fd384bd52c734a72536d8452ad070