qt5-5.14.0:ver. bump
This commit is contained in:
@@ -0,0 +1,122 @@
|
||||
From 36974955d13578071387695adb13a47be33e4d32 Mon Sep 17 00:00:00 2001
|
||||
From: David Edmundson <davidedmundson@kde.org>
|
||||
Date: Thu, 28 Nov 2019 02:31:17 +0100
|
||||
Subject: Avoid animating single frame cursors
|
||||
|
||||
Currently to determine if a cursor is animated or not we check the
|
||||
cursor theme delay.
|
||||
|
||||
This doesn't work in practice as by default many cursor themes have a
|
||||
delay of 50 set even if they don't animate.
|
||||
|
||||
This comes from xcursorgen which specifies a delay of 50ms if there
|
||||
isn't anything set in the config.
|
||||
(https://github.com/freedesktop/xcursorgen/blob/master/xcursorgen.c#L92)
|
||||
|
||||
Given many themes will have a delay we should also check the number of
|
||||
images in a given cursor.
|
||||
|
||||
In order to do that without a double lookup QWaylandCursor needed to
|
||||
return the native wl_cursor, not wl_cursor_image and move the relevant
|
||||
logic.
|
||||
|
||||
Change-Id: Ie782ace8054910ae76e61cab33ceca0377194929
|
||||
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
|
||||
---
|
||||
src/client/qwaylandcursor.cpp | 12 ++----------
|
||||
src/client/qwaylandcursor_p.h | 3 +--
|
||||
src/client/qwaylandinputdevice.cpp | 16 ++++++++++++----
|
||||
3 files changed, 15 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/src/client/qwaylandcursor.cpp b/src/client/qwaylandcursor.cpp
|
||||
index 4356b23a..1d3d88be 100644
|
||||
--- a/src/client/qwaylandcursor.cpp
|
||||
+++ b/src/client/qwaylandcursor.cpp
|
||||
@@ -219,7 +219,7 @@ wl_cursor *QWaylandCursorTheme::requestCursor(WaylandCursor shape)
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
-::wl_cursor_image *QWaylandCursorTheme::cursorImage(Qt::CursorShape shape, uint millisecondsIntoAnimation)
|
||||
+::wl_cursor *QWaylandCursorTheme::cursor(Qt::CursorShape shape)
|
||||
{
|
||||
struct wl_cursor *waylandCursor = nullptr;
|
||||
|
||||
@@ -237,15 +237,7 @@ wl_cursor *QWaylandCursorTheme::requestCursor(WaylandCursor shape)
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
- int frame = wl_cursor_frame(waylandCursor, millisecondsIntoAnimation);
|
||||
- ::wl_cursor_image *image = waylandCursor->images[frame];
|
||||
- ::wl_buffer *buffer = wl_cursor_image_get_buffer(image);
|
||||
- if (!buffer) {
|
||||
- qCWarning(lcQpaWayland) << "Could not find buffer for cursor";
|
||||
- return nullptr;
|
||||
- }
|
||||
-
|
||||
- return image;
|
||||
+ return waylandCursor;
|
||||
}
|
||||
|
||||
QWaylandCursor::QWaylandCursor(QWaylandDisplay *display)
|
||||
diff --git a/src/client/qwaylandcursor_p.h b/src/client/qwaylandcursor_p.h
|
||||
index a4605f3d..751ffa68 100644
|
||||
--- a/src/client/qwaylandcursor_p.h
|
||||
+++ b/src/client/qwaylandcursor_p.h
|
||||
@@ -75,7 +75,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandCursorTheme
|
||||
public:
|
||||
static QWaylandCursorTheme *create(QWaylandShm *shm, int size, const QString &themeName);
|
||||
~QWaylandCursorTheme();
|
||||
- ::wl_cursor_image *cursorImage(Qt::CursorShape shape, uint millisecondsIntoAnimation = 0);
|
||||
+ ::wl_cursor *cursor(Qt::CursorShape shape);
|
||||
|
||||
private:
|
||||
enum WaylandCursor {
|
||||
@@ -129,7 +129,6 @@ public:
|
||||
void setPos(const QPoint &pos) override;
|
||||
|
||||
static QSharedPointer<QWaylandBuffer> cursorBitmapBuffer(QWaylandDisplay *display, const QCursor *cursor);
|
||||
- struct wl_cursor_image *cursorImage(Qt::CursorShape shape);
|
||||
|
||||
private:
|
||||
QWaylandDisplay *mDisplay = nullptr;
|
||||
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
|
||||
index a4098edd..d812918e 100644
|
||||
--- a/src/client/qwaylandinputdevice.cpp
|
||||
+++ b/src/client/qwaylandinputdevice.cpp
|
||||
@@ -283,8 +283,8 @@ void QWaylandInputDevice::Pointer::updateCursorTheme()
|
||||
if (!mCursor.theme)
|
||||
return; // A warning has already been printed in loadCursorTheme
|
||||
|
||||
- if (auto *arrow = mCursor.theme->cursorImage(Qt::ArrowCursor)) {
|
||||
- int arrowPixelSize = qMax(arrow->width, arrow->height); // Not all cursor themes are square
|
||||
+ if (auto *arrow = mCursor.theme->cursor(Qt::ArrowCursor)) {
|
||||
+ int arrowPixelSize = qMax(arrow->images[0]->width, arrow->images[0]->height); // Not all cursor themes are square
|
||||
while (scale > 1 && arrowPixelSize / scale < cursorSize())
|
||||
--scale;
|
||||
} else {
|
||||
@@ -326,12 +326,20 @@ void QWaylandInputDevice::Pointer::updateCursor()
|
||||
|
||||
// Set from shape using theme
|
||||
uint time = seat()->mCursor.animationTimer.elapsed();
|
||||
- if (struct ::wl_cursor_image *image = mCursor.theme->cursorImage(shape, time)) {
|
||||
+
|
||||
+ if (struct ::wl_cursor *waylandCursor = mCursor.theme->cursor(shape)) {
|
||||
+ int frame = wl_cursor_frame(waylandCursor, time);
|
||||
+ ::wl_cursor_image *image = waylandCursor->images[frame];
|
||||
+
|
||||
struct wl_buffer *buffer = wl_cursor_image_get_buffer(image);
|
||||
+ if (!buffer) {
|
||||
+ qCWarning(lcQpaWayland) << "Could not find buffer for cursor" << shape;
|
||||
+ return;
|
||||
+ }
|
||||
int bufferScale = mCursor.themeBufferScale;
|
||||
QPoint hotspot = QPoint(image->hotspot_x, image->hotspot_y) / bufferScale;
|
||||
QSize size = QSize(image->width, image->height) / bufferScale;
|
||||
- bool animated = image->delay > 0;
|
||||
+ bool animated = waylandCursor->image_count > 1 && image->delay > 0;
|
||||
getOrCreateCursorSurface()->update(buffer, hotspot, size, bufferScale, animated);
|
||||
return;
|
||||
}
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
From ce15889614f87b5986f997beffd2826471adfe51 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Fri, 13 Dec 2019 22:15:32 +0100
|
||||
Subject: Drive cursor animation with a timer
|
||||
|
||||
Using only wl_surface_frame callbacks to update the cursor does so much
|
||||
more often than needed. In addition, at least GNOME and Weston fire the
|
||||
callback for the cursor surface immediately, which ends up updating the
|
||||
cursor at over 3000 Hz here.
|
||||
|
||||
Use wl_cursor_frame_and_duration to drive a single shot timer. This
|
||||
function is also guaranteed to return 0 for single frame cursors, so we
|
||||
can avoid starting the timer at all.
|
||||
|
||||
We wait for both the surface frame callback and the timer to fire before
|
||||
updating the cursor for the next frame of animation. This reduces our
|
||||
update rate to the frame rate of the cursor or the rate requested by the
|
||||
compositor, whichever is lower.
|
||||
|
||||
Change-Id: I10277460ebe9b547ebaf7f73424b9ef17614107f
|
||||
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
|
||||
---
|
||||
src/client/qwaylandinputdevice.cpp | 34 +++++++++++++++++++++++++++++++---
|
||||
src/client/qwaylandinputdevice_p.h | 5 +++++
|
||||
2 files changed, 36 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
|
||||
index 3b26dc42..3f0d61d6 100644
|
||||
--- a/src/client/qwaylandinputdevice.cpp
|
||||
+++ b/src/client/qwaylandinputdevice.cpp
|
||||
@@ -143,6 +143,12 @@ QWaylandWindow *QWaylandInputDevice::Keyboard::focusWindow() const
|
||||
QWaylandInputDevice::Pointer::Pointer(QWaylandInputDevice *seat)
|
||||
: mParent(seat)
|
||||
{
|
||||
+#if QT_CONFIG(cursor)
|
||||
+ mCursor.frameTimer.setSingleShot(true);
|
||||
+ mCursor.frameTimer.callOnTimeout([&]() {
|
||||
+ cursorTimerCallback();
|
||||
+ });
|
||||
+#endif
|
||||
}
|
||||
|
||||
QWaylandInputDevice::Pointer::~Pointer()
|
||||
@@ -224,7 +230,7 @@ public:
|
||||
if (animated) {
|
||||
m_frameCallback.reset(new WlCallback(frame(), [this](uint32_t time){
|
||||
Q_UNUSED(time);
|
||||
- m_pointer->updateCursor();
|
||||
+ m_pointer->cursorFrameCallback();
|
||||
}));
|
||||
}
|
||||
commit();
|
||||
@@ -328,7 +334,8 @@ void QWaylandInputDevice::Pointer::updateCursor()
|
||||
uint time = seat()->mCursor.animationTimer.elapsed();
|
||||
|
||||
if (struct ::wl_cursor *waylandCursor = mCursor.theme->cursor(shape)) {
|
||||
- int frame = wl_cursor_frame(waylandCursor, time);
|
||||
+ uint duration = 0;
|
||||
+ int frame = wl_cursor_frame_and_duration(waylandCursor, time, &duration);
|
||||
::wl_cursor_image *image = waylandCursor->images[frame];
|
||||
|
||||
struct wl_buffer *buffer = wl_cursor_image_get_buffer(image);
|
||||
@@ -339,7 +346,12 @@ void QWaylandInputDevice::Pointer::updateCursor()
|
||||
int bufferScale = mCursor.themeBufferScale;
|
||||
QPoint hotspot = QPoint(image->hotspot_x, image->hotspot_y) / bufferScale;
|
||||
QSize size = QSize(image->width, image->height) / bufferScale;
|
||||
- bool animated = waylandCursor->image_count > 1 && image->delay > 0;
|
||||
+ bool animated = duration > 0;
|
||||
+ if (animated) {
|
||||
+ mCursor.gotFrameCallback = false;
|
||||
+ mCursor.gotTimerCallback = false;
|
||||
+ mCursor.frameTimer.start(duration);
|
||||
+ }
|
||||
getOrCreateCursorSurface()->update(buffer, hotspot, size, bufferScale, animated);
|
||||
return;
|
||||
}
|
||||
@@ -354,6 +366,22 @@ CursorSurface *QWaylandInputDevice::Pointer::getOrCreateCursorSurface()
|
||||
return mCursor.surface.get();
|
||||
}
|
||||
|
||||
+void QWaylandInputDevice::Pointer::cursorTimerCallback()
|
||||
+{
|
||||
+ mCursor.gotTimerCallback = true;
|
||||
+ if (mCursor.gotFrameCallback) {
|
||||
+ updateCursor();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void QWaylandInputDevice::Pointer::cursorFrameCallback()
|
||||
+{
|
||||
+ mCursor.gotFrameCallback = true;
|
||||
+ if (mCursor.gotTimerCallback) {
|
||||
+ updateCursor();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
#endif // QT_CONFIG(cursor)
|
||||
|
||||
QWaylandInputDevice::Touch::Touch(QWaylandInputDevice *p)
|
||||
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h
|
||||
index 60d6f2c1..a567c57b 100644
|
||||
--- a/src/client/qwaylandinputdevice_p.h
|
||||
+++ b/src/client/qwaylandinputdevice_p.h
|
||||
@@ -286,6 +286,8 @@ public:
|
||||
int idealCursorScale() const;
|
||||
void updateCursorTheme();
|
||||
void updateCursor();
|
||||
+ void cursorTimerCallback();
|
||||
+ void cursorFrameCallback();
|
||||
CursorSurface *getOrCreateCursorSurface();
|
||||
#endif
|
||||
QWaylandInputDevice *seat() const { return mParent; }
|
||||
@@ -325,6 +327,9 @@ public:
|
||||
QWaylandCursorTheme *theme = nullptr;
|
||||
int themeBufferScale = 0;
|
||||
QScopedPointer<CursorSurface> surface;
|
||||
+ QTimer frameTimer;
|
||||
+ bool gotFrameCallback = false;
|
||||
+ bool gotTimerCallback = false;
|
||||
} mCursor;
|
||||
#endif
|
||||
QPointF mSurfacePos;
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From c2105d8b7e16cc934b886537968228f6300bf4bc Mon Sep 17 00:00:00 2001
|
||||
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
|
||||
Date: Fri, 8 Nov 2019 13:58:04 +0100
|
||||
Subject: Fix compilation of linuxdmabuf compositor plugin
|
||||
|
||||
Mesa's eglext.h no longer includes eglmesaext.h, so copy over the typedefs we need.
|
||||
|
||||
Fixes: QTBUG-79709
|
||||
Change-Id: I3190ef56e0e162636efea440dff7e760cf11fcd0
|
||||
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
||||
---
|
||||
.../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
|
||||
index 8554721e..02b5b6f8 100644
|
||||
--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
|
||||
+++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
|
||||
@@ -58,6 +58,10 @@
|
||||
#define DRM_FORMAT_MOD_INVALID fourcc_mod_code(NONE, DRM_FORMAT_RESERVED)
|
||||
#endif
|
||||
|
||||
+// Copied from eglmesaext.h
|
||||
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
|
||||
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
|
||||
+
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QWaylandCompositor;
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From a2be69d47884dd995ac6e9004ba2855f354f7522 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Sun, 15 Dec 2019 00:07:08 +0100
|
||||
Subject: Client: Fix detection of linux-dmabuf
|
||||
|
||||
Change I84c8c1008724b49b6bedb4fc3ef398e292f1c6c7 fixed the tests in
|
||||
compositor/configure.json but missed the test in client/configure.json.
|
||||
|
||||
Change-Id: I65ad424406438baa74ca80a9418e133510142118
|
||||
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
|
||||
---
|
||||
src/client/configure.json | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/client/configure.json b/src/client/configure.json
|
||||
index e9e16324..06213968 100644
|
||||
--- a/src/client/configure.json
|
||||
+++ b/src/client/configure.json
|
||||
@@ -74,7 +74,7 @@
|
||||
"label": "Linux dma-buf Buffer Sharing",
|
||||
"type": "compile",
|
||||
"test": "dmabuf_server_buffer",
|
||||
- "use": "egl"
|
||||
+ "use": "egl drm"
|
||||
},
|
||||
"vulkan-server-buffer": {
|
||||
"label": "Vulkan Buffer Sharing",
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
From 09861f0081e6729383808ac4803c7fd1f0ba6dd1 Mon Sep 17 00:00:00 2001
|
||||
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
|
||||
Date: Fri, 15 Nov 2019 11:52:46 +0100
|
||||
Subject: Fix detection of linux-dmabuf
|
||||
|
||||
On some systems drm_fourcc.h is not in /usr/include, but in
|
||||
/usr/include/libdrm, and that path can be found through pkg-config. This is
|
||||
already done with the drm lib in qtbase/src/configure.json so this just tells
|
||||
the test (and the plugins) to use the include paths for the existing "drm" lib.
|
||||
|
||||
Fixes: QTBUG-80075
|
||||
Change-Id: I84c8c1008724b49b6bedb4fc3ef398e292f1c6c7
|
||||
Reviewed-by: Andreas Cord-Landwehr <cordlandwehr@kde.org>
|
||||
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
|
||||
---
|
||||
src/compositor/configure.json | 4 ++--
|
||||
src/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri | 2 +-
|
||||
.../compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pri | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/compositor/configure.json b/src/compositor/configure.json
|
||||
index 46caceff..0dbb3364 100644
|
||||
--- a/src/compositor/configure.json
|
||||
+++ b/src/compositor/configure.json
|
||||
@@ -80,13 +80,13 @@
|
||||
"label": "Linux dma-buf Buffer Sharing",
|
||||
"type": "compile",
|
||||
"test": "dmabuf_server_buffer",
|
||||
- "use": "egl"
|
||||
+ "use": "egl drm"
|
||||
},
|
||||
"dmabuf-client-buffer": {
|
||||
"label": "Linux Client dma-buf Buffer Sharing",
|
||||
"type": "compile",
|
||||
"test": "dmabuf_client_buffer",
|
||||
- "use": "egl"
|
||||
+ "use": "egl drm"
|
||||
},
|
||||
"vulkan-server-buffer": {
|
||||
"label": "Vulkan Buffer Sharing",
|
||||
diff --git a/src/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri b/src/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri
|
||||
index 2df10109..41f483c4 100644
|
||||
--- a/src/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri
|
||||
+++ b/src/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri
|
||||
@@ -1,6 +1,6 @@
|
||||
INCLUDEPATH += $$PWD
|
||||
|
||||
-QMAKE_USE_PRIVATE += egl wayland-server
|
||||
+QMAKE_USE_PRIVATE += egl drm wayland-server
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/dmabufserverbufferintegration.cpp
|
||||
diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pri b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pri
|
||||
index a7630040..4dbbae19 100644
|
||||
--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pri
|
||||
+++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pri
|
||||
@@ -1,6 +1,6 @@
|
||||
INCLUDEPATH += $$PWD
|
||||
|
||||
-QMAKE_USE_PRIVATE += egl wayland-server
|
||||
+QMAKE_USE_PRIVATE += egl drm wayland-server
|
||||
|
||||
CONFIG += wayland-scanner
|
||||
WAYLANDSERVERSOURCES += $$PWD/../../../3rdparty/protocol/linux-dmabuf-unstable-v1.xml
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 80ed5501cf5dcc4b6ef2a1a126d9d564c1c73851 Mon Sep 17 00:00:00 2001
|
||||
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
|
||||
Date: Mon, 9 Dec 2019 11:06:18 +0100
|
||||
Subject: Client: Fix inverse repeat rate implementation
|
||||
|
||||
The rate from wl_keyboard.repeat_info was used as if it was an interval. Fixed
|
||||
by converting from key strokes per second to milliseconds per key stroke.
|
||||
|
||||
This fixes a regression, as repeat rate used to be hard-coded to something
|
||||
sensible before.
|
||||
|
||||
[ChangeLog][QPA plugin] Fixed keyboard repeat rate being set inversely, so
|
||||
higher rates would actually result in fewer characters per second, and vice
|
||||
versa.
|
||||
|
||||
Fixes: QTBUG-80613
|
||||
Change-Id: Ie783b90cba13dde6f37c0cd1be584d352cddfe7c
|
||||
Reviewed-by: David Edmundson <davidedmundson@kde.org>
|
||||
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
|
||||
---
|
||||
src/client/qwaylandinputdevice.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
|
||||
index d812918e..3b26dc42 100644
|
||||
--- a/src/client/qwaylandinputdevice.cpp
|
||||
+++ b/src/client/qwaylandinputdevice.cpp
|
||||
@@ -88,7 +88,7 @@ QWaylandInputDevice::Keyboard::Keyboard(QWaylandInputDevice *p)
|
||||
// or the server didn't send an enter event first.
|
||||
return;
|
||||
}
|
||||
- mRepeatTimer.setInterval(mRepeatRate);
|
||||
+ mRepeatTimer.setInterval(1000 / mRepeatRate);
|
||||
handleKey(mRepeatKey.time, QEvent::KeyRelease, mRepeatKey.key, mRepeatKey.modifiers,
|
||||
mRepeatKey.code, mRepeatKey.nativeVirtualKey, mRepeatKey.nativeModifiers,
|
||||
mRepeatKey.text, true);
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
<Summary>Provides APIs for Wayland</Summary>
|
||||
<Description>Provides APIs for Wayland</Description>
|
||||
<License>LGPLv2.1-linking-exception</License>
|
||||
<Archive sha1sum="3825365c59dc585d0174869a41808aa581aabc44" type="tarxz">http://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtwayland-everywhere-src-5.13.2.tar.xz</Archive>
|
||||
<Archive sha1sum="6dcc620039f6b586c575a61181d2f47514c1f4b4" type="tarxz">http://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtwayland-everywhere-src-5.14.0.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
|
||||
<Dependency versionFrom="5.13.2">qt5-declarative-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.0">qt5-base-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.0">qt5-declarative-devel</Dependency>
|
||||
<Dependency>libxkbcommon-devel</Dependency>
|
||||
<Dependency>xorg-server-xwayland</Dependency>
|
||||
<Dependency versionFrom="2.50.2">glib2-devel</Dependency>
|
||||
@@ -31,11 +31,12 @@
|
||||
<Dependency>wayland-cursor</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- <Patch level="1">qtbug-62044.patch</Patch> -->
|
||||
<!-- <Patch level="1">qtbug-66867.patch</Patch> -->
|
||||
<!-- <Patch level="1">qtbug-67150.patch</Patch> -->
|
||||
<!-- <Patch level="1">qtwayland-context-create.patch</Patch> -->
|
||||
<!-- <Patch level="1">qtwayland-key-compose.patch</Patch> -->
|
||||
<Patch level="1">qt5-wayland-animate-cursor.patch</Patch>
|
||||
<Patch level="1">qt5-wayland-cursor-timer.patch</Patch>
|
||||
<Patch level="1">qt5-wayland-libglvnd-egl.patch</Patch>
|
||||
<Patch level="1">qt5-wayland-linux-dmabuf-2.patch</Patch>
|
||||
<Patch level="1">qt5-wayland-linux-dmabuf.patch</Patch>
|
||||
<Patch level="1">qtbug-80613.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -47,7 +48,7 @@
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency versionFrom="2.7.1">freetype</Dependency>
|
||||
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
|
||||
<Dependency versionFrom="5.14.0">qt5-base</Dependency>
|
||||
<Dependency>fontconfig</Dependency>
|
||||
<Dependency>libXrender</Dependency>
|
||||
<Dependency>libxkbcommon</Dependency>
|
||||
@@ -55,7 +56,7 @@
|
||||
<Dependency>wayland-client</Dependency>
|
||||
<Dependency>wayland-cursor</Dependency>
|
||||
<Dependency>wayland-server</Dependency>
|
||||
<Dependency versionFrom="5.13.2">qt5-declarative</Dependency>
|
||||
<Dependency versionFrom="5.14.0">qt5-declarative</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
@@ -69,7 +70,7 @@
|
||||
<Name>qt5-wayland-devel</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">qt5-wayland</Dependency>
|
||||
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.0">qt5-base-devel</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/pkgconfig</Path>
|
||||
@@ -80,7 +81,7 @@
|
||||
<Package>
|
||||
<Name>qt5-wayland-docs</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
|
||||
<Dependency versionFrom="5.14.0">qt5-base</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
@@ -88,6 +89,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="17">
|
||||
<Date>2019-12-22</Date>
|
||||
<Version>5.14.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="16">
|
||||
<Date>2019-11-02</Date>
|
||||
<Version>5.13.2</Version>
|
||||
|
||||
Reference in New Issue
Block a user