commit: ebb73b73e7dba0b7748372d24fef04ed1f2eafcc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 21:39:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 19:28:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb73b73
dev-qt/qtwayland: Drop 5.15.2-r20
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwayland/Manifest | 1 -
.../files/qtwayland-5.15.2-fix-qmake-deps.patch | 126 ---------------------
.../files/qtwayland-5.15.2-fixup-mutexes.patch | 87 --------------
.../qtwayland-5.15.2-guard-mResizeDirty.patch | 37 ------
dev-qt/qtwayland/qtwayland-5.15.2-r20.ebuild | 51 ---------
5 files changed, 302 deletions(-)
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index ef7a416aa450..d51d66885922 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,4 +1,3 @@
DIST qtwayland-5.15.2-867540b9.tar.gz 830061 BLAKE2B
b831288d6a3e671631b4df00eb1edb72e35128f3ed5a73983b3e15193f554fddcd0337deb832d44b795d2e37f0601fe35b8b0fcb5986bcc44154d172f3a54193
SHA512
b834802811d9f65559ef5e7468189b53c666e390aa09edeb490e5fee2dece13082b11da0f8b5924b89f7dc8e1eba375a485940f4dfbf0445f3d1e96033e33f24
-DIST qtwayland-5.15.2-d6a6b727.tar.gz 831439 BLAKE2B
430f7c8570f9941e80db68f63efa9669f40d045e8df8820ec8653152938078b91d8d68b76667c6c01cc83cfca3f3b0ea67b6fdee6230e04fd091dcaaed4400bc
SHA512
a2314f31c979594c4bd46fe8f1ac44d3391e45e6fedef44eaac5fb8700d1b32ac992f3e9d17e2453f0311038979a2bf8fabb14ea887525e16fb210307844c71d
DIST qtwayland-5.15.3-gentoo-kde-2.tar.xz 35460 BLAKE2B
ea229ae3007405dcb431c90c3a8411d11d2d5715e917f5a57cc2881da4274938d6466f1562dc5f750b8d27ee60a459d6251ca1ab2563f6ee4b9f89e17a956b59
SHA512
63041bcf68869eb5bd1449bfeecd9847c6890378743eaf1f6cedd95b01f54448be804de6bb5649d70240d4fe98d39fd58db2ba5a5234269c17b5127dd1d76dd3
DIST qtwayland-everywhere-opensource-src-5.15.3.tar.xz 565004 BLAKE2B
bc146caf77d42436dcb599df8d2aea422ac8717151dee91b9be129b97902d5af274dec90bd5ffceef62512515e5cf57a61ab773cfc6c13742a6cc5d9b6f72726
SHA512
0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-qmake-deps.patch
b/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-qmake-deps.patch
deleted file mode 100644
index e0c18228ed0f..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-qmake-deps.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 3b72261b8b06397a532a40e41103c6b7a44e3ab5 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fab...@ritter-vogt.de>
-Date: Fri, 4 Feb 2022 11:07:36 +0100
-Subject: [PATCH] Use proper dependencies in compile tests
-
-Use the dependencies as found by the "libraries" section instead of relying
-on them being available in the default location (e.g. "-ldrm").
-
-Additionally, VK_USE_PLATFORM_WAYLAND_KHR requires <wayland-client.h>, so
-add the wayland-client dependency.
-
-This fixes those tests if e.g. wayland-client headers need to be found through
-pkgconfig.
-
-This part of the code changed completely in Qt 6, so this is a totally
-different patch and not a cherry-pick of 5fc2e1915c3a
-("CMake: Fix qtwayland feature detection").
-
-Fixes: QTBUG-100475
----
- src/client/configure.json | 8 ++++----
- src/compositor/configure.json | 34 +++++++++++++++++++++++++++++-----
- 2 files changed, 33 insertions(+), 9 deletions(-)
-
-diff --git a/src/client/configure.json b/src/client/configure.json
-index 2f424580..29222357 100644
---- a/src/client/configure.json
-+++ b/src/client/configure.json
-@@ -149,8 +149,7 @@
- "#endif"
- ]
- },
-- "libs": "-ldrm",
-- "use": "egl"
-+ "use": "drm egl"
- },
- "vulkan-server-buffer": {
- "label": "Vulkan Buffer Sharing",
-@@ -168,7 +167,8 @@
- "exportAllocInfo.handleTypes =
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR;",
- "return 0;"
- ]
-- }
-+ },
-+ "use": "wayland-client"
- },
- "egl_1_5-wayland": {
- "label": "EGL 1.5 with Wayland Platform",
-@@ -183,7 +183,7 @@
- "eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT, (struct
wl_display *)(nullptr), nullptr);"
- ]
- },
-- "use": "egl"
-+ "use": "egl wayland-client"
- }
- },
-
-diff --git a/src/compositor/configure.json b/src/compositor/configure.json
-index bcfd5215..da95d07b 100644
---- a/src/compositor/configure.json
-+++ b/src/compositor/configure.json
-@@ -7,6 +7,31 @@
- "testDir": "../../config.tests",
-
- "libraries": {
-+ "wayland-client": {
-+ "label": "Wayland client library",
-+ "headers": "wayland-version.h",
-+ "test": {
-+ "main": [
-+ "#if WAYLAND_VERSION_MAJOR < 1",
-+ "# error Wayland 1.8.0 or higher required",
-+ "#endif",
-+ "#if WAYLAND_VERSION_MAJOR == 1",
-+ "# if WAYLAND_VERSION_MINOR < 8",
-+ "# error Wayland 1.8.0 or higher required",
-+ "# endif",
-+ "# if WAYLAND_VERSION_MINOR == 8",
-+ "# if WAYLAND_VERSION_MICRO < 0",
-+ "# error Wayland 1.8.0 or higher required",
-+ "# endif",
-+ "# endif",
-+ "#endif"
-+ ]
-+ },
-+ "sources": [
-+ { "type": "pkgConfig", "args": "wayland-client" },
-+ "-lwayland-client"
-+ ]
-+ },
- "wayland-server": {
- "label": "wayland-server",
- "headers": "wayland-version.h",
-@@ -151,8 +176,7 @@
- "#endif"
- ]
- },
-- "libs": "-ldrm",
-- "use": "egl"
-+ "use": "drm egl"
- },
- "dmabuf-client-buffer": {
- "label": "Linux Client dma-buf Buffer Sharing",
-@@ -176,8 +200,7 @@
- "return 0;"
- ]
- },
-- "libs": "-ldrm",
-- "use": "egl"
-+ "use": "drm egl"
- },
- "vulkan-server-buffer": {
- "label": "Vulkan Buffer Sharing",
-@@ -195,7 +218,8 @@
- "exportAllocInfo.handleTypes =
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR;",
- "return 0;"
- ]
-- }
-+ },
-+ "use": "wayland-client"
- }
- },
-
---
-GitLab
-
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-fixup-mutexes.patch
b/dev-qt/qtwayland/files/qtwayland-5.15.2-fixup-mutexes.patch
deleted file mode 100644
index b861cebe60ac..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.2-fixup-mutexes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From bf4335b1ea9b179076cbd7a1c2e8cfa9538b1dc1 Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmund...@kde.org>
-Date: Thu, 3 Feb 2022 14:27:08 +0000
-Subject: [PATCH] Fix up mutexes for frame callbacks
-
-Everything related to frame callback timings is used by potentially 3
-threads. Access needs guarding.
-
-Change-Id: I9f22390c175d9f2f63d31b1ebf0cdc0b830be937
----
- src/client/qwaylandwindow.cpp | 14 +++++++++-----
- src/client/qwaylandwindow_p.h | 10 +++++++---
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index 7aee362a..72e0e601 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -256,8 +256,12 @@ void QWaylandWindow::reset()
- mFrameCallback = nullptr;
- }
-
-- mFrameCallbackElapsedTimer.invalidate();
-- mWaitingForFrameCallback = false;
-+ {
-+ QMutexLocker locker(&mFrameSyncMutex);
-+ mFrameCallbackElapsedTimer.invalidate();
-+ mWaitingForFrameCallback = false;
-+ }
-+
- mFrameCallbackTimedOut = false;
-
- mMask = QRegion();
-@@ -1142,6 +1146,7 @@ QVariant QWaylandWindow::property(const QString &name,
const QVariant &defaultVa
-
- void QWaylandWindow::timerEvent(QTimerEvent *event)
- {
-+ QMutexLocker locker(&mFrameSyncMutex);
- if (event->timerId() != mFrameCallbackCheckIntervalTimerId)
- return;
-
-@@ -1200,15 +1205,14 @@ void QWaylandWindow::handleUpdate()
- {
- qCDebug(lcWaylandBackingstore) << "handleUpdate" <<
QThread::currentThread();
-
-- if (mWaitingForFrameCallback)
-- return;
--
- // TODO: Should sync subsurfaces avoid requesting frame callbacks?
- QReadLocker lock(&mSurfaceLock);
- if (!mSurface)
- return;
-
- QMutexLocker locker(&mFrameSyncMutex);
-+ if (mWaitingForFrameCallback)
-+ return;
-
- struct ::wl_surface *wrappedSurface = reinterpret_cast<struct
::wl_surface *>(wl_proxy_create_wrapper(mSurface->object()));
- wl_proxy_set_queue(reinterpret_cast<wl_proxy *>(wrappedSurface),
mDisplay->frameEventQueue());
-diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
-index 3ff68ccb..025d7917 100644
---- a/src/client/qwaylandwindow_p.h
-+++ b/src/client/qwaylandwindow_p.h
-@@ -226,13 +226,17 @@ protected:
- Qt::MouseButtons mMousePressedInContentArea = Qt::NoButton;
-
- WId mWindowId;
-+
-+ // The following are used by the main thread the render thread and the
event frame thread
-+ // Access should be guarded by mFrameSyncMutex
-+ QMutex mFrameSyncMutex;
-+ QWaitCondition mFrameSyncWait;
- bool mWaitingForFrameCallback = false;
-- bool mFrameCallbackTimedOut = false; // Whether the frame callback has
timed out
- int mFrameCallbackCheckIntervalTimerId = -1;
- QElapsedTimer mFrameCallbackElapsedTimer;
-+
-+ bool mFrameCallbackTimedOut = false; // Whether the frame callback has
timed out
- struct ::wl_callback *mFrameCallback = nullptr;
-- QMutex mFrameSyncMutex;
-- QWaitCondition mFrameSyncWait;
-
- // True when we have called deliverRequestUpdate, but the client has not
yet attached a new buffer
- bool mWaitingForUpdate = false;
---
-GitLab
-
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-guard-mResizeDirty.patch
b/dev-qt/qtwayland/files/qtwayland-5.15.2-guard-mResizeDirty.patch
deleted file mode 100644
index c2e377cff054..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.2-guard-mResizeDirty.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2e2042aa18efd1389a140a5d0028d8359bd455a7 Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmund...@kde.org>
-Date: Thu, 3 Feb 2022 19:42:33 +0000
-Subject: [PATCH] Guard mResizeDirty by the correctMutex
-
-mResizeDirty is used in the GUI thread in setCanResize which can be
-called from the GUI thread. It is queried and set whilst the resizeLock
-is held. We need to guard our usage.
-
-Change-Id: I5f8dcf8aa2cb2c4bb6274103df1da9e3e268605a
----
- src/client/qwaylandwindow.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index 949374b1..7aee362a 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -357,11 +357,12 @@ void QWaylandWindow::setGeometry(const QRect &rect)
- if (mWindowDecoration)
- mWindowDecoration->update();
-
-- if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize)
-+ if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize) {
-+ QMutexLocker lock(&mResizeLock);
- mResizeDirty = true;
-- else
-+ } else {
- QWindowSystemInterface::handleGeometryChange(window(),
geometry());
--
-+ }
- mSentInitialResize = true;
- }
- QRect exposeGeometry(QPoint(), geometry().size());
---
-GitLab
-
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r20.ebuild
b/dev-qt/qtwayland/qtwayland-5.15.2-r20.ebuild
deleted file mode 100644
index de0debdecf5a..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r20.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=d6a6b727832819d118199f7016c2c401663ee370
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~ppc ~ppc64"
-fi
-
-SLOT=5/${QT5_PV} # bug 815646
-IUSE="vulkan X"
-
-DEPEND="
- dev-libs/wayland
- =dev-qt/qtcore-${QT5_PV}*:5=
- =dev-qt/qtdeclarative-${QT5_PV}*:5=
- =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
- media-libs/libglvnd
- vulkan? ( dev-util/vulkan-headers )
- X? (
- =dev-qt/qtgui-${QT5_PV}*[-gles2-only]
- x11-libs/libX11
- x11-libs/libXcomposite
- )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- dev-util/wayland-scanner
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-QTBUG-90037-QTBUG-91264.patch"
- "${FILESDIR}/${P}-fix-qmake-deps.patch"
- "${FILESDIR}/${P}-guard-mResizeDirty.patch"
- "${FILESDIR}/${P}-fixup-mutexes.patch"
-)
-
-src_configure() {
- local myqmakeargs=(
- --
- $(qt_use vulkan feature-wayland-vulkan-server-buffer)
- $(qt_use X feature-xcomposite-egl)
- $(qt_use X feature-xcomposite-glx)
- )
- qt5-build_src_configure
-}
