kwin: Allow triple buffering on NV && update libei patch

Signed-off-by: Peter Jung <[email protected]>
CachyOS · Aug 17, 2024 · 3d8ac29 · 3d8ac29
1 parent 70f622f
commit 3d8ac29
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/kwin/.SRCINFO b/kwin/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kwin
 	pkgdesc = An easy to use, but flexible, composited Window Manager (CachyOS Version)
 	pkgver = 6.1.4
-	pkgrel = 4
+	pkgrel = 6
 	url = https://kde.org/plasma-desktop/
 	install = kwin.install
 	arch = x86_64
@@ -81,14 +81,16 @@ pkgbase = kwin
 	source = https://invent.kde.org/plasma/kwin/-/merge_requests/6178.patch
 	source = tearing-dev.patch
 	source = fix-xwayland-copy-paste.patch::https://invent.kde.org/plasma/kwin/-/commit/7e23386d46d8441d31a1e82c210179546ee6cae1.patch
+	source = https://invent.kde.org/plasma/kwin/-/merge_requests/6233.patch
 	validpgpkeys = E0A3EB202F8E57528E13E72FD7574483BB57B18D
 	validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D
 	validpgpkeys = D07BD8662C56CB291B316EB2F5675605C74E02CF
 	validpgpkeys = 1FA881591C26B276D7A5518EEAAF29B42A678C20
 	sha256sums = fcffce468dea23a92cad33ac1b1264c55c0799d497f54f6b8e23439dcdadeb3a
 	sha256sums = SKIP
-	sha256sums = 5fd0774e1277fbb2f7bbae6f4f78487a704521174b9e836b5933eeeafdf4ecd2
+	sha256sums = c6a95954f26a68b3def07fd9cd04910653ad8829f0150becee35ccf713d597ff
 	sha256sums = 26a75cd9b50ffcd705bf99e681f73a6f168bd17540b1976547f869662cd5fccf
 	sha256sums = edcac240dc84837462fb8bd17af3bfa77f690b1df5f149ef5a0ae783e24b20e2
+	sha256sums = 11c18eca1e3bc79646ba2a2f61fdb6b9566a6f9f3dd06f4d73c8d3e2d3db6fe1
 
 pkgname = kwin
diff --git a/kwin/6178.patch b/kwin/6178.patch
@@ -462,7 +462,7 @@ index d795ee7d1c5..bd47d3c7deb 100644
 GitLab
 
 
-From 8868e52cfa8dccd3dc685de88a81cbfc1ffefcd9 Mon Sep 17 00:00:00 2001
+From d9067406b3d71af3c1405bd0af7460659872fdf9 Mon Sep 17 00:00:00 2001
 From: David Redondo <[email protected]>
 Date: Fri, 12 Jul 2024 15:55:59 +0200
 Subject: [PATCH 4/4] Add option to control whether xwayland xtest will prompt
@@ -477,17 +477,17 @@ as we can get the client binary name from the eis client compared
 to the portal which receives nothing.
 ---
  src/kcms/xwayland/kwinxwaylandsettings.kcfg |  3 ++
- src/kcms/xwayland/ui/main.qml               | 14 ++++++++
+ src/kcms/xwayland/ui/main.qml               | 14 +++++++
  src/kwin.kcfg                               |  3 ++
  src/options.cpp                             | 11 ++++++
  src/options.h                               | 11 ++++++
  src/plugins/eis/CMakeLists.txt              |  3 +-
  src/plugins/eis/eisbackend.cpp              |  3 +-
- src/plugins/eis/eiscontext.cpp              | 40 +++++++++++----------
+ src/plugins/eis/eiscontext.cpp              | 40 +++++++++++---------
  src/plugins/eis/eiscontext.h                | 13 +++----
- src/plugins/eis/xwaylandeiscontext.cpp      | 40 +++++++++++++++++++++
- src/plugins/eis/xwaylandeiscontext.h        | 18 ++++++++++
- 11 files changed, 131 insertions(+), 28 deletions(-)
+ src/plugins/eis/xwaylandeiscontext.cpp      | 42 +++++++++++++++++++++
+ src/plugins/eis/xwaylandeiscontext.h        | 18 +++++++++
+ 11 files changed, 133 insertions(+), 28 deletions(-)
  create mode 100644 src/plugins/eis/xwaylandeiscontext.cpp
  create mode 100644 src/plugins/eis/xwaylandeiscontext.h
 
