commit 3350afa022f361a308527c603dd19ba6d860cc3b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jun 22 12:49:30 2021 +0100
Fix startup crash on Wayland (rfbz#5945)
185b30362f1f2a3cf340e6fbcd92cd41157e2c9d.patch | 29 ++++++++++++++++++++++++++
kdenlive.spec | 7 ++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/185b30362f1f2a3cf340e6fbcd92cd41157e2c9d.patch
b/185b30362f1f2a3cf340e6fbcd92cd41157e2c9d.patch
new file mode 100644
index 0000000..7ec18a0
--- /dev/null
+++ b/185b30362f1f2a3cf340e6fbcd92cd41157e2c9d.patch
@@ -0,0 +1,29 @@
+From 185b30362f1f2a3cf340e6fbcd92cd41157e2c9d Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Mardelle <jb(a)kdenlive.org>
+Date: Fri, 18 Jun 2021 16:41:55 +0200
+Subject: [PATCH] Fix startup crash on Wayland, thanks to
+ login.kde(a)unrelenting.technology BUG: 431505
+
+---
+ src/monitor/glwidget.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/monitor/glwidget.cpp b/src/monitor/glwidget.cpp
+index 07ef157ab..ddc889088 100644
+--- a/src/monitor/glwidget.cpp
++++ b/src/monitor/glwidget.cpp
+@@ -122,7 +122,10 @@ GLWidget::GLWidget(int id, QObject *parent)
+ setPersistentSceneGraph(true);
+ setClearBeforeRendering(false);
+ setResizeMode(QQuickView::SizeRootObjectToView);
+- m_offscreenSurface.setFormat(QOpenGLContext::globalShareContext()->format());
++ auto fmt = QOpenGLContext::globalShareContext()->format();
++ fmt.setDepthBufferSize(format().depthBufferSize());
++ fmt.setStencilBufferSize(format().stencilBufferSize());
++ m_offscreenSurface.setFormat(fmt);
+ m_offscreenSurface.create();
+
+ m_refreshTimer.setSingleShot(true);
+--
+GitLab
+
diff --git a/kdenlive.spec b/kdenlive.spec
index 9e9b962..41d552c 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -4,7 +4,7 @@
Name: kdenlive
Summary: Non-linear video editor
Version: 21.04.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL:
http://www.kdenlive.org
@@ -17,6 +17,8 @@ URL:
http://www.kdenlive.org
Source0:
https://download.kde.org/%{stable}/release-service/%{version}/src/kdenliv...
Source100: kdenlive-find-lang.sh
#Patch0: mlt.patch
+# Fix startup crash on Wayland (rfbz#5945)
+Patch1:
https://invent.kde.org/multimedia/kdenlive/commit/185b30362f1f2a3cf340e6f...
# Add support for finding html files with find-lang.sh --with-html on epel
#
https://github.com/rpm-software-management/rpm/commit/0c42871ff407a3eeb1e...
@@ -163,6 +165,9 @@ fi
%changelog
+* Tue Jun 22 2021 Leigh Scott <leigh123linux(a)gmail.com> - 21.04.2-2
+- Fix startup crash on Wayland (rfbz#5945)
+
* Thu Jun 10 2021 Sérgio Basto <sergio(a)serjux.com> - 21.04.2-1
- Update kdenlive to 21.04.2