kwin: 6.0.4 -> 6.0.4.1

This commit is contained in:
Tim Biermann 2024-04-28 11:04:20 +02:00
parent 579b1a660f
commit 0ef57278be
Signed by: tb
GPG Key ID: 42F8B4E30B673606
3 changed files with 5 additions and 56 deletions

View File

@ -1,7 +1,6 @@
untrusted comment: verify with /etc/ports/kde-plasma-6.pub
RWTGxEYrvi0p3mfYHvpedz15yFZti8u9h6Fv1Q8ZUU4UASnAAw+1mVTLmzr5Bg0lvjgpvkhBfl6lLKUJt8m55GLCZ4Zzxr0RCwU=
SHA256 (Pkgfile) = 1e0dd6976451aab07d62b22cad32e8b29001d19e7f0b0caab8e4d6eff1466778
RWTGxEYrvi0p3uiNrdbg3UZ5dztki7Zs4vKoiJqexHeE1HDn4jYGOREFW6rE3r8iPIEvOFTnK1uSlIhcPTk3QwW9YKn3xQKybQg=
SHA256 (Pkgfile) = 9e89be613bc9f500c6b211c58c9e5f5580f439f82b718e4e2382b05a2f82196b
SHA256 (.footprint) = 14fe912abbb9c4c093c8f0618a8e770d813f56e8f0684cb3d1626e1974c7fd93
SHA256 (kwin-6.0.4.tar.xz) = f5552f8c5b179e272fee33a19249686573eabffddd5541bc31f8fd7069baa82b
SHA256 (fbd78018.patch) = 57fb751d78c6dd50a1cf9285ab48cb5e76b7c9ec5fcc71bfe6c9d6c3151ce3f4
SHA256 (kwin-6.0.4.1.tar.xz) = 56ffb37fa36e10f058ec5499c6858f6b21105b56ac7d70407921f063bc4bcb36
SHA256 (fix-screencast-pipewire.patch) = 78ec72fd0c0dfcc50f04ddde101e2442a293ef1d640f89d3c4eb478c122313be

View File

@ -4,17 +4,14 @@
# Depends on: kdeclarative kdecoration kglobalacceld knewstuff kscreenlocker kwayland lcms2 libdisplay-info libinput pipewire qt6-multimedia qt6-sensors xorg-xwayland
name=kwin
version=6.0.4
release=2
version=6.0.4.1
release=1
source=(https://download.kde.org/stable/plasma/${version::5}/$name-$version.tar.xz
fbd78018.patch
fix-screencast-pipewire.patch)
build() {
# https://bugs.kde.org/show_bug.cgi?id=483137
patch -Np1 -d $name-$version -i $SRC/fix-screencast-pipewire.patch
# https://bugs.kde.org/show_bug.cgi?id=485639
patch -Np1 -d $name-$version -i $SRC/fbd78018.patch
cmake -S $name-$version -B build -G Ninja \
-D CMAKE_INSTALL_PREFIX=/usr \

View File

@ -1,47 +0,0 @@
From fbd780186c76764617dba0365b9ca3de7cfe2f86 Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
Date: Fri, 19 Apr 2024 23:06:56 +0200
Subject: [PATCH] scene/workspacescene: don't check direct scanout candidates
for a pixmap
We don't need a pixmap for direct scanout, and the drm backend destroys the pixmap
when direct scanout is successful... so this check created a loop of direct scanout
working and not working, and worse, the client reallocating its buffers each time.
BUG: 485639
BUG: 485730
BUG: 485712
CCBUG: 477016
(cherry picked from commit fba948b39f6e3b2e70caa1880903f8fb17faf6d9)
---
src/scene/workspacescene.cpp | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/src/scene/workspacescene.cpp b/src/scene/workspacescene.cpp
index d51f46357f..342db17bd5 100644
--- a/src/scene/workspacescene.cpp
+++ b/src/scene/workspacescene.cpp
@@ -153,17 +153,7 @@ static SurfaceItem *findTopMostSurface(SurfaceItem *item)
}
}
}
- if (item->pixmap()) {
- return item;
- }
- for (const auto &child : children | std::views::reverse) {
- if (child->z() < 0) {
- if (auto item = findTopMostSurface(static_cast<SurfaceItem *>(child))) {
- return item;
- }
- }
- }
- return nullptr;
+ return item;
}
SurfaceItem *WorkspaceScene::scanoutCandidate() const
--
GitLab