From 181c0bb25a98eae0c2a18fcb03c5e620aa4212b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 09:48:57 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kwin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kwin.spec b/kwin.spec index 166119c..06ad3ad 100644 --- a/kwin.spec +++ b/kwin.spec @@ -17,7 +17,7 @@ Name: kwin Version: 5.27.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -361,6 +361,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 5.27.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Jun 25 2023 Marc Deop i Argemí - 5.27.6-1 - 5.27.6 From a49d2604ec844b2bd0cf301a8815e1f4243e331a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 1 Aug 2023 20:58:46 +0200 Subject: [PATCH 2/8] 5.27.7 --- kwin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kwin.spec b/kwin.spec index 06ad3ad..1982ecd 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,8 +16,8 @@ %endif Name: kwin -Version: 5.27.6 -Release: 2%{?dist} +Version: 5.27.7 +Release: 1%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -361,6 +361,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Tue Aug 01 2023 Marc Deop i Argemí - 5.27.7-1 +- 5.27.7 + * Thu Jul 20 2023 Fedora Release Engineering - 5.27.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index c4e1fe6..4fbfefd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.27.6.tar.xz) = 86fd279ce9e82bc41fe5f0cc5f348ec97aaa9589d16cc6b99adf9c27b8cba8a67191be764d4c5e48a042368ef202d78397f756db4efd26ea822584293fdc730b +SHA512 (kwin-5.27.7.tar.xz) = 0f9f24d6296fdf7f7ab143ef38f69fb34aa0abbb39a24edebf4a59c1730ce5ccfebebbc1838c2e8eb94db11f8a7c30b6d4dfe2fd1848b9d938781256f555bf7e From 31177d99ebfc357f216996c8a5954bf75cba046c Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Wed, 13 Sep 2023 14:06:54 +0930 Subject: [PATCH 3/8] Update to 5.27.8 --- kwin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kwin.spec b/kwin.spec index 1982ecd..2612d17 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,7 +16,7 @@ %endif Name: kwin -Version: 5.27.7 +Version: 5.27.8 Release: 1%{?dist} Summary: KDE Window manager @@ -361,6 +361,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Tue Sep 12 2023 justin.zobel@gmail.com - 5.27.8-1 +- 5.27.8 + * Tue Aug 01 2023 Marc Deop i Argemí - 5.27.7-1 - 5.27.7 diff --git a/sources b/sources index 4fbfefd..af20461 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.27.7.tar.xz) = 0f9f24d6296fdf7f7ab143ef38f69fb34aa0abbb39a24edebf4a59c1730ce5ccfebebbc1838c2e8eb94db11f8a7c30b6d4dfe2fd1848b9d938781256f555bf7e +SHA512 (kwin-5.27.8.tar.xz) = 7947d0bf85cd67b83d79580fa355e5217cd4d356b2daa94aff67c637de38625be9f949d4a1441414ba488426ce85a352c6e81d24afdda4930c7d738d575d5163 From 42f7f40c9d1270d3d22521d80695d71130016593 Mon Sep 17 00:00:00 2001 From: Steve Cossette Date: Tue, 24 Oct 2023 16:41:33 -0400 Subject: [PATCH 4/8] 5.27.9 --- kwin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kwin.spec b/kwin.spec index 2612d17..39696bd 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,7 +16,7 @@ %endif Name: kwin -Version: 5.27.8 +Version: 5.27.9 Release: 1%{?dist} Summary: KDE Window manager @@ -361,6 +361,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Tue Oct 24 2023 Steve Cossette - 5.27.9-1 +- 5.27.9 + * Tue Sep 12 2023 justin.zobel@gmail.com - 5.27.8-1 - 5.27.8 diff --git a/sources b/sources index af20461..e05275b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.27.8.tar.xz) = 7947d0bf85cd67b83d79580fa355e5217cd4d356b2daa94aff67c637de38625be9f949d4a1441414ba488426ce85a352c6e81d24afdda4930c7d738d575d5163 +SHA512 (kwin-5.27.9.tar.xz) = 64b67fbd28e6806000180534c538412778a779cc70f77528a0271c9a20d08170926c8d533a4301bdede023842b6525d892ce035d42bc671c7355e06baa8318b3 From a4b6148f115844d51e464d60cefc9588316c74fa Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 3 Nov 2023 11:56:53 -0400 Subject: [PATCH 5/8] Mark kwin-x11 as deprecated --- kwin.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kwin.spec b/kwin.spec index 39696bd..96df0a6 100644 --- a/kwin.spec +++ b/kwin.spec @@ -200,6 +200,8 @@ Requires: %{name}-common%{?_isa} = %{version}-%{release} BuildRequires: xorg-x11-server-Xorg %endif Requires: xorg-x11-server-Xorg +# Plasma X11 is deprecated and will be removed with Plasma 6.0 +Provides: deprecated() # http://bugzilla.redhat.com/605675 Provides: firstboot(windowmanager) = kwin_x11 # KWinX11Platform (and others?) From 54e0a808435b9654cd6edf264b2967c1e2479a9d Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 3 Nov 2023 12:00:54 -0400 Subject: [PATCH 6/8] Bump release and add changelog entry --- kwin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kwin.spec b/kwin.spec index 96df0a6..4592ba8 100644 --- a/kwin.spec +++ b/kwin.spec @@ -17,7 +17,7 @@ Name: kwin Version: 5.27.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -363,6 +363,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Fri Nov 03 2023 Neal Gompa - 5.27.9-2 +- Mark kwin-x11 as deprecated + * Tue Oct 24 2023 Steve Cossette - 5.27.9-1 - 5.27.9 From a775cc3814431fc2513f0a11599a265c1ad1bae3 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Fri, 17 Nov 2023 00:23:31 +0100 Subject: [PATCH 7/8] Backport proposed patch to fix nvidia screencasting --- fix-nvidia-screencast.patch | 68 +++++++++++++++++++++++++++++++++++++ kwin.spec | 7 +++- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 fix-nvidia-screencast.patch diff --git a/fix-nvidia-screencast.patch b/fix-nvidia-screencast.patch new file mode 100644 index 0000000..a3cb634 --- /dev/null +++ b/fix-nvidia-screencast.patch @@ -0,0 +1,68 @@ +From 17f81c4faa4c93dc9ac2d9abf1b759b38df2ed9d Mon Sep 17 00:00:00 2001 +From: Alessandro Astone +Date: Wed, 15 Nov 2023 23:22:56 +0100 +Subject: [PATCH 1/2] screencast: Fix GLES path + +glReadPixels reads from the bound framebuffer, so create an offscreen +framebuffer and attach the texture to it + +Co-authored-by: Jan Grulich +--- + src/plugins/screencast/screencastutils.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/plugins/screencast/screencastutils.h b/src/plugins/screencast/screencastutils.h +index f402c21fdf..1a57362dea 100644 +--- a/src/plugins/screencast/screencastutils.h ++++ b/src/plugins/screencast/screencastutils.h +@@ -8,6 +8,7 @@ + + #include "kwinglplatform.h" + #include "kwingltexture.h" ++#include "kwinglutils.h" + #include + #include + +@@ -60,7 +61,10 @@ static void grabTexture(GLTexture *texture, spa_data *spa, spa_video_format form + + texture->bind(); + if (GLPlatform::instance()->isGLES()) { ++ GLFramebuffer fbo(texture); ++ GLFramebuffer::pushFramebuffer(&fbo); + glReadPixels(0, 0, size.width(), size.height(), closestGLType(format), GL_UNSIGNED_BYTE, spa->data); ++ GLFramebuffer::popFramebuffer(); + } else if (GLPlatform::instance()->glVersion() >= kVersionNumber(4, 5)) { + glGetTextureImage(texture->texture(), 0, closestGLType(format), GL_UNSIGNED_BYTE, spa->chunk->size, spa->data); + } else { +-- +2.41.0 + + +From 79083bdf721dd56ace7412f89d7b80e7b9a2ba52 Mon Sep 17 00:00:00 2001 +From: Alessandro Astone +Date: Wed, 15 Nov 2023 23:23:14 +0100 +Subject: [PATCH 2/2] screencast: Make nvidia use the GLES path + +glGetTexImage returns a black image + +Fixes: BUG:476602 +--- + src/plugins/screencast/screencastutils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/screencast/screencastutils.h b/src/plugins/screencast/screencastutils.h +index 1a57362dea..31b8a1c95c 100644 +--- a/src/plugins/screencast/screencastutils.h ++++ b/src/plugins/screencast/screencastutils.h +@@ -60,7 +60,7 @@ static void grabTexture(GLTexture *texture, spa_data *spa, spa_video_format form + } + + texture->bind(); +- if (GLPlatform::instance()->isGLES()) { ++ if (GLPlatform::instance()->isGLES() || GLPlatform::instance()->driver() == Driver_NVidia) { + GLFramebuffer fbo(texture); + GLFramebuffer::pushFramebuffer(&fbo); + glReadPixels(0, 0, size.width(), size.height(), closestGLType(format), GL_UNSIGNED_BYTE, spa->data); +-- +2.41.0 + diff --git a/kwin.spec b/kwin.spec index 4592ba8..5aa171b 100644 --- a/kwin.spec +++ b/kwin.spec @@ -17,7 +17,7 @@ Name: kwin Version: 5.27.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -39,6 +39,8 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}. ## upstream patches ## proposed patches +# https://invent.kde.org/plasma/kwin/-/merge_requests/4651 +Patch0: fix-nvidia-screencast.patch # Base BuildRequires: extra-cmake-modules @@ -363,6 +365,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Thu Nov 16 2023 Alessandro Astone - 5.27.9-3 +- Backport proposed patch to fix nvidia screencasting + * Fri Nov 03 2023 Neal Gompa - 5.27.9-2 - Mark kwin-x11 as deprecated From 37cf467dbd5874b5a270a0274b6528429b742a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sun, 17 Dec 2023 07:59:52 +0100 Subject: [PATCH 8/8] 5.27.10 --- fix-nvidia-screencast.patch | 68 ------------------------------------- kwin.spec | 11 +++--- sources | 2 +- 3 files changed, 6 insertions(+), 75 deletions(-) delete mode 100644 fix-nvidia-screencast.patch diff --git a/fix-nvidia-screencast.patch b/fix-nvidia-screencast.patch deleted file mode 100644 index a3cb634..0000000 --- a/fix-nvidia-screencast.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 17f81c4faa4c93dc9ac2d9abf1b759b38df2ed9d Mon Sep 17 00:00:00 2001 -From: Alessandro Astone -Date: Wed, 15 Nov 2023 23:22:56 +0100 -Subject: [PATCH 1/2] screencast: Fix GLES path - -glReadPixels reads from the bound framebuffer, so create an offscreen -framebuffer and attach the texture to it - -Co-authored-by: Jan Grulich ---- - src/plugins/screencast/screencastutils.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/plugins/screencast/screencastutils.h b/src/plugins/screencast/screencastutils.h -index f402c21fdf..1a57362dea 100644 ---- a/src/plugins/screencast/screencastutils.h -+++ b/src/plugins/screencast/screencastutils.h -@@ -8,6 +8,7 @@ - - #include "kwinglplatform.h" - #include "kwingltexture.h" -+#include "kwinglutils.h" - #include - #include - -@@ -60,7 +61,10 @@ static void grabTexture(GLTexture *texture, spa_data *spa, spa_video_format form - - texture->bind(); - if (GLPlatform::instance()->isGLES()) { -+ GLFramebuffer fbo(texture); -+ GLFramebuffer::pushFramebuffer(&fbo); - glReadPixels(0, 0, size.width(), size.height(), closestGLType(format), GL_UNSIGNED_BYTE, spa->data); -+ GLFramebuffer::popFramebuffer(); - } else if (GLPlatform::instance()->glVersion() >= kVersionNumber(4, 5)) { - glGetTextureImage(texture->texture(), 0, closestGLType(format), GL_UNSIGNED_BYTE, spa->chunk->size, spa->data); - } else { --- -2.41.0 - - -From 79083bdf721dd56ace7412f89d7b80e7b9a2ba52 Mon Sep 17 00:00:00 2001 -From: Alessandro Astone -Date: Wed, 15 Nov 2023 23:23:14 +0100 -Subject: [PATCH 2/2] screencast: Make nvidia use the GLES path - -glGetTexImage returns a black image - -Fixes: BUG:476602 ---- - src/plugins/screencast/screencastutils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/screencast/screencastutils.h b/src/plugins/screencast/screencastutils.h -index 1a57362dea..31b8a1c95c 100644 ---- a/src/plugins/screencast/screencastutils.h -+++ b/src/plugins/screencast/screencastutils.h -@@ -60,7 +60,7 @@ static void grabTexture(GLTexture *texture, spa_data *spa, spa_video_format form - } - - texture->bind(); -- if (GLPlatform::instance()->isGLES()) { -+ if (GLPlatform::instance()->isGLES() || GLPlatform::instance()->driver() == Driver_NVidia) { - GLFramebuffer fbo(texture); - GLFramebuffer::pushFramebuffer(&fbo); - glReadPixels(0, 0, size.width(), size.height(), closestGLType(format), GL_UNSIGNED_BYTE, spa->data); --- -2.41.0 - diff --git a/kwin.spec b/kwin.spec index 5aa171b..3794d46 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,8 +16,8 @@ %endif Name: kwin -Version: 5.27.9 -Release: 3%{?dist} +Version: 5.27.10 +Release: 1%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -38,10 +38,6 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}. ## upstream patches -## proposed patches -# https://invent.kde.org/plasma/kwin/-/merge_requests/4651 -Patch0: fix-nvidia-screencast.patch - # Base BuildRequires: extra-cmake-modules BuildRequires: kf5-rpm-macros @@ -365,6 +361,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Sat Dec 16 2023 Marc Deop i Argemí - 5.27.10-1 +- 5.27.10 + * Thu Nov 16 2023 Alessandro Astone - 5.27.9-3 - Backport proposed patch to fix nvidia screencasting diff --git a/sources b/sources index e05275b..12f1839 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.27.9.tar.xz) = 64b67fbd28e6806000180534c538412778a779cc70f77528a0271c9a20d08170926c8d533a4301bdede023842b6525d892ce035d42bc671c7355e06baa8318b3 +SHA512 (kwin-5.27.10.tar.xz) = f9cfbad8eb97c26417e430424bd496bfa31f9e3c6953ab68a7cff467de8ad43bc10a764f47bd0ce3afe4d27d2cd981ba949d09ab3090dfcef9e7a77b5a918f71