diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-10-02 19:12:58 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-10-02 21:29:22 +0200 |
commit | cb4e8726f423a41c65ca89c8b8346b0974417940 (patch) | |
tree | bf5c57a15560c1927198d38a4fe52dff711a6d6c /source/kde | |
parent | 6f7f794aa19ace132257a6c542d51da357fb624f (diff) | |
download | current-cb4e8726f423a41c65ca89c8b8346b0974417940.tar.gz current-cb4e8726f423a41c65ca89c8b8346b0974417940.tar.xz |
Mon Oct 2 19:12:58 UTC 202320231002191258
kde/kwin-5.27.8-x86_64-2.txz: Rebuilt.
[PATCH] fix segfault in EglGbmBackend::textureForOutput.
Thanks to marav.
l/SDL2-2.28.4-x86_64-1.txz: Upgraded.
l/mlt-7.20.0-x86_64-1.txz: Upgraded.
l/netpbm-11.04.02-x86_64-1.txz: Upgraded.
x/xterm-385-x86_64-1.txz: Upgraded.
xfce/xfce4-pulseaudio-plugin-0.4.8-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde')
-rw-r--r-- | source/kde/kde/build/kwin | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/kwin.patch | 1 | ||||
-rw-r--r-- | source/kde/kde/patch/kwin/e6b20c47ea2d3dfc38632958e0be295a0d376e1f.patch | 27 |
3 files changed, 29 insertions, 1 deletions
diff --git a/source/kde/kde/build/kwin b/source/kde/kde/build/kwin index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kwin +++ b/source/kde/kde/build/kwin @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/kwin.patch b/source/kde/kde/patch/kwin.patch new file mode 100644 index 000000000..9ecc2e620 --- /dev/null +++ b/source/kde/kde/patch/kwin.patch @@ -0,0 +1 @@ +cat $CWD/patch/kwin/e6b20c47ea2d3dfc38632958e0be295a0d376e1f.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kwin/e6b20c47ea2d3dfc38632958e0be295a0d376e1f.patch b/source/kde/kde/patch/kwin/e6b20c47ea2d3dfc38632958e0be295a0d376e1f.patch new file mode 100644 index 000000000..91f42a6d5 --- /dev/null +++ b/source/kde/kde/patch/kwin/e6b20c47ea2d3dfc38632958e0be295a0d376e1f.patch @@ -0,0 +1,27 @@ +From e6b20c47ea2d3dfc38632958e0be295a0d376e1f Mon Sep 17 00:00:00 2001 +From: Aki Sakurai <kde@aki.tw> +Date: Thu, 28 Sep 2023 23:50:32 +0800 +Subject: [PATCH] fix segfault in EglGbmBackend::textureForOutput + +(cherry picked from commit 0f1da589ebc90d7436d4f6e8a418be76c10258c6) +--- + src/backends/drm/drm_egl_backend.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/backends/drm/drm_egl_backend.cpp b/src/backends/drm/drm_egl_backend.cpp +index 3b22ef21db2..d6adbe83f04 100644 +--- a/src/backends/drm/drm_egl_backend.cpp ++++ b/src/backends/drm/drm_egl_backend.cpp +@@ -214,6 +214,9 @@ OutputLayer *EglGbmBackend::primaryLayer(Output *output) + std::shared_ptr<GLTexture> EglGbmBackend::textureForOutput(Output *output) const + { + const auto drmOutput = static_cast<DrmAbstractOutput *>(output); ++ if (const auto virtualLayer = dynamic_cast<VirtualEglGbmLayer *>(drmOutput->primaryLayer())) { ++ return virtualLayer->texture(); ++ } + return static_cast<EglGbmLayer *>(drmOutput->primaryLayer())->texture(); + } + +-- +GitLab + |