From ccdb4262fe7f6c7cc3624153c440dd26c43a3a40679295f432c9f0f35aa666ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Wed, 21 Aug 2024 17:13:18 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main libqt5-qtmultimedia revision
 31c2e4d1c2c2a8509fbcc3c331c59ce1

---
 _service                                         |  4 ++--
 _servicedata                                     |  2 +-
 libqt5-qtmultimedia.changes                      | 10 ++++++++++
 libqt5-qtmultimedia.spec                         |  6 +++---
 qtmultimedia-everywhere-src-5.15.11+kde2.obscpio |  3 ---
 qtmultimedia-everywhere-src-5.15.12+kde2.obscpio |  3 +++
 qtmultimedia-everywhere-src.obsinfo              |  6 +++---
 7 files changed, 22 insertions(+), 12 deletions(-)
 delete mode 100644 qtmultimedia-everywhere-src-5.15.11+kde2.obscpio
 create mode 100644 qtmultimedia-everywhere-src-5.15.12+kde2.obscpio

diff --git a/_service b/_service
index b092f23..4b0a63c 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/qtmultimedia.git</param>
    <param name="scm">git</param>
    <param name="filename">qtmultimedia-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 8a638ba..4c6cc3e 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://invent.kde.org/qt/qt/qtmultimedia.git</param>
-              <param name="changesrevision">f587b18db4abd68cb6d4d77fbcec1b94c38d2a51</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">36603a39aa590c12cbe2b192b56b29edd09a7a6b</param></service></servicedata>
\ No newline at end of file
diff --git a/libqt5-qtmultimedia.changes b/libqt5-qtmultimedia.changes
index 7e29cbd..ac2f842 100644
--- a/libqt5-qtmultimedia.changes
+++ b/libqt5-qtmultimedia.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Dec 29 13:29:31 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.12+kde2, rebased upstream:
+  * Fix crash on macos13 with iphone camera
+  * VideoOutput: Always update geometry when video surface format changes
+  * VideoOutput: fix resize of a finished video
+  * Bump version to 5.15.12
+  * Windows: Fix cropping for HEVC-encoded videos
+
 -------------------------------------------------------------------
 Fri Oct  6 06:41:22 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libqt5-qtmultimedia.spec b/libqt5-qtmultimedia.spec
index 2a445c0..6659c40 100644
--- a/libqt5-qtmultimedia.spec
+++ b/libqt5-qtmultimedia.spec
@@ -28,11 +28,11 @@
 %define gles 0
 %endif
 %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 qtmultimedia-everywhere-src-%{version}
 Name:           libqt5-qtmultimedia
-Version:        5.15.11+kde2
+Version:        5.15.12+kde2
 Release:        0
 Summary:        Qt 5 Multimedia Library
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
diff --git a/qtmultimedia-everywhere-src-5.15.11+kde2.obscpio b/qtmultimedia-everywhere-src-5.15.11+kde2.obscpio
deleted file mode 100644
index d98f505..0000000
--- a/qtmultimedia-everywhere-src-5.15.11+kde2.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02e01345f9eaa59d01bb5da67050452552800fb7e12f75f8fbef703e24766ae6
-size 31730189
diff --git a/qtmultimedia-everywhere-src-5.15.12+kde2.obscpio b/qtmultimedia-everywhere-src-5.15.12+kde2.obscpio
new file mode 100644
index 0000000..1d50bf1
--- /dev/null
+++ b/qtmultimedia-everywhere-src-5.15.12+kde2.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a7b473a1321e70c66f9e65baf4b014960443167fc1cd687202a84b9057746c2
+size 31733261
diff --git a/qtmultimedia-everywhere-src.obsinfo b/qtmultimedia-everywhere-src.obsinfo
index 2251fca..d91c00f 100644
--- a/qtmultimedia-everywhere-src.obsinfo
+++ b/qtmultimedia-everywhere-src.obsinfo
@@ -1,4 +1,4 @@
 name: qtmultimedia-everywhere-src
-version: 5.15.11+kde2
-mtime: 1696453127
-commit: f587b18db4abd68cb6d4d77fbcec1b94c38d2a51
+version: 5.15.12+kde2
+mtime: 1703803145
+commit: 36603a39aa590c12cbe2b192b56b29edd09a7a6b