mawei/agnos-builder
1
0
Fork 0
mirror of https://github.com/commaai/agnos-builder.git synced 2026-09-27 01:43:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleaned compile-qtwayland5.sh and removed 5.15 patch

Browse Source
This commit is contained in:
Andrei Radulescu
2024-08-07 13:26:40 +03:00
parent 77a6079a9f
commit be6527356e
2 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
userspace/compile-qtwayland5.sh
+1 -2
View File
@@ -2,11 +2,10 @@
# Patched qtwayland that outputs a fixed screen size
# Clone qtwayland submodule, checkout, apply patch, qmake, make
# VERSION=5.15.13-lts-lgpl
VERSION=5.12.9
cd /tmp
git clone --branch v${VERSION} https://github.com/qt/qtwayland.git
git clone --branch v${VERSION} --depth 1 https://github.com/qt/qtwayland.git
cd qtwayland
git apply /tmp/agnos/patch-qtwayland-v5.12
userspace/qtwayland/patch-qtwayland-v5.15
-25
View File
@@ -1,25 +0,0 @@
diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp
index 6cb337d..9e3cc30 100644
--- a/src/client/qwaylandscreen.cpp
+++ b/src/client/qwaylandscreen.cpp
@@ -127,6 +127,7 @@ QString QWaylandScreen::model() const
QRect QWaylandScreen::geometry() const
{
+ return QRect(0, 0, 2160, 1080);
if (zxdg_output_v1::isInitialized()) {
return mXdgGeometry;
} else {
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
index 4e4ea11..d819ae9 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
@@ -79,7 +79,7 @@ void QWaylandEglClientBufferIntegration::initialize(QWaylandDisplay *display)
#if QT_CONFIG(egl_extension_platform_wayland)
m_eglDisplay = eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT, display->wl_display(), nullptr);
#else
- if (q_hasEglExtension(EGL_NO_DISPLAY, "EGL_EXT_platform_base")) {
+ if (false && q_hasEglExtension(EGL_NO_DISPLAY, "EGL_EXT_platform_base")) {
if (q_hasEglExtension(EGL_NO_DISPLAY, "EGL_KHR_platform_wayland") ||
q_hasEglExtension(EGL_NO_DISPLAY, "EGL_EXT_platform_wayland") ||
q_hasEglExtension(EGL_NO_DISPLAY, "EGL_MESA_platform_wayland")) {