Skip to contentSkip to conversation

qtwayland: drop backported patch for GLES2 decoration blitter fix

PATCH New Denys Dmytriyenko 1 participant 4 messages Mar 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 qtwayland: drop backported patch for GLES2 decoration blitter fix

---
 ...ly-use-OpenGL-ES-2-API-for-decoration-bli.patch | 32 ----------------------
 .../recipes-qt/qt5/qtwayland_git.bbappend          |  1 -
 2 files changed, 33 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-Client-really-use-OpenGL-ES-2-API-for-decoration-bli.patch
meta-arago-distro/recipes-qt/qt5/qtwayland/0001-Client-really-use-OpenGL-ES-2-API-for-decoration-bli.patch deleted +0 -32
deleted file mode 100644
index ae6256f..0000000
@@ -1,32 +0,0 @@
-From c0303406ccd38063db46e8cfda5e5089ecf948a9 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <[email protected]>
-Date: Tue, 26 Nov 2019 09:39:25 +0100
-Subject: [PATCH] Client: really use OpenGL ES 2 API for decoration blitter
-
-Really use (as the comment states) the OpenGL ES 2 API for
-the decoration blitter.
-
-Task-number: QTBUG-80356
-Change-Id: I4c923343e721a824521fb9b2b36be5d2de984325
-Reviewed-by: Pier Luigi Fiorini <[email protected]>
-Reviewed-by: Johan Helsing <[email protected]>
----
- .../client/wayland-egl/qwaylandglcontext.cpp                    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
-index bc1f74af..da147495 100644
---- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
-+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
-@@ -312,7 +312,7 @@ QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *dis
- 
-     // Create an EGL context for the decorations blitter. By using a dedicated context we don't need to make sure to not
-     // change the context state and we also use OpenGL ES 2 API independently to what the app is using to draw.
--    QVector<EGLint> eglDecorationsContextAttrs = { EGL_CONTEXT_CLIENT_VERSION, 1, EGL_NONE };
-+    QVector<EGLint> eglDecorationsContextAttrs = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
-     m_decorationsContext = eglCreateContext(m_eglDisplay, m_config, m_context, eglDecorationsContextAttrs.constData());
-     if (m_decorationsContext == EGL_NO_CONTEXT)
-         qWarning("QWaylandGLContext: Failed to create the decorations EGLContext. Decorations will not be drawn.");
--- 
-2.17.1
-
meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend +0 -1
index 9577e1d..bd529d2 100644
@@ -3,5 +3,4 @@ PR_append = ".arago1"
 
 SRC_URI += " \
     file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \
-    file://0001-Client-really-use-OpenGL-ES-2-API-for-decoration-bli.patch \
 "
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/4 v4l-utils: drop locally overlayed 1.17-rc in favor of upstream 1.18.0

---
 .../0001-Makefile.am-skip-po-dirs-for-now.patch    | 24 ----------------------
 .../v4l2apps/v4l-utils_%.bbappend                  | 23 ---------------------
 2 files changed, 47 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-multimedia/v4l2apps/v4l-utils/0001-Makefile.am-skip-po-dirs-for-now.patch
 delete mode 100644 meta-arago-extras/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend
meta-arago-extras/recipes-multimedia/v4l2apps/v4l-utils/0001-Makefile.am-skip-po-dirs-for-now.patch deleted +0 -24
deleted file mode 100644
index c164568..0000000
@@ -1,24 +0,0 @@
-From f21271f720000c9f91569b8a7dfe71d4b74850f8 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <[email protected]>
-Date: Mon, 24 Jun 2019 20:54:18 -0400
-Subject: [PATCH] Makefile.am: skip po dirs for now
-
-Signed-off-by: Denys Dmytriyenko <[email protected]>
-
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8abe4f9..26a4609 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = v4l-utils-po libdvbv5-po lib
-+SUBDIRS = lib
- 
- if WITH_V4LUTILS
- SUBDIRS += utils contrib
meta-arago-extras/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend deleted +0 -23
deleted file mode 100644
index f428b8d..0000000
@@ -1,23 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PV = "1.16.99+1.17-rc+git${SRCPV}"
-
-SRCREV = "9343eaf5433135b3360e34db606c0d7de95ed289"
-
-SRC_URI = " \
-	git://linuxtv.org/v4l-utils.git \
-	file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \
-	file://mediactl-pkgconfig.patch \
-	file://export-mediactl-headers.patch \
-	file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \
-	file://0003-v4l2-ctl-Do-not-use-getsubopt.patch \
-	file://0001-Makefile.am-skip-po-dirs-for-now.patch \
-"
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-do_configure() {
-	./bootstrap.sh
-	oe_runconf
-}
Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/4 packagegroup-arago-tisdk-opencl: drop python-pyopencl python bindings

In reply to Denys Dmytriyenko
---
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb        | 1 -
 1 file changed, 1 deletion(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb +0 -1
index c357f9c..0217705 100644
@@ -13,7 +13,6 @@ MAIN_PKGS = " \
 "
 
 EXTRA_PKGS = " \
-    python-pyopencl \
 "
 
 #    ti-fftw-examples
Signature · 1 line
2.7.4
#3 lore raw

PATCH 4/4 opencv_3.1: do not depend on python for now

In reply to Denys Dmytriyenko

Python2 is deprecated

---
 meta-arago-extras/recipes-support/opencv/opencv_3.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-extras/recipes-support/opencv/opencv_3.1.bb +1 -1
index c9670fc..4d66551 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf"
 ARM_INSTRUCTION_SET_armv4 = "arm"
 ARM_INSTRUCTION_SET_armv5 = "arm"
 
-DEPENDS = "libtool swig swig-native python bzip2 zlib glib-2.0 libwebp protobuf protobuf-native"
+DEPENDS = "libtool swig swig-native bzip2 zlib glib-2.0 libwebp protobuf protobuf-native"
 
 SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
 SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
Signature · 1 line
2.7.4