Merge pull request #1015 from thochstein/master

Upgrade libdrm and wayland-protocols to fix mesa compatibility issue

3 files changed, 18 insertions, 13 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index c3c1604f..dc997443 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -420,14 +420,14 @@ PREFERRED_PROVIDER_opencl-icd-loader:imxgpu  ?= "imx-gpu-viv"
 PREFERRED_VERSION_weston:imx-nxp-bsp     ?= "9.0.0.imx"
 PREFERRED_VERSION_weston:imx-mainline-bsp = ""
 
-PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ?= "1.22.imx"
-PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ?= "1.22.imx"
-PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ?= "1.22.imx"
+PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ?= "1.25.imx"
+PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ?= "1.25.imx"
+PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ?= "1.25.imx"
 
 # Use i.MX libdrm Version
-PREFERRED_VERSION_libdrm:mx6-nxp-bsp ?= "2.4.107.imx"
-PREFERRED_VERSION_libdrm:mx7-nxp-bsp ?= "2.4.107.imx"
-PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.107.imx"
+PREFERRED_VERSION_libdrm:mx6-nxp-bsp ?= "2.4.109.imx"
+PREFERRED_VERSION_libdrm:mx7-nxp-bsp ?= "2.4.109.imx"
+PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.109.imx"
 
 # Use i.MX optee Version
 PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ?= "3.15.0.imx"
diff --git a/recipes-graphics/drm/libdrm_2.4.107.imx.bb b/recipes-graphics/drm/libdrm_2.4.109.imx.bb
index b732e82a..6a9ab254 100644
--- a/recipes-graphics/drm/libdrm_2.4.107.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.109.imx.bb
@@ -11,10 +11,9 @@ PROVIDES = "drm"
 DEPENDS = "libpthread-stubs"
 
 IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1"
-IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.107"
-SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \
-           file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch "
-SRCREV = "a7316e7d67b7708f40ffe469858dae07f14fe21a"
+SRCBRANCH ?= "libdrm-imx-2.4.109"
+SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}"
+SRCREV = "1d943abb1fccc350a129950d2690948f64503bb7"
 S = "${WORKDIR}/git"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb
index 8cc2f137..be6cbdb0 100644
--- a/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb
+++ b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb
@@ -9,11 +9,17 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
                     file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
 
-SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.22"
-SRCREV = "0f71ffe59cf4c3f050ff79ea18f96345fcf0061e"
+SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.25"
+SRCREV = "a104fb66d1b899dc04077422c2204638675ee4a6"
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
+UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
+
+# NOTE: For i.MX drop allarch since the recipe is SOCARCH
+#inherit meson pkgconfig allarch
+inherit meson pkgconfig
+
+EXTRA_OEMESON += "-Dtests=false"
 
 PACKAGES = "${PN}"
 FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc"