From ae8927fb381961f4cbc77521c45716ee6c5f7806 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 16 Feb 2021 14:26:03 +0100 Subject: [PATCH] wayland: Update recipes to new NXP BSP release imx_5.4.70_2.3.1 Remove outdated wayland patch and remove NXP workaround for mx8mq platforms in the weston-init recipe. These changes don't affect our platforms, but it's to make sure that we're in sync with the latest version of NXP's recipes. Signed-off-by: Gabriel Valcazar --- .../wayland/wayland/fixpathinpcfiles.patch | 32 ------------------- .../wayland/weston-init.bbappend | 3 -- .../wayland/weston-init/weston.ini | 1 - 3 files changed, 36 deletions(-) delete mode 100644 meta-digi-dey/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch diff --git a/meta-digi-dey/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta-digi-dey/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch deleted file mode 100644 index ad3526d98..000000000 --- a/meta-digi-dey/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix wayland-client and wayland-scanner pc files - -Upstream-Status: Pending - -Signed-off-by: Fabien Lahoudere - -Index: wayland-1.14.0/src/wayland-client.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-client.pc.in -+++ wayland-1.14.0/src/wayland-client.pc.in -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ --pkgdatadir=@datadir@/@PACKAGE@ -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ - libdir=@libdir@ - includedir=@includedir@ - -Index: wayland-1.14.0/src/wayland-scanner.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in -+++ wayland-1.14.0/src/wayland-scanner.pc.in -@@ -2,7 +2,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ - pkgdatadir=@datadir@/@PACKAGE@ --wayland_scanner=@bindir@/wayland-scanner -+wayland_scanner=wayland-scanner - - Name: Wayland Scanner - Description: Wayland scanner diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend index 6673d4b18..e4604503d 100644 --- a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend @@ -15,9 +15,6 @@ SRC_URI += " \ INI_UNCOMMENT_ASSIGNMENTS_append_mx8mp = " \ use-g2d=1 \ " -INI_UNCOMMENT_ASSIGNMENTS_append_mx8mq = " \ - drm-device=card0 \ -" INI_UNCOMMENT_ASSIGNMENTS_append_mx8 = " \ repaint-window=16 \ " diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init/weston.ini b/meta-digi-dey/recipes-graphics/wayland/weston-init/weston.ini index 1fec1d696..916e621ab 100644 --- a/meta-digi-dey/recipes-graphics/wayland/weston-init/weston.ini +++ b/meta-digi-dey/recipes-graphics/wayland/weston-init/weston.ini @@ -3,7 +3,6 @@ idle-time=0 #use-g2d=1 #xwayland=true -#drm-device=card0 #repaint-window=16 #enable-overlay-view=1