zeus migration: graphics: remove and refresh several recipes to match with upstream version

https://jira.digi.com/browse/DEL-7013

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2020-04-07 12:48:35 +02:00
parent 37c643dfa8
commit 9ccc0d10ef
8 changed files with 11 additions and 100 deletions

View File

@ -1,22 +0,0 @@
diff --git a/glm/simd/platform.h b/glm/simd/platform.h
index a5510beb..b54d8a34 100644
--- a/glm/simd/platform.h
+++ b/glm/simd/platform.h
@@ -111,6 +111,7 @@
#define GLM_COMPILER_GCC70 0x02000A00
#define GLM_COMPILER_GCC71 0x02000B00
#define GLM_COMPILER_GCC72 0x02000C00
+#define GLM_COMPILER_GCC7X 0x02000C01
#define GLM_COMPILER_GCC80 0x02000D00
// CUDA
@@ -283,6 +284,8 @@
# define GLM_COMPILER (GLM_COMPILER_GCC71)
# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 2)
# define GLM_COMPILER (GLM_COMPILER_GCC72)
+# elif (__GNUC__ == 7)
+# define GLM_COMPILER (GLM_COMPILER_GCC7X)
# elif (__GNUC__ >= 8)
# define GLM_COMPILER (GLM_COMPILER_GCC80)
# else

View File

@ -1,23 +0,0 @@
SUMMARY = "OpenGL Mathematics Library"
DESCRIPTION = "OpenGL Mathematics (GLM) is a header only C++ \
mathematics library for graphics software based on the OpenGL \
Shading Language (GLSL) specifications."
HOMEPAGE = "https://glm.g-truc.net"
BUGTRACKER = "https://github.com/g-truc/glm/issues"
SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://copying.txt;md5=4431606d144252143c9c3df384a74cad"
SRC_URI = "git://github.com/g-truc/glm;branch=0.9.8 \
file://Fixed-GCC-7.3-compile.patch"
SRCREV = "6fa203eeb7fbcbb6f620501fad40359c8a456049"
S = "${WORKDIR}/git"
inherit cmake
FILES_${PN}-dev += "${libdir}/cmake"
RDEPENDS_${PN}-dev = ""
BBCLASSEXTEND = "native"

View File

@ -1,3 +0,0 @@
SRC_URI_remove = "file://0004-configure.ac-Fix-wayland-protocols-path.patch"
EXTRA_OECONF_remove = "WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}"

View File

@ -1,6 +0,0 @@
SRC_URI_remove = " \
file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch \
file://0002-Avoid-finding-build-host-s-wayland-scanner.patch \
"
EXTRA_OECONF_remove = "WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}"

View File

@ -1,37 +0,0 @@
matchbox-wm: Fix to support closing windows in multi-touch panels
In many applications, the close is not recognized because the sub window class is NULL
This calculates coordinates to track close touch actions in the area to respond.
Upstream Status: Not applicable
diff --git a/src/client_common.c b/src/client_common.c
index 2b62024..30724c1 100644
--- a/src/client_common.c
+++ b/src/client_common.c
@@ -779,10 +779,24 @@ client_get_button_list_item_from_event(Client *c, XButtonEvent *e)
{
struct list_item *l = c->buttons;
MBClientButton *b = NULL;
-
+ int dx, dy;
while (l != NULL)
{
b = (MBClientButton *)l->data;
+ if (e->subwindow == 0)
+ {
+ dx = (e->x - b->x - b->w/2) > 0 ? \
+ (e->x - b->x - b->w/2) : \
+ (b->x + b->w/2 - e->x);
+
+ dy = (e->y - b->y - b->h/2) > 0 ? \
+ (e->y - b->y - b->h/2) : \
+ (b->y + b->h/2 - e->y);
+
+ if (dx <= b->w/2 && dy <= b->h/2)
+ return l;
+ }
+
if (b->win == e->subwindow)
{
return l;

View File

@ -1,3 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI_append = " file://fix-close-button-do-not-response-to-multitouch.patch"

View File

@ -1,7 +1,5 @@
PACKAGECONFIG_X11 = ""
PACKAGECONFIG_X11_append_imxgpu3d = " x11-egl glx"
PACKAGECONFIG_imxgpu = " \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gbm wayland', \
bb.utils.contains('DISTRO_FEATURES', 'x11', '${PACKAGECONFIG_X11}', \
'', d), d)} \
# Append EGL_CFLAGS to CFLAGS
CFLAGS_append_imxgpu = " \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_API_FB', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '-DWL_EGL_PLATFORM', '', d)} \
"

View File

@ -0,0 +1,7 @@
# FIXME: Here it can avoid xinput_calibrator run under background
# when Desktop shows
do_install_append() {
# Remove the xinput_calibrator.desktop from xdg/autostart
rm -rf ${D}${sysconfdir}/xdg/autostart
}