From 7377f6c87e351ad702485fee1e9da42690f9f5e8 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 6 Aug 2021 16:43:29 -0500 Subject: layer: More override fixes Adds fixes for _imx, _imxdpu, _imxdrm, _imxgpu, _imxgpu3d, virtual PREFERRED_PROVIDER versions Fix other places for imx/imxdpu/imxdrm overrides Signed-off-by: Tom Hochstein Signed-off-by: Khem Raj --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 2 +- recipes-graphics/wayland/weston-init.bbappend | 2 +- recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-graphics') diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index e486d689..472c03c4 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -17,7 +17,7 @@ DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb libxshmfence libxxf86vm', \ '', d)} \ " -DEPENDS:append_imxdrm = " libdrm wayland" +DEPENDS:append:imxdrm = " libdrm wayland" DEPENDS:append:mx8 = " patchelf-native" # imx-gpu-viv does not provide everything it needs to for virtual/libgl diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index e6baac0b..5710e9b5 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -12,7 +12,7 @@ SRC_URI:append:mx6sl = " file://weston.config" # commented out. For example: # #xwayland=true # Then add the assignment to INI_UNCOMMENT_ASSIGNMENTS. -INI_UNCOMMENT_ASSIGNMENTS:append_imx = " \ +INI_UNCOMMENT_ASSIGNMENTS:append:imx = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland=true', '', d)} \ " INI_UNCOMMENT_ASSIGNMENTS:append:mx8 = " \ diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index c7b7e879..34e2ed82 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -13,4 +13,4 @@ IMX_OPENGL_PKGCONFIGS_REMOVE = "" IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor" OPENGL_PKGCONFIGS:remove:mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" OPENGL_PKGCONFIGS:remove:mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" -OPENGL_PKGCONFIGS:remove_imxdrm = "dri glx" +OPENGL_PKGCONFIGS:remove:imxdrm = "dri glx" -- cgit v1.2.3-54-g00ecf