Vulkan prep and some cleanup
cover Vulkan prep and some cleanup
From: Randolph Sapp <[email protected]>
Enable limited x11 support to help with the Vulkan WSI layers. Adjust PACKAGECONFIG strings for a few packages so they still prefer the Wayland backend properly and still use GLES instead of GL.
Also attempt a little bit of patch cleanup. Expect a few more cleanup patches with the non-root Weston patchset when that comes out.
Randolph Sapp (6):
arago.conf: drop the explicit removal of x11, add vulkan
qtwayland: override the packageconfig to prefer wayland
qtwayland: drop the fix-wayland-texture-sharing patch
qtwayland: drop the plugins-decorations patch
qtwayland: add comment about why this append exists
glfw: convert to append and drop patches
meta-arago-distro/conf/distro/arago.conf | 4 +- ...land-texture-sharing-custom-composit.patch | 52 ------------------- ...ons-bradient-display-window-icon-onl.patch | 42 --------------- .../recipes-qt/qt5/qtwayland_git.bbappend | 9 ++-- ...xt-remove-check-for-Wayland-Egl-prov.patch | 27 ---------- .../recipes-graphics/glfw/glfw_%.bbappend | 6 +++ .../recipes-graphics/glfw/glfw_git.bb | 24 --------- 7 files changed, 10 insertions(+), 154 deletions(-) delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch delete mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch create mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend delete mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_git.bb
Signature · 1 line
2.40.0
PATCH 1/6 arago.conf: drop the explicit removal of x11, add vulkan
From: Randolph Sapp <[email protected]>
Drop the explicit removal of x11 as the new PVR Vulkan libs have runtime dependencies on libx11.
Add vulkan as a distro feature.
--- meta-arago-distro/conf/distro/arago.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
meta-arago-distro/conf/distro/arago.conf +1 -3
@@ -45,12 +45,10 @@ TMPDIR .= "${TCMODEAPPEND}" # Start with default set of distro features DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}" -# Remove some unwanted features -DISTRO_FEATURES:remove = "x11" - # Add additional distro features DISTRO_FEATURES:append = " pam wayland opengl" #DISTRO_FEATURES:append = " opencl" +DISTRO_FEATURES:append = " vulkan" DISTRO_FEATURES:append = " opencv" DISTRO_FEATURES:append = " openmp"
Signature · 1 line
2.40.0
Re: [meta-arago][master/kirkstone][PATCH 1/6] arago.conf: drop the explicit removal of x11, add vulkan
Quoted 17 lines · On 4/26/23 4:32 PM, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Drop the explicit removal of x11 as the new PVR Vulkan libs have runtime dependencies on libx11.
Add vulkan as a distro feature.
Signed-off-by Randolph Sapp <[email protected]>--- meta-arago-distro/conf/distro/arago.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)meta-arago-distro/conf/distro/arago.conf +0
-0
meta-arago-distro/conf/distro/arago.conf TMPDIR .= "${TCMODEAPPEND}" · line 49
Quoted 5 lines
meta-arago-distro/conf/distro/arago.conf +0
-2@@ -45,12 +45,10 @@ TMPDIR .= "${TCMODEAPPEND}" # Start with default set of distro features DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}" -# Remove some unwanted features -DISTRO_FEATURES:remove = "x11"
This is probably fine, but to get it to work on our SGX platforms I also needed:
PACKAGECONFIG:remove:pn-xserver-xorg = "dri3" PACKAGECONFIG:remove:pn-xserver-xorg = "xshmfence" PACKAGECONFIG:remove:pn-xserver-xorg = "glx" PACKAGECONFIG:remove:pn-cairo = "opengl" PACKAGECONFIG:remove:pn-libepoxy = "x11" PACKAGECONFIG:remove:pn-mesa-demos = "gbm" PACKAGECONFIG:remove:pn-mesa-demos = "wayland" PACKAGECONFIG:remove:pn-mesa-demos = "glew" PACKAGECONFIG:remove:pn-mesa-demos = "glu"
To prevent any of these trying to build against desktop OpenGL or GLESv3.
meta-arago-distro/conf/distro/arago.conf TMPDIR .= "${TCMODEAPPEND}" · line 51
Quoted 5 lines
meta-arago-distro/conf/distro/arago.conf +1
-1- # Add additional distro features DISTRO_FEATURES:append = " pam wayland opengl" #DISTRO_FEATURES:append = " opencl" +DISTRO_FEATURES:append = " vulkan"
You going to add Vulkan support to SGX? You do remember we have to turn that back on at some point...
Ideally, like "opengl", these should become machine features, not distro.
Andrew
Quoted 3 lines
meta-arago-distro/conf/distro/arago.conf +0
-0DISTRO_FEATURES:append = " opencv" DISTRO_FEATURES:append = " openmp"
Re: [meta-arago][master/kirkstone][PATCH 1/6] arago.conf: drop the explicit removal of x11, add vulkan
Quoted 47 lines · Andrew Davis
Quoted 19 lines · On 4/26/23 4:32 PM, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Drop the explicit removal of x11 as the new PVR Vulkan libs have runtime dependencies on libx11.
Add vulkan as a distro feature.
Signed-off-by Randolph Sapp <[email protected]>---
meta-arago-distro/conf/distro/arago.conf| 4 +---1 file changed, 1 insertion(+), 3 deletions(-)meta-arago-distro/conf/distro/arago.conf +0
-0@@ -45,12 +45,10 @@ TMPDIR .= "${TCMODEAPPEND}" # Start with default set of distro features
DISTRO_FEATURES= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"meta-arago-distro/conf/distro/arago.conf TMPDIR .= "${TCMODEAPPEND}" · line 49
Quoted 2 lines
meta-arago-distro/conf/distro/arago.conf +0
-2-# Remove some unwanted features -DISTRO_FEATURES:remove = "x11"This is probably fine, but to get it to work on our SGX platforms I also needed:
PACKAGECONFIG:remove:pn-xserver-xorg = "dri3" PACKAGECONFIG:remove:pn-xserver-xorg = "xshmfence" PACKAGECONFIG:remove:pn-xserver-xorg = "glx" PACKAGECONFIG:remove:pn-cairo = "opengl" PACKAGECONFIG:remove:pn-libepoxy = "x11" PACKAGECONFIG:remove:pn-mesa-demos = "gbm" PACKAGECONFIG:remove:pn-mesa-demos = "wayland" PACKAGECONFIG:remove:pn-mesa-demos = "glew" PACKAGECONFIG:remove:pn-mesa-demos = "glu"
To prevent any of these trying to build against desktop OpenGL or GLESv3.
Quoted 5 lines
-
# Add additional distro features
DISTRO_FEATURES:append = " pam wayland opengl"
#DISTRO_FEATURES:append = " opencl"
+DISTRO_FEATURES:append = " vulkan"You going to add Vulkan support to SGX? You do remember we have to turn that back on at some point...
Quoted 6 lines
Ideally, like "opengl", these should become machine features, not distro.
Andrew
Quoted 2 lines
DISTRO_FEATURES:append = " opencv"
DISTRO_FEATURES:append = " openmp"
Invalid arg. Enabling vulkan doesn't have the same effect is enabling opengl. It changes compilation flags but right now all userspace tools that we care about are capable of switching backends at runtime. SGX doesn't have a vulkan driver so it should fail-over to gl automatically.
PATCH 2/6 qtwayland: override the packageconfig to prefer wayland
In reply to [email protected]From: Randolph Sapp <[email protected]>
While we're allowing X to exist now, we are by no means prefering it. Set the PACKAGECONFIG to remove the X specific components.
--- meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend | 2 ++ 1 file changed, 2 insertions(+)
meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +2 -0
@@ -5,3 +5,5 @@ SRC_URI += " \ file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \ file://0001-examples-fix-wayland-texture-sharing-custom-composit.patch \ " + +PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx"
Signature · 1 line
2.40.0
PATCH 3/6 qtwayland: drop the fix-wayland-texture-sharing patch
In reply to [email protected]From: Randolph Sapp <[email protected]>
Meta-qt is now providing a version of qtwayland that already has this patch applied.
--- ...land-texture-sharing-custom-composit.patch | 52 ------------------- .../recipes-qt/qt5/qtwayland_git.bbappend | 1 - 2 files changed, 53 deletions(-) delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch
meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch deleted +0 -52
@@ -1,52 +0,0 @@ -From 1d18591d9e7ed9b3580e06c37be23bfde24bc30c Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <[email protected]> -Date: Fri, 3 Apr 2020 22:40:29 +0200 -Subject: [PATCH] examples: fix wayland/texture-sharing/custom-compositor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - main.cpp:83:33: error: ‘GL_RGBA8’ was not declared in this scope; did you mean ‘GL_RGBA4’? - 83 | *glInternalFormat = GL_RGBA8; - | ^~~~~~~~ - | GL_RGBA4 - main.cpp:120:33: error: ‘GL_RGBA8’ was not declared in this scope; did you mean ‘GL_RGBA4’? - 120 | *glInternalFormat = GL_RGBA8; - | ^~~~~~~~ - | GL_RGBA4 - -Task-number: QTBUG-83304 -Change-Id: I0515f3303b08c405d162986e280e9a7bd35e28f7 -Reviewed-by: Laszlo Agocs <[email protected]> -Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]> - -Upstream-Status: Backport [1d18591d9e7ed9b3580e06c37be23bfde24bc30c] - -The patch is backport from upstream commit - -1d18591d9e7ed9b3580e06c37be23bfde24bc30c - -Signed-off-by: Gowtham Tammana <[email protected]> ---- - examples/wayland/texture-sharing/custom-compositor/main.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/examples/wayland/texture-sharing/custom-compositor/main.cpp b/examples/wayland/texture-sharing/custom-compositor/main.cpp -index a39c8c38..af375024 100644 ---- a/examples/wayland/texture-sharing/custom-compositor/main.cpp -+++ b/examples/wayland/texture-sharing/custom-compositor/main.cpp -@@ -63,6 +63,10 @@ - - #include "QtWaylandCompositor/private/qwltexturesharingextension_p.h" - -+#ifndef GL_RGBA8 -+#define GL_RGBA8 0x8058 -+#endif -+ - class CustomSharingExtension : public QWaylandTextureSharingExtension - { - Q_OBJECT --- -2.17.1 -
meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +0 -1
@@ -3,7 +3,6 @@ PR:append = ".arago2" SRC_URI += " \ file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \ - file://0001-examples-fix-wayland-texture-sharing-custom-composit.patch \ " PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx"
Signature · 1 line
2.40.0
PATCH 4/6 qtwayland: drop the plugins-decorations patch
In reply to [email protected]From: Randolph Sapp <[email protected]>
This seems like it was a needless patch to guard against garbage from being shown if the window icon request failed to return any useful icon. Not necessary.
--- ...ons-bradient-display-window-icon-onl.patch | 42 ------------------- .../recipes-qt/qt5/qtwayland_git.bbappend | 4 -- 2 files changed, 46 deletions(-) delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch
meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patch deleted +0 -42
@@ -1,42 +0,0 @@ -From 547fd678ba55025c3578f021b40c96b1e91b839e Mon Sep 17 00:00:00 2001 -From: Eric Ruei <[email protected]> -Date: Fri, 9 Sep 2016 16:54:02 -0400 -Subject: [PATCH] plugins/decorations/bradient: display window icon only if - icon.pixmap not null - -Signed-off-by: Eric Ruei <[email protected]> ---- - src/plugins/decorations/bradient/main.cpp | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/plugins/decorations/bradient/main.cpp b/src/plugins/decorations/bradient/main.cpp -index ea29869..279bff1 100644 ---- a/src/plugins/decorations/bradient/main.cpp -+++ b/src/plugins/decorations/bradient/main.cpp -@@ -222,13 +222,16 @@ void QWaylandBradientDecoration::paint(QPaintDevice *device) - // Window icon - QIcon icon = waylandWindow()->windowIcon(); - if (!icon.isNull()) { -- QPixmap pixmap = icon.pixmap(QSize(128, 128)); -- QPixmap scaled = pixmap.scaled(22, 22, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); -- -- QRectF iconRect(0, 0, 22, 22); -- p.drawPixmap(iconRect.adjusted(margins().left() + BUTTON_SPACING, 4, -- margins().left() + BUTTON_SPACING, 4), -- scaled, iconRect); -+ QPixmap pixmap = icon.pixmap(QSize(128, 128)); -+ if(!pixmap.isNull()) -+ { -+ QPixmap scaled = pixmap.scaled(22, 22, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); -+ -+ QRectF iconRect(0, 0, 22, 22); -+ p.drawPixmap(iconRect.adjusted(margins().left() + BUTTON_SPACING, 4, -+ margins().left() + BUTTON_SPACING, 4), -+ scaled, iconRect); -+ } - } - - // Window title --- -1.9.1 -
meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +0 -4
@@ -1,8 +1,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PR:append = ".arago2" -SRC_URI += " \ - file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \ -" - PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx"
Signature · 1 line
2.40.0
PATCH 5/6 qtwayland: add comment about why this append exists
In reply to [email protected]From: Randolph Sapp <[email protected]>
Add some info about why this bbappend still exists. It's to prefer wayland over x11 and remove some unoptimized components.
--- meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +2 -2
@@ -1,4 +1,4 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -PR:append = ".arago2" +# This append exists to modify the PACKAGECONFIG such that the wayland backend +# is preferred over x11 and unoptimized components are removed. PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx"
Signature · 1 line
2.40.0
Re: [meta-arago][master/kirkstone][PATCH 5/6] qtwayland: add comment about why this append exists
Quoted 15 lines · On 4/26/23 4:32 PM, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Add some info about why this bbappend still exists. It's to prefer wayland over x11 and remove some unoptimized components.
Signed-off-by Randolph Sapp <[email protected]>--- meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +0
-0
meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend line 1
Quoted 1 line
meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +0
-1@@ -1,4 +1,4 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
This above line can be removed when you removed the last carried patch, squash into the last patch.
meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend line 2
Quoted 1 line
meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +0
-1-PR:append = ".arago2"
Since you are changing this package from the default, it is usually a good idea to keep this line, so it is clear this is a "Arago" version of this package.
And since this package was changed in your last patch (probably not in a noticeable way but still..) you should bump the version .arago3
Andrew
Quoted 4 lines
meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +2
-0+# This append exists to modify the PACKAGECONFIG such that the wayland backend +# is preferred over x11 and unoptimized components are removed. PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx"
PATCH 6/6 HACK: glfw: convert to append and drop patches
In reply to [email protected]From: Randolph Sapp <[email protected]>
A reasonable version of glfw is now provided by meta-oe. Also the EGL version this package needs to build a against can be satisfied by Mesa EGL so this old patch isn't required anymore.
Add a PACKAGECONFIG variable for wayland and use it. This append can be dropped when meta-oe accpets my PACKAGECONFIG patch [1].
[1] https://lists.openembedded.org/g/openembedded-devel/message/102202
--- ...xt-remove-check-for-Wayland-Egl-prov.patch | 27 ------------------- .../recipes-graphics/glfw/glfw_%.bbappend | 6 +++++ .../recipes-graphics/glfw/glfw_git.bb | 24 ----------------- 3 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch create mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend delete mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_git.bb
meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From c6e30af80018f7a6fc7b8b0e810718f4bd646cf6 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Thu, 12 Apr 2018 12:29:39 -0400 -Subject: [PATCH] HACK: CMakeList.txt: remove check for Wayland-Egl, provided - by SGX libs - -Signed-off-by: Denys Dmytriyenko <[email protected]> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f5d6ef..eaf780f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -266,7 +266,7 @@ if (_GLFW_WAYLAND) - find_package(ECM REQUIRED NO_MODULE) - list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") - -- find_package(Wayland REQUIRED Client Cursor Egl) -+ find_package(Wayland REQUIRED Client Cursor) - find_package(WaylandScanner REQUIRED) - find_package(WaylandProtocols 1.12 REQUIRED) - --- -2.7.4 -
meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend new file +6 -0
@@ -0,0 +1,6 @@ +# Add some wayland configuration options until meta-oe adds some good +# PACKAGECONFIGS + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon" + +PACKAGECONFIG += " wayland"
meta-arago-extras/recipes-graphics/glfw/glfw_git.bb deleted +0 -24
@@ -1,24 +0,0 @@ -SUMMARY = "GLFW cross platform graphics framework" -DESCRIPTION = "A multi-platform library for OpenGL and OpenGLES, window and input" -HOMEPAGE = "http://glfw.org/" -LICENSE = "Zlib & Libpng" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=90c6dd54408744b0f8a55f2a6c7ad870" - -PV = "3.2.1+git${SRCPV}" -PR = "r0" - -BRANCH = "master" -SRC_URI = "git://github.com/glfw/glfw.git;protocol=https;branch=${BRANCH}" -SRCREV = "0a3c4f5d80b041ee1a12c8da3503653d98bd1a15" - -SRC_URI += "file://0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch" - -DEPENDS = "extra-cmake-modules glib-2.0 virtual/libgles2 virtual/egl weston wayland wayland-native wayland-protocols" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -EXTRA_OECMAKE += "-DGLFW_USE_WAYLAND=ON -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF" - -FILES:${PN}-dev += "${libdir}/cmake"
Signature · 1 line
2.40.0
PATCH 6/6 glfw: convert to append and drop patches
In reply to [email protected]From: Randolph Sapp <[email protected]>
A reasonable version of glfw is now provided by meta-oe. Also the EGL version this package needs to build a against can be satisfied by Mesa EGL so this old patch isn't required anymore.
Add a PACKAGECONFIG variable for wayland and use it. This append can be dropped entirely when meta-oe accepts my PACKAGECONFIG patch [1].
[1] https://lists.openembedded.org/g/openembedded-devel/message/102202
--- ...xt-remove-check-for-Wayland-Egl-prov.patch | 27 ------------------- .../recipes-graphics/glfw/glfw_%.bbappend | 6 +++++ .../recipes-graphics/glfw/glfw_git.bb | 24 ----------------- 3 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch create mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend delete mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_git.bb
meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From c6e30af80018f7a6fc7b8b0e810718f4bd646cf6 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Thu, 12 Apr 2018 12:29:39 -0400 -Subject: [PATCH] HACK: CMakeList.txt: remove check for Wayland-Egl, provided - by SGX libs - -Signed-off-by: Denys Dmytriyenko <[email protected]> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f5d6ef..eaf780f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -266,7 +266,7 @@ if (_GLFW_WAYLAND) - find_package(ECM REQUIRED NO_MODULE) - list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") - -- find_package(Wayland REQUIRED Client Cursor Egl) -+ find_package(Wayland REQUIRED Client Cursor) - find_package(WaylandScanner REQUIRED) - find_package(WaylandProtocols 1.12 REQUIRED) - --- -2.7.4 -
meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend new file +6 -0
@@ -0,0 +1,6 @@ +# Add some wayland configuration options until meta-oe adds some good +# PACKAGECONFIGS + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon" + +PACKAGECONFIG += " wayland"
meta-arago-extras/recipes-graphics/glfw/glfw_git.bb deleted +0 -24
@@ -1,24 +0,0 @@ -SUMMARY = "GLFW cross platform graphics framework" -DESCRIPTION = "A multi-platform library for OpenGL and OpenGLES, window and input" -HOMEPAGE = "http://glfw.org/" -LICENSE = "Zlib & Libpng" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=90c6dd54408744b0f8a55f2a6c7ad870" - -PV = "3.2.1+git${SRCPV}" -PR = "r0" - -BRANCH = "master" -SRC_URI = "git://github.com/glfw/glfw.git;protocol=https;branch=${BRANCH}" -SRCREV = "0a3c4f5d80b041ee1a12c8da3503653d98bd1a15" - -SRC_URI += "file://0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch" - -DEPENDS = "extra-cmake-modules glib-2.0 virtual/libgles2 virtual/egl weston wayland wayland-native wayland-protocols" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -EXTRA_OECMAKE += "-DGLFW_USE_WAYLAND=ON -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF" - -FILES:${PN}-dev += "${libdir}/cmake"
Signature · 1 line
2.40.0
Re: [meta-arago][master/kirkstone][PATCH 6/6] glfw: convert to append and drop patches
Quoted 6 lines · On 4/26/23 4:32 PM, [email protected] wrote:
From: Randolph Sapp <[email protected]>
A reasonable version of glfw is now provided by meta-oe. Also the EGL version this package needs to build a against can be satisfied by Mesa EGL so this old patch isn't required anymore.
Quoted 7 lines
Add a PACKAGECONFIG variable for wayland and use it. This append can be dropped entirely when meta-oe accepts my PACKAGECONFIG patch [1].
[1] https://lists.openembedded.org/g/openembedded-devel/message/102202
Signed-off-by Randolph Sapp <[email protected]>---
Seems reasonable,
Quoted 83 lines
...xt-remove-check-for-Wayland-Egl-prov.patch | 27 ------------------- .../recipes-graphics/glfw/glfw_%.bbappend | 6 +++++ .../recipes-graphics/glfw/glfw_git.bb | 24 ----------------- 3 files changed, 6 insertions(+), 51 deletions(-)delete mode 100644
meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patchcreate mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend
delete mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_git.bbmeta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch deleted +0
-27@@ -1,27 +0,0 @@ -From c6e30af80018f7a6fc7b8b0e810718f4bd646cf6 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Thu, 12 Apr 2018 12:29:39 -0400 -Subject: [PATCH] HACK: CMakeList.txt: remove check for Wayland-Egl, provided - by SGX libs - -Signed-off-by: Denys Dmytriyenko <[email protected]> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f5d6ef..eaf780f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -266,7 +266,7 @@ if (_GLFW_WAYLAND) - find_package(ECM REQUIRED NO_MODULE) - list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") - -- find_package(Wayland REQUIRED Client Cursor Egl) -+ find_package(Wayland REQUIRED Client Cursor) - find_package(WaylandScanner REQUIRED) - find_package(WaylandProtocols 1.12 REQUIRED) - --- -2.7.4 -meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend new file +6
-0@@ -0,0 +1,6 @@ +# Add some wayland configuration options until meta-oe adds some good +# PACKAGECONFIGS + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon" + +PACKAGECONFIG += " wayland"meta-arago-extras/recipes-graphics/glfw/glfw_git.bb deleted +0
-24@@ -1,24 +0,0 @@ -SUMMARY = "GLFW cross platform graphics framework" -DESCRIPTION = "A multi-platform library for OpenGL and OpenGLES, window and input" -HOMEPAGE = "http://glfw.org/" -LICENSE = "Zlib & Libpng" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=90c6dd54408744b0f8a55f2a6c7ad870" - -PV = "3.2.1+git${SRCPV}" -PR = "r0" - -BRANCH = "master" -SRC_URI = "git://github.com/glfw/glfw.git;protocol=https;branch=${BRANCH}" -SRCREV = "0a3c4f5d80b041ee1a12c8da3503653d98bd1a15" - -SRC_URI += "file://0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch" - -DEPENDS = "extra-cmake-modules glib-2.0 virtual/libgles2 virtual/egl weston wayland wayland-native wayland-protocols" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -EXTRA_OECMAKE += "-DGLFW_USE_WAYLAND=ON -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF" - -FILES:${PN}-dev += "${libdir}/cmake"
Quoted 25 lines · On 4/26/23 16:32, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Enable limited x11 support to help with the Vulkan WSI layers. Adjust PACKAGECONFIG strings for a few packages so they still prefer the Wayland backend properly and still use GLES instead of GL.
Also attempt a little bit of patch cleanup. Expect a few more cleanup patches with the non-root Weston patchset when that comes out.
Randolph Sapp (6):
arago.conf: drop the explicit removal of x11, add vulkan
qtwayland: override the packageconfig to prefer wayland
qtwayland: drop the fix-wayland-texture-sharing patch
qtwayland: drop the plugins-decorations patch
qtwayland: add comment about why this append exists
glfw: convert to append and drop patchesmeta-arago-distro/conf/distro/arago.conf | 4 +- ...land-texture-sharing-custom-composit.patch | 52 ------------------- ...ons-bradient-display-window-icon-onl.patch | 42 --------------- .../recipes-qt/qt5/qtwayland_git.bbappend | 9 ++-- ...xt-remove-check-for-Wayland-Egl-prov.patch | 27 ---------- .../recipes-graphics/glfw/glfw_%.bbappend | 6 +++ .../recipes-graphics/glfw/glfw_git.bb | 24 --------- 7 files changed, 10 insertions(+), 154 deletions(-)
Quoted 6 lines
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patchdelete mode 100644meta-arago-distro/recipes-qt/qt5/qtwayland/0001-plugins-decorations-bradient-display-window-icon-onl.patchdelete mode 100644meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patchcreate mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend
delete mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_git.bb
Well rats. Some master updates slipped past me. This no longer applies to master, but it still applies to kirkstone just fine.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [EXTERNAL] [meta-arago][master/kirkstone][PATCH 6/6] HACK: glfw: convert to append and drop patches
Quoted 86 lines · Randolph Sapp via lists.yoctoproject.org
From: Randolph Sapp <[email protected]>
A reasonable version of glfw is now provided by meta-oe. Also the EGL version this package needs to build a against can be satisfied by Mesa EGL so this old patch isn't required anymore.
Add a PACKAGECONFIG variable for wayland and use it. This append can be dropped when meta-oe accpets my PACKAGECONFIG patch [1].
[1] https://lists.openembedded.org/g/openembedded-devel/message/102202
Signed-off-by Randolph Sapp <[email protected]>--- ...xt-remove-check-for-Wayland-Egl-prov.patch | 27 ------------------- .../recipes-graphics/glfw/glfw_%.bbappend | 6 +++++ .../recipes-graphics/glfw/glfw_git.bb | 24 ----------------- 3 files changed, 6 insertions(+), 51 deletions(-)delete mode 100644
meta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patchcreate mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend
delete mode 100644 meta-arago-extras/recipes-graphics/glfw/glfw_git.bbmeta-arago-extras/recipes-graphics/glfw/glfw/0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch deleted +0
-27@@ -1,27 +0,0 @@ -From c6e30af80018f7a6fc7b8b0e810718f4bd646cf6 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Thu, 12 Apr 2018 12:29:39 -0400 -Subject: [PATCH] HACK: CMakeList.txt: remove check for Wayland-Egl, provided - by SGX libs - -Signed-off-by: Denys Dmytriyenko <[email protected]> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f5d6ef..eaf780f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -266,7 +266,7 @@ if (_GLFW_WAYLAND) - find_package(ECM REQUIRED NO_MODULE) - list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") - -- find_package(Wayland REQUIRED Client Cursor Egl) -+ find_package(Wayland REQUIRED Client Cursor) - find_package(WaylandScanner REQUIRED) - find_package(WaylandProtocols 1.12 REQUIRED) - --- -2.7.4 -meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend new file +6
-0@@ -0,0 +1,6 @@ +# Add some wayland configuration options until meta-oe adds some good +# PACKAGECONFIGS + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon" + +PACKAGECONFIG += " wayland"meta-arago-extras/recipes-graphics/glfw/glfw_git.bb deleted +0
-14@@ -1,24 +0,0 @@ -SUMMARY = "GLFW cross platform graphics framework" -DESCRIPTION = "A multi-platform library for OpenGL and OpenGLES, window and input" -HOMEPAGE = "http://glfw.org/" -LICENSE = "Zlib & Libpng" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=90c6dd54408744b0f8a55f2a6c7ad870" - -PV = "3.2.1+git${SRCPV}" -PR = "r0" - -BRANCH = "master" -SRC_URI = "git://github.com/glfw/glfw.git;protocol=https;branch=${BRANCH}" -SRCREV = "0a3c4f5d80b041ee1a12c8da3503653d98bd1a15" - -SRC_URI += "file://0001-HACK-CMakeList.txt-remove-check-for-Wayland-Egl-prov.patch"
meta-arago-extras/recipes-graphics/glfw/glfw_git.bb line 24
Quoted 10 lines
meta-arago-extras/recipes-graphics/glfw/glfw_git.bb deleted +0
-10- -DEPENDS = "extra-cmake-modules glib-2.0 virtual/libgles2 virtual/egl weston wayland wayland-native wayland-protocols" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -EXTRA_OECMAKE += "-DGLFW_USE_WAYLAND=ON -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF" - -FILES:${PN}-dev += "${libdir}/cmake"
Huh. Disregard this version, it should not have been sent.