@@ -781,10 +781,10 @@ index 50de947a856..c14b17fb153 100644
  }
 diff --git a/src/plugins/eis/xwaylandeiscontext.cpp b/src/plugins/eis/xwaylandeiscontext.cpp
 new file mode 100644
-index 00000000000..ecd3fb2c65f
+index 00000000000..4400977c693
 --- /dev/null
 +++ b/src/plugins/eis/xwaylandeiscontext.cpp
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,42 @@
 +#include "xwaylandeiscontext.h"
 +
 +#include "options.h"
@@ -793,6 +793,8 @@ index 00000000000..ecd3fb2c65f
 +#include <KMessageDialog>
 +#include <KStandardGuiItem>
 +
++#include <unistd.h>
++
 +namespace KWin
 +{
 +

diff --git a/kwin/PKGBUILD b/kwin/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=kwin
 pkgver=6.1.4
 _dirver=$(echo $pkgver | cut -d. -f1-3)
-pkgrel=4
+pkgrel=6
 pkgdesc='An easy to use, but flexible, composited Window Manager (CachyOS Version)'
 arch=(x86_64)
 url='https://kde.org/plasma-desktop/'
@@ -81,15 +81,19 @@ makedepends=(extra-cmake-modules
 optdepends=('maliit-keyboard: virtual keyboard for kwin-wayland')
 groups=(plasma)
 source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig}
-		https://invent.kde.org/plasma/kwin/-/merge_requests/6178.patch
-		tearing-dev.patch
-		fix-xwayland-copy-paste.patch::https://invent.kde.org/plasma/kwin/-/commit/7e23386d46d8441d31a1e82c210179546ee6cae1.patch)
+		https://invent.kde.org/plasma/kwin/-/merge_requests/6178.patch # Required for handheld edition
+		tearing-dev.patch # Tearing
+		fix-xwayland-copy-paste.patch::https://invent.kde.org/plasma/kwin/-/commit/7e23386d46d8441d31a1e82c210179546ee6cae1.patch # Fix copy and pasting to Xwayland applications.
+#		https://invent.kde.org/plasma/kwin/-/merge_requests/6204.patch # Screencast: Pipewire Add Explicit Sync support
+		https://invent.kde.org/plasma/kwin/-/merge_requests/6233.patch # allow triple buffering on NVIDIA, if KWIN_DRM_DISABLE_TRIPLE_BUFFERING=0 is set
+		)
 install=$pkgname.install
 sha256sums=('fcffce468dea23a92cad33ac1b1264c55c0799d497f54f6b8e23439dcdadeb3a'
             'SKIP'
-            '5fd0774e1277fbb2f7bbae6f4f78487a704521174b9e836b5933eeeafdf4ecd2'
+            'c6a95954f26a68b3def07fd9cd04910653ad8829f0150becee35ccf713d597ff'
             '26a75cd9b50ffcd705bf99e681f73a6f168bd17540b1976547f869662cd5fccf'
-            'edcac240dc84837462fb8bd17af3bfa77f690b1df5f149ef5a0ae783e24b20e2')
+            'edcac240dc84837462fb8bd17af3bfa77f690b1df5f149ef5a0ae783e24b20e2'
+            '11c18eca1e3bc79646ba2a2f61fdb6b9566a6f9f3dd06f4d73c8d3e2d3db6fe1')
 validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D'  # Jonathan Esk-Riddell <[email protected]>
               '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <[email protected]>
               'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <[email protected]>
@@ -101,7 +105,11 @@ prepare() {
   msg2 "Add an option to allow Xwayland apps use libei input emulation without prompting"
   patch -Np1 < ../6178.patch
   msg2 "Fix copy and pasting to Xwayland applications."
-  patch -Np1 <../fix-xwayland-copy-paste.patch
+  patch -Np1 < ../fix-xwayland-copy-paste.patch
+#  msg2 "Screencast: Pipewire Add Explicit Sync support"
+#  patch -Np1 < ../6204.patch
+  msg2 "allow triple buffering on NVIDIA, if KWIN_DRM_DISABLE_TRIPLE_BUFFERING=0 is set"
+  patch -Np1 < ../6233.patch
 }
 
 build() {