Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtwayland for
openSUSE:Factory checked in at 2023-04-23 22:43:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwayland (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwayland.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwayland"
Sun Apr 23 22:43:30 2023 rev:50 rq:1082092 version:5.15.9+kde55
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwayland/libqt5-qtwayland.changes
2023-03-19 16:16:27.763288344 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtwayland.new.1533/libqt5-qtwayland.changes
2023-04-23 22:44:09.833592814 +0200
@@ -1,0 +2,10 @@
+Fri Apr 21 10:02:02 UTC 2023 - Fabian Vogt <[email protected]>
+
+- Update to version 5.15.8+kde70, rebased upstream:
+ * Don't keep eglConfig in hardwareintegration
+ * Update the window geometry when changing decorations
+ * Fix build with -no-feature-tabletevent
+ * Fix wayland touch event to use time stamp from wayland compositor
+ * wayland touch event to add key modifier
+
+-------------------------------------------------------------------
Old:
----
qtwayland-everywhere-src-5.15.8+kde63.obscpio
New:
----
qtwayland-everywhere-src-5.15.9+kde55.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwayland.spec ++++++
--- /var/tmp/diff_new_pack.f1QOQO/_old 2023-04-23 22:44:11.125600114 +0200
+++ /var/tmp/diff_new_pack.f1QOQO/_new 2023-04-23 22:44:11.129600136 +0200
@@ -22,11 +22,11 @@
%define qt5_snapshot 1
%define libname libQt5WaylandCompositor5
%define base_name libqt5
-%define real_version 5.15.8
-%define so_version 5.15.8
+%define real_version 5.15.9
+%define so_version 5.15.9
%define tar_version qtwayland-everywhere-src-%{version}
Name: libqt5-qtwayland
-Version: 5.15.8+kde63
+Version: 5.15.9+kde55
Release: 0
Summary: Qt 5 Wayland Addon
# The wayland compositor files are GPL-3.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.f1QOQO/_old 2023-04-23 22:44:11.165600340 +0200
+++ /var/tmp/diff_new_pack.f1QOQO/_new 2023-04-23 22:44:11.169600362 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.8+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.9+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtwayland.git</param>
<param name="scm">git</param>
<param name="filename">qtwayland-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.8-lts-lgpl</param>
+ <param name="parent-tag">v5.15.9-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.f1QOQO/_old 2023-04-23 22:44:11.189600475 +0200
+++ /var/tmp/diff_new_pack.f1QOQO/_new 2023-04-23 22:44:11.193600498 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://invent.kde.org/qt/qt/qtwayland.git</param>
- <param
name="changesrevision">df41e7e3e1f0e5495c5c8c52f1c9bb5a32b0da27</param></service></servicedata>
+ <param
name="changesrevision">c4c3fc69250c01cb35aaae5ea1ea2bcc8236dff0</param></service></servicedata>
(No newline at EOF)
++++++ qtwayland-everywhere-src-5.15.8+kde63.obscpio ->
qtwayland-everywhere-src-5.15.9+kde55.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.8+kde63/.qmake.conf
new/qtwayland-everywhere-src-5.15.9+kde55/.qmake.conf
--- old/qtwayland-everywhere-src-5.15.8+kde63/.qmake.conf 2023-03-09
13:51:37.000000000 +0100
+++ new/qtwayland-everywhere-src-5.15.9+kde55/.qmake.conf 2023-04-07
01:28:45.000000000 +0200
@@ -4,4 +4,4 @@
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
DEFINES += QT_NO_LINKED_LIST
-MODULE_VERSION = 5.15.8
+MODULE_VERSION = 5.15.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/client/client.pro
new/qtwayland-everywhere-src-5.15.9+kde55/src/client/client.pro
--- old/qtwayland-everywhere-src-5.15.8+kde63/src/client/client.pro
2023-03-09 13:51:37.000000000 +0100
+++ new/qtwayland-everywhere-src-5.15.9+kde55/src/client/client.pro
2023-04-07 01:28:45.000000000 +0200
@@ -53,7 +53,6 @@
qwaylandextendedsurface.cpp \
qwaylandsubsurface.cpp \
qwaylandsurface.cpp \
- qwaylandtabletv2.cpp \
qwaylandtouch.cpp \
qwaylandqtkey.cpp \
../shared/qwaylandmimehelper.cpp \
@@ -79,7 +78,6 @@
qwaylandextendedsurface_p.h \
qwaylandsubsurface_p.h \
qwaylandsurface_p.h \
- qwaylandtabletv2_p.h \
qwaylandtouch_p.h \
qwaylandqtkey_p.h \
qwaylandabstractdecoration_p.h \
@@ -99,6 +97,11 @@
SOURCES += qwaylandclipboard.cpp
}
+qtConfig(tabletevent) {
+ HEADERS += qwaylandtabletv2_p.h
+ SOURCES += qwaylandtabletv2.cpp
+}
+
include(hardwareintegration/hardwareintegration.pri)
include(shellintegration/shellintegration.pri)
include(inputdeviceintegration/inputdeviceintegration.pri)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/client/qwaylanddisplay.cpp
new/qtwayland-everywhere-src-5.15.9+kde55/src/client/qwaylanddisplay.cpp
--- old/qtwayland-everywhere-src-5.15.8+kde63/src/client/qwaylanddisplay.cpp
2023-03-09 13:51:37.000000000 +0100
+++ new/qtwayland-everywhere-src-5.15.9+kde55/src/client/qwaylanddisplay.cpp
2023-04-07 01:28:45.000000000 +0200
@@ -69,7 +69,9 @@
#include "qwaylandextendedsurface_p.h"
#include "qwaylandsubsurface_p.h"
#include "qwaylandtouch_p.h"
+#if QT_CONFIG(tabletevent)
#include "qwaylandtabletv2_p.h"
+#endif
#include "qwaylandqtkey_p.h"
#include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h>
@@ -510,8 +512,10 @@
mTouchExtension.reset(new QWaylandTouchExtension(this, id));
} else if (interface == QStringLiteral("zqt_key_v1")) {
mQtKeyExtension.reset(new QWaylandQtKeyExtension(this, id));
+#if QT_CONFIG(tabletevent)
} else if (interface == QStringLiteral("zwp_tablet_manager_v2")) {
mTabletManager.reset(new QWaylandTabletManagerV2(this, id, qMin(1,
int(version))));
+#endif
#if QT_CONFIG(wayland_client_primary_selection)
} else if (interface ==
QStringLiteral("zwp_primary_selection_device_manager_v1")) {
mPrimarySelectionManager.reset(new
QWaylandPrimarySelectionDeviceManagerV1(this, id, 1));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/client/qwaylanddisplay_p.h
new/qtwayland-everywhere-src-5.15.9+kde55/src/client/qwaylanddisplay_p.h
--- old/qtwayland-everywhere-src-5.15.8+kde63/src/client/qwaylanddisplay_p.h
2023-03-09 13:51:37.000000000 +0100
+++ new/qtwayland-everywhere-src-5.15.9+kde55/src/client/qwaylanddisplay_p.h
2023-04-07 01:28:45.000000000 +0200
@@ -99,7 +99,9 @@
#if QT_CONFIG(wayland_client_primary_selection)
class QWaylandPrimarySelectionDeviceManagerV1;
#endif
+#if QT_CONFIG(tabletevent)
class QWaylandTabletManagerV2;
+#endif
class QWaylandTouchExtension;
class QWaylandQtKeyExtension;
class QWaylandWindow;
@@ -166,7 +168,9 @@
QWaylandPrimarySelectionDeviceManagerV1 *primarySelectionManager() const {
return mPrimarySelectionManager.data(); }
#endif
QtWayland::qt_surface_extension *windowExtension() const { return
mWindowExtension.data(); }
+#if QT_CONFIG(tabletevent)
QWaylandTabletManagerV2 *tabletManager() const { return
mTabletManager.data(); }
+#endif
QWaylandTouchExtension *touchExtension() const { return
mTouchExtension.data(); }
QtWayland::zwp_text_input_manager_v2 *textInputManager() const { return
mTextInputManager.data(); }
QWaylandHardwareIntegration *hardwareIntegration() const { return
mHardwareIntegration.data(); }
@@ -257,7 +261,9 @@
QScopedPointer<QWaylandTouchExtension> mTouchExtension;
QScopedPointer<QWaylandQtKeyExtension> mQtKeyExtension;
QScopedPointer<QWaylandWindowManagerIntegration> mWindowManagerIntegration;
+#if QT_CONFIG(tabletevent)
QScopedPointer<QWaylandTabletManagerV2> mTabletManager;
+#endif
#if QT_CONFIG(wayland_client_primary_selection)
QScopedPointer<QWaylandPrimarySelectionDeviceManagerV1>
mPrimarySelectionManager;
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/client/qwaylandinputdevice.cpp
new/qtwayland-everywhere-src-5.15.9+kde55/src/client/qwaylandinputdevice.cpp
---
old/qtwayland-everywhere-src-5.15.8+kde63/src/client/qwaylandinputdevice.cpp
2023-03-09 13:51:37.000000000 +0100
+++
new/qtwayland-everywhere-src-5.15.9+kde55/src/client/qwaylandinputdevice.cpp
2023-04-07 01:28:45.000000000 +0200
@@ -50,7 +50,9 @@
#if QT_CONFIG(wayland_client_primary_selection)
#include "qwaylandprimaryselectionv1_p.h"
#endif
+#if QT_CONFIG(tabletevent)
#include "qwaylandtabletv2_p.h"
+#endif
#include "qwaylandtouch_p.h"
#include "qwaylandscreen_p.h"
#include "qwaylandcursor_p.h"
@@ -418,8 +420,10 @@
if (mQDisplay->textInputManager())
mTextInput.reset(new QWaylandTextInput(mQDisplay,
mQDisplay->textInputManager()->get_text_input(wl_seat())));
+#if QT_CONFIG(tabletevent)
if (auto *tm = mQDisplay->tabletManager())
mTabletSeat.reset(new QWaylandTabletSeatV2(tm, this));
+#endif
}
QWaylandInputDevice::~QWaylandInputDevice()
@@ -1355,7 +1359,7 @@
void QWaylandInputDevice::Touch::touch_up(uint32_t serial, uint32_t time,
int32_t id)
{
Q_UNUSED(serial);
- Q_UNUSED(time);
+ mParent->mTime = time;
mParent->handleTouchPoint(id, Qt::TouchPointReleased);
if (allTouchPointsReleased()) {
@@ -1374,8 +1378,8 @@
void QWaylandInputDevice::Touch::touch_motion(uint32_t time, int32_t id,
wl_fixed_t x, wl_fixed_t y)
{
- Q_UNUSED(time);
QPointF position(wl_fixed_to_double(x), wl_fixed_to_double(y));
+ mParent->mTime = time;
mParent->handleTouchPoint(id, Qt::TouchPointMoved, position);
}
@@ -1475,7 +1479,7 @@
return;
}
- QWindowSystemInterface::handleTouchEvent(window, mParent->mTouchDevice,
mPendingTouchPoints);
+ QWindowSystemInterface::handleTouchEvent(window, mParent->mTime,
mParent->mTouchDevice, mPendingTouchPoints, mParent->modifiers());
// Prepare state for next frame
const auto prevTouchPoints = mPendingTouchPoints;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/client/qwaylandinputdevice_p.h
new/qtwayland-everywhere-src-5.15.9+kde55/src/client/qwaylandinputdevice_p.h
---
old/qtwayland-everywhere-src-5.15.8+kde63/src/client/qwaylandinputdevice_p.h
2023-03-09 13:51:37.000000000 +0100
+++
new/qtwayland-everywhere-src-5.15.9+kde55/src/client/qwaylandinputdevice_p.h
2023-04-07 01:28:45.000000000 +0200
@@ -89,7 +89,9 @@
#if QT_CONFIG(wayland_client_primary_selection)
class QWaylandPrimarySelectionDeviceV1;
#endif
+#if QT_CONFIG(tabletevent)
class QWaylandTabletSeatV2;
+#endif
class QWaylandTextInput;
#if QT_CONFIG(cursor)
class QWaylandCursorTheme;
@@ -128,8 +130,10 @@
QWaylandPrimarySelectionDeviceV1 *primarySelectionDevice() const;
#endif
+#if QT_CONFIG(tabletevent)
void setTabletSeat(QWaylandTabletSeatV2 *tabletSeat);
QWaylandTabletSeatV2* tabletSeat() const;
+#endif
void setTextInput(QWaylandTextInput *textInput);
QWaylandTextInput *textInput() const;
@@ -187,7 +191,9 @@
Touch *mTouch = nullptr;
QScopedPointer<QWaylandTextInput> mTextInput;
+#if QT_CONFIG(tabletevent)
QScopedPointer<QWaylandTabletSeatV2> mTabletSeat;
+#endif
uint32_t mTime = 0;
uint32_t mSerial = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/client/qwaylandwindow.cpp
new/qtwayland-everywhere-src-5.15.9+kde55/src/client/qwaylandwindow.cpp
--- old/qtwayland-everywhere-src-5.15.8+kde63/src/client/qwaylandwindow.cpp
2023-03-09 13:51:37.000000000 +0100
+++ new/qtwayland-everywhere-src-5.15.9+kde55/src/client/qwaylandwindow.cpp
2023-04-07 01:28:45.000000000 +0200
@@ -877,7 +877,7 @@
QMargins m = frameMargins();
subsurf->set_position(pos.x() + m.left(), pos.y() + m.top());
}
- sendExposeEvent(QRect(QPoint(), geometry().size()));
+ setGeometry(geometry());
// This is a special case where the buffer is recreated, but since
// the content rect remains the same, the widgets remain the same
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
---
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
2023-03-09 13:51:37.000000000 +0100
+++
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
2023-04-07 01:28:45.000000000 +0200
@@ -185,14 +185,14 @@
m_count = window()->format().swapBehavior() ==
QSurfaceFormat::TripleBuffer ? 3 : 2;
- m_eglConfig = q_configFromGLFormat(m_eglIntegration->eglDisplay(),
brcmFixFormat(window()->format()), true, EGL_PIXMAP_BIT);
+ EGLConfig eglConfig = q_configFromGLFormat(m_eglIntegration->eglDisplay(),
brcmFixFormat(window()->format()), true, EGL_PIXMAP_BIT);
- m_format = q_glFormatFromConfig(m_eglIntegration->eglDisplay(),
m_eglConfig);
+ m_format = q_glFormatFromConfig(m_eglIntegration->eglDisplay(), eglConfig);
EGLint pixel_format = EGL_PIXEL_FORMAT_ARGB_8888_BRCM;
EGLint rt;
- eglGetConfigAttrib(m_eglIntegration->eglDisplay(), m_eglConfig,
EGL_RENDERABLE_TYPE, &rt);
+ eglGetConfigAttrib(m_eglIntegration->eglDisplay(), eglConfig,
EGL_RENDERABLE_TYPE, &rt);
if (rt & EGL_OPENGL_ES_BIT) {
pixel_format |= EGL_PIXEL_FORMAT_RENDER_GLES_BRCM;
@@ -228,7 +228,7 @@
EGL_NONE
};
- m_eglSurfaces[i] =
eglCreatePixmapSurface(m_eglIntegration->eglDisplay(), m_eglConfig,
(EGLNativePixmapType)&m_globalImages[5*i], attrs);
+ m_eglSurfaces[i] =
eglCreatePixmapSurface(m_eglIntegration->eglDisplay(), eglConfig,
(EGLNativePixmapType)&m_globalImages[5*i], attrs);
if (m_eglSurfaces[i] == EGL_NO_SURFACE)
qFatal("eglCreatePixmapSurface failed: %x, global image id: %d
%d\n", eglGetError(), m_globalImages[5*i], m_globalImages[5*i+1]);
m_buffers[i] = new QWaylandBrcmBuffer(mDisplay,
m_eglIntegration->waylandBrcm(), size, &m_globalImages[5*i], 5, m_eventQueue);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
---
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
2023-03-09 13:51:37.000000000 +0100
+++
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
2023-04-07 01:28:45.000000000 +0200
@@ -77,8 +77,6 @@
const QWaylandWindow *m_parentWindow = nullptr;
- EGLConfig m_eglConfig = 0;
-
EGLint m_globalImages[3*5];
EGLSurface m_eglSurfaces[3];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
---
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
2023-03-09 13:51:37.000000000 +0100
+++
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
2023-04-07 01:28:45.000000000 +0200
@@ -58,17 +58,8 @@
QWaylandEglWindow::QWaylandEglWindow(QWindow *window, QWaylandDisplay *display)
: QWaylandWindow(window, display)
, m_clientBufferIntegration(static_cast<QWaylandEglClientBufferIntegration
*>(mDisplay->clientBufferIntegration()))
+ , m_format(window->requestedFormat())
{
- QSurfaceFormat fmt = window->requestedFormat();
- if (mDisplay->supportsWindowDecoration())
- fmt.setAlphaBufferSize(8);
- m_eglConfig =
q_configFromGLFormat(m_clientBufferIntegration->eglDisplay(), fmt);
- m_format = q_glFormatFromConfig(m_clientBufferIntegration->eglDisplay(),
m_eglConfig, fmt);
-
- // Do not create anything from here. This platform window may belong to a
- // RasterGLSurface window which may have pure raster content. In this
case, where the
- // window is never actually made current, creating a wl_egl_window and EGL
surface
- // should be avoided.
}
QWaylandEglWindow::~QWaylandEglWindow()
@@ -147,7 +138,13 @@
if (!m_eglSurface && m_waylandEglWindow && create) {
EGLNativeWindowType eglw = (EGLNativeWindowType)
m_waylandEglWindow;
- m_eglSurface =
eglCreateWindowSurface(m_clientBufferIntegration->eglDisplay(), m_eglConfig,
eglw, 0);
+ QSurfaceFormat fmt = window()->requestedFormat();
+
+ if (mDisplay->supportsWindowDecoration())
+ fmt.setAlphaBufferSize(8);
+ EGLConfig eglConfig =
q_configFromGLFormat(m_clientBufferIntegration->eglDisplay(), fmt);
+ m_format =
q_glFormatFromConfig(m_clientBufferIntegration->eglDisplay(), eglConfig);
+ m_eglSurface =
eglCreateWindowSurface(m_clientBufferIntegration->eglDisplay(), eglConfig,
eglw, 0);
if (Q_UNLIKELY(m_eglSurface == EGL_NO_SURFACE))
qCWarning(lcQpaWayland, "Could not create EGL surface (EGL
error 0x%x)\n", eglGetError());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
---
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
2023-03-09 13:51:37.000000000 +0100
+++
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
2023-04-07 01:28:45.000000000 +0200
@@ -83,7 +83,6 @@
const QWaylandWindow *m_parentWindow = nullptr;
EGLSurface m_eglSurface = EGL_NO_SURFACE;
- EGLConfig m_eglConfig;
mutable bool m_resize = false;
mutable QOpenGLFramebufferObject *m_contentFBO = nullptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
---
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
2023-03-09 13:51:37.000000000 +0100
+++
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
2023-04-07 01:28:45.000000000 +0200
@@ -57,7 +57,6 @@
QWaylandXCompositeEGLWindow::QWaylandXCompositeEGLWindow(QWindow *window,
QWaylandXCompositeEGLClientBufferIntegration *glxIntegration)
: QWaylandWindow(window, glxIntegration->waylandDisplay())
, m_glxIntegration(glxIntegration)
- , m_config(q_configFromGLFormat(glxIntegration->eglDisplay(),
window->format(), true, EGL_WINDOW_BIT | EGL_PIXMAP_BIT))
{
}
@@ -98,7 +97,9 @@
XDestroyWindow(m_glxIntegration->xDisplay(), m_xWindow);
}
- VisualID visualId =
QXlibEglIntegration::getCompatibleVisualId(m_glxIntegration->xDisplay(),
m_glxIntegration->eglDisplay(), m_config);
+ EGLConfig eglConfig = q_configFromGLFormat(m_glxIntegration->eglDisplay(),
window()->format(), true, EGL_WINDOW_BIT | EGL_PIXMAP_BIT);
+
+ VisualID visualId =
QXlibEglIntegration::getCompatibleVisualId(m_glxIntegration->xDisplay(),
m_glxIntegration->eglDisplay(), eglConfig);
XVisualInfo visualInfoTemplate;
memset(&visualInfoTemplate, 0, sizeof(XVisualInfo));
@@ -118,7 +119,7 @@
XCompositeRedirectWindow(m_glxIntegration->xDisplay(), m_xWindow,
CompositeRedirectManual);
XMapWindow(m_glxIntegration->xDisplay(), m_xWindow);
- m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(),
m_config, reinterpret_cast<EGLNativeWindowType>(m_xWindow), nullptr);
+ m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(),
eglConfig, reinterpret_cast<EGLNativeWindowType>(m_xWindow), nullptr);
if (m_surface == EGL_NO_SURFACE) {
qFatal("Could not make eglsurface");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
---
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
2023-03-09 13:51:37.000000000 +0100
+++
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
2023-04-07 01:28:45.000000000 +0200
@@ -69,7 +69,6 @@
QWaylandBuffer *m_buffer = nullptr;
Window m_xWindow = 0;
- EGLConfig m_config;
EGLSurface m_surface = EGL_NO_SURFACE;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp
---
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp
2023-03-09 13:51:37.000000000 +0100
+++
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp
2023-04-07 01:28:45.000000000 +0200
@@ -54,7 +54,6 @@
QWaylandXCompositeGLXWindow::QWaylandXCompositeGLXWindow(QWindow *window,
QWaylandXCompositeGLXIntegration *glxIntegration)
: QWaylandWindow(window, glxIntegration->waylandDisplay())
, m_glxIntegration(glxIntegration)
- , m_config(qglx_findConfig(glxIntegration->xDisplay(),
glxIntegration->screen(), window->format(), GLX_WINDOW_BIT | GLX_PIXMAP_BIT))
{
}
@@ -95,7 +94,8 @@
return;
}
- XVisualInfo *visualInfo =
glXGetVisualFromFBConfig(m_glxIntegration->xDisplay(), m_config);
+ GLXFBConfig glxConfig = qglx_findConfig(m_glxIntegration->xDisplay(),
m_glxIntegration->screen(), window()->format(), GLX_WINDOW_BIT |
GLX_PIXMAP_BIT);
+ XVisualInfo *visualInfo =
glXGetVisualFromFBConfig(m_glxIntegration->xDisplay(), glxConfig);
Colormap cmap = XCreateColormap(m_glxIntegration->xDisplay(),
m_glxIntegration->rootWindow(),
visualInfo->visual, AllocNone);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
---
old/qtwayland-everywhere-src-5.15.8+kde63/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
2023-03-09 13:51:37.000000000 +0100
+++
new/qtwayland-everywhere-src-5.15.9+kde55/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
2023-04-07 01:28:45.000000000 +0200
@@ -70,7 +70,6 @@
QWaylandXCompositeGLXIntegration *m_glxIntegration = nullptr;
Window m_xWindow = 0;
- GLXFBConfig m_config;
QWaylandBuffer *mBuffer = nullptr;
};
++++++ qtwayland-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.f1QOQO/_old 2023-04-23 22:44:11.581602690 +0200
+++ /var/tmp/diff_new_pack.f1QOQO/_new 2023-04-23 22:44:11.585602713 +0200
@@ -1,5 +1,5 @@
name: qtwayland-everywhere-src
-version: 5.15.8+kde63
-mtime: 1678366297
-commit: df41e7e3e1f0e5495c5c8c52f1c9bb5a32b0da27
+version: 5.15.9+kde55
+mtime: 1680823725
+commit: c4c3fc69250c01cb35aaae5ea1ea2bcc8236dff0
