[kdenlive] Fix startup crash on Wayland (rfbz#5945)
by Leigh Scott
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
2 years, 11 months
[vlc/el7: 3/3] Merge branch 'master' into el7
by Leigh Scott
commit 7cf6151bcf3734de22a6f65aa8647ca4644ec77e
Merge: ea87b08 2c67a4a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jun 20 09:22:48 2021 +0100
Merge branch 'master' into el7
sources | 2 +-
vlc.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
2 years, 11 months
[vlc/el7] (3 commits) ...Merge branch 'master' into el7
by Leigh Scott
Summary of changes:
639363a... Update to 3.0.16 (*)
2c67a4a... Make aarch64 check failure non-fatal (*)
7cf6151... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
2 years, 11 months
[vlc/el8: 3/3] Merge branch 'master' into el8
by Leigh Scott
commit d4875fefc60e3b843997a3248df164184393777c
Merge: 5a0504a 2c67a4a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jun 20 09:22:08 2021 +0100
Merge branch 'master' into el8
sources | 2 +-
vlc.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
2 years, 11 months
[vlc/el8] (3 commits) ...Merge branch 'master' into el8
by Leigh Scott
Summary of changes:
639363a... Update to 3.0.16 (*)
2c67a4a... Make aarch64 check failure non-fatal (*)
d4875fe... Merge branch 'master' into el8
(*) This commit already existed in another branch; no separate mail sent
2 years, 11 months
[vlc/f33: 3/3] Merge branch 'master' into f33
by Leigh Scott
commit 3da248342e38a843026e1d5dc45d0bd5bd58ce6f
Merge: 9fa2ae5 2c67a4a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jun 20 09:21:36 2021 +0100
Merge branch 'master' into f33
sources | 2 +-
vlc.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
2 years, 11 months
[vlc/f33] (3 commits) ...Merge branch 'master' into f33
by Leigh Scott
Summary of changes:
639363a... Update to 3.0.16 (*)
2c67a4a... Make aarch64 check failure non-fatal (*)
3da2483... Merge branch 'master' into f33
(*) This commit already existed in another branch; no separate mail sent
2 years, 11 months
[vlc/f34: 3/3] Merge branch 'master' into f34
by Leigh Scott
commit e292d396912ff40f41df684b084e6046fe83f8d1
Merge: ba10b96 2c67a4a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jun 20 09:20:49 2021 +0100
Merge branch 'master' into f34
sources | 2 +-
vlc.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
2 years, 11 months
[vlc/f34] (3 commits) ...Merge branch 'master' into f34
by Leigh Scott
Summary of changes:
639363a... Update to 3.0.16 (*)
2c67a4a... Make aarch64 check failure non-fatal (*)
e292d39... Merge branch 'master' into f34
(*) This commit already existed in another branch; no separate mail sent
2 years, 11 months
[vlc] Make aarch64 check failure non-fatal
by Leigh Scott
commit 2c67a4a98c0706eee4c9fc8c4b7f006c283807f9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jun 19 18:01:40 2021 +0100
Make aarch64 check failure non-fatal
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index a6033cb..30a63be 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -468,7 +468,7 @@ rm -rf %{buildroot}%{_datadir}/kde4
%if 0%{?el7}
. /opt/rh/devtoolset-%{dts_ver}/enable
%endif
-%ifnarch %{arm}
+%ifnarch %{arm} %{arm64}
make check
%else
make check || :
2 years, 11 months