From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Thu, 28 Jan 2021 11:33:24 +0000 (+0100)
Subject: libdrm: update to 2.4.102.imx
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a00d108c094c993ef68601efc0bfe3454732ee31;p=meta-freescale.git

libdrm: update to 2.4.102.imx

NXP release imx_5.4.70_2.3.0.

Drop the explicit PACKAGE_ARCH setting. This is done by
fsl-dynamic-packagearch.bbclass.

The musl-ioctl.patch has been upstreamed.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---

diff --git a/recipes-graphics/drm/libdrm/musl-ioctl.patch b/recipes-graphics/drm/libdrm/musl-ioctl.patch
deleted file mode 100644
index e3d6c5b8..00000000
--- a/recipes-graphics/drm/libdrm/musl-ioctl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 46c0fd6c827a8cb4d04e067bf04fab579ac4712e Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Mon, 18 Jun 2018 15:07:03 +0100
-Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature
-
-POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to
-use (int, unsigned long int, ...) instead.
-
-Use a #ifdef to adapt the replacement function as appropriate.
----
- tests/nouveau/threaded.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c
-index 3669bcd3..e1c27c01 100644
---- a/tests/nouveau/threaded.c
-+++ b/tests/nouveau/threaded.c
-@@ -36,7 +36,11 @@ static int failed;
- 
- static int import_fd;
- 
-+#ifdef __GLIBC__
- int ioctl(int fd, unsigned long request, ...)
-+#else
-+int ioctl(int fd, int request, ...)
-+#endif
- {
- 	va_list va;
- 	int ret;
--- 
-2.11.0
-
diff --git a/recipes-graphics/drm/libdrm_2.4.99.imx.bb b/recipes-graphics/drm/libdrm_2.4.102.imx.bb
similarity index 96%
rename from recipes-graphics/drm/libdrm_2.4.99.imx.bb
rename to recipes-graphics/drm/libdrm_2.4.102.imx.bb
index dc2aa8a9..b8c38554 100644
--- a/recipes-graphics/drm/libdrm_2.4.99.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.102.imx.bb
@@ -11,14 +11,14 @@ 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.99"
+IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.102"
 SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \
-           file://musl-ioctl.patch \
            file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch "
-SRCREV = "f421c9c8c4b8fe48d9e6ef43910e98569c94a4b2"
+SRCREV = "f525ae649cd6e81e5d4e459799b0f7a120c4e174"
 S = "${WORKDIR}/git"
 
 DEFAULT_PREFERENCE = "-1"
+COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
 
 inherit meson pkgconfig manpages