Merge pull request Freescale#1806 from nxp-upstream/fixup

Fixup

Author: otavio

conf/machine/include/imx-base.inc

@@ -519,22 +519,6 @@ PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp  ??= "1.22.5.imx"
 PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.22.5.imx"
 PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.22.5.imx"
 
-# GStreamer copied recipes
-PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp              ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp        ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-omx:mx8-nxp-bsp          ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp       ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp  ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp        ??= "1.22.0.imx"
-PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp              ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp        ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-omx:mx9-nxp-bsp          ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp       ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp  ??= "1.22.0.imx"
-PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp        ??= "1.22.0.imx"
-
 # GStreamer downgrade ffmpeg
 PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1"
 PREFERRED_VERSION_ffmpeg:mx9-nxp-bsp ??= "4.4.1"

recipes-bsp/imx-test/imx-test_git.bb

@@ -13,14 +13,15 @@ DEPENDS:append:imxvpu = " virtual/imxvpu"
 DEPENDS:append:mx6-nxp-bsp    = " imx-lib"
 DEPENDS:append:mx7-nxp-bsp    = " imx-lib"
 DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib"
+DEPENDS:append:mx93-nxp-bsp   = " imx-lib"
 
 PE = "1"
 PV = "7.0+${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
            file://memtool_profile"
-SRCBRANCH = "lf-6.1.55_2.2.0"
-SRCREV = "e8b3c9026553233491abb4df4185dd7291a8ffb2"
+SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCREV = "8a1fa37664a1e470cf86f1185c08e265e4602a9b"
 
 S = "${WORKDIR}/git"
 
@@ -39,6 +40,8 @@ PLATFORM:mx7d-nxp-bsp  = "IMX7D"
 PLATFORM:mx7ulp-nxp-bsp = "IMX7D"
 PLATFORM:mx8-nxp-bsp = "IMX8"
 PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
+PLATFORM:mx93-nxp-bsp = "IMX8ULP"
+PLATFORM:mx95-nxp-bsp = "IMX8"
 
 PARALLEL_MAKE = "-j 1"
 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"

recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch

@@ -18,15 +18,15 @@ Index: git/meson.build
 ===================================================================
 --- git.orig/meson.build
 +++ git/meson.build
-@@ -65,6 +65,7 @@ dep_gl = _dep_null
+@@ -64,6 +64,7 @@ dep_drm = _dep_null
  dep_egl = _dep_null
  dep_wayland_client = _dep_null
  dep_wayland_egl = _dep_null
 +dep_wayland_wayland_egl = _dep_null
  dep_wayland_scanner = _dep_null
  dep_wayland_proto = _dep_null
  dep_x11_xcb = _dep_null
-@@ -106,7 +107,8 @@ else
+@@ -104,7 +105,8 @@ else
    dep_wayland_client = dependency(
      'wayland-client', version : '>= 1.10', required : get_option('wayland'),
    )
@@ -36,12 +36,12 @@ Index: git/meson.build
      'wayland-egl', version : '>= 9.1', required : get_option('wayland'),
    )
    dep_wayland_scanner = dependency(
-@@ -124,7 +126,7 @@ else
+@@ -122,7 +124,7 @@ else
      wayland_xdg_shell_xml = join_paths(dep_wayland_proto.get_variable(pkgconfig: 'pkgdatadir'),
      'stable/xdg-shell/xdg-shell.xml')
    endif
 -  build_wayland = dep_egl.found() and dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_scanner.found() and dep_wayland_proto.found()
 +  build_wayland = dep_egl.found() and dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_scanner.found() and dep_wayland_proto.found() and dep_wayland_wayland_egl.found()
 
    # We're interested only in the headers provided
-   # FINISHME: make x11_xcb and udev compile-only dependency
+   # FINISHME: make x11_xcb compile-only dependency

recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch

@@ -14,27 +14,25 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
  meson.build | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
---- a/meson.build
-+++ b/meson.build
-@@ -72,6 +72,7 @@ dep_udev = _dep_null
+Index: git/meson.build
+===================================================================
+--- git.orig/meson.build
++++ git/meson.build
+@@ -72,6 +72,7 @@ dep_gbm = _dep_null
  dep_cocoa = _dep_null
  dep_core_foundation = _dep_null
  dep_gl_headers = _dep_null
 +dep_surfaceless = _dep_null
 
  # Get dependencies
  if build_wgl
-@@ -96,10 +97,11 @@ else
-   dep_egl = dependency('egl', required : get_option('gbm'))
-   dep_gbm = dependency('gbm', required : get_option('gbm'))
-   dep_udev = dependency('libudev', required : get_option('gbm'))
-+  dep_surfaceless_egl = dependency('egl', required : get_option('surfaceless_egl'))
-+  dep_surfaceless_gbm = dependency('gbm', required : get_option('surfaceless_egl'))
-   build_gbm = dep_egl.found() and dep_gbm.found() and dep_udev.found()
+@@ -99,7 +100,8 @@ else
+   build_gbm = dep_drm.found() and dep_egl.found() and dep_gbm.found()
 
--  dep_egl = dependency('egl', required : get_option('surfaceless_egl'))
+   dep_egl = dependency('egl', required : get_option('surfaceless_egl'))
 -  build_surfaceless = dep_egl.found()
-+  build_surfaceless = dep_surfaceless_egl.found() and dep_surfaceless_gbm.found()
++  dep_gbm = dependency('gbm', required : get_option('surfaceless_egl'))
++  build_surfaceless = dep_egl.found() and dep_gbm.found()
 
    dep_egl = dependency('egl', required : get_option('wayland'))
    dep_wayland_client = dependency(