summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2020-04-08 02:00:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-24 14:10:07 +0100
commit5d908eef1c42ecb4c514919cf43b12a36c1f3d6f (patch)
tree5c584d2873809e87275da7b000e7e1038ae51c88
parent40f08d2c97b74bd2f54f3a108d2b3f3a25462199 (diff)
downloadpoky-5d908eef1c42ecb4c514919cf43b12a36c1f3d6f.tar.gz
libdrm: upgrade 2.4.100 -> 2.4.101
musl-ioctl.patch removed since it is included in 2.4.101 (From OE-Core rev: 015e631cd18d982df03d4c829c0f8229a2face38) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/drm/libdrm/musl-ioctl.patch35
-rw-r--r--meta/recipes-graphics/drm/libdrm_2.4.101.bb (renamed from meta/recipes-graphics/drm/libdrm_2.4.100.bb)7
2 files changed, 3 insertions, 39 deletions
diff --git a/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch b/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch
deleted file mode 100644
index e3d6c5b853..0000000000
--- a/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 46c0fd6c827a8cb4d04e067bf04fab579ac4712e Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Mon, 18 Jun 2018 15:07:03 +0100
7Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature
8
9POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to
10use (int, unsigned long int, ...) instead.
11
12Use a #ifdef to adapt the replacement function as appropriate.
13---
14 tests/nouveau/threaded.c | 4 ++++
15 1 file changed, 4 insertions(+)
16
17diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c
18index 3669bcd3..e1c27c01 100644
19--- a/tests/nouveau/threaded.c
20+++ b/tests/nouveau/threaded.c
21@@ -36,7 +36,11 @@ static int failed;
22
23 static int import_fd;
24
25+#ifdef __GLIBC__
26 int ioctl(int fd, unsigned long request, ...)
27+#else
28+int ioctl(int fd, int request, ...)
29+#endif
30 {
31 va_list va;
32 int ret;
33--
342.11.0
35
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.100.bb b/meta/recipes-graphics/drm/libdrm_2.4.101.bb
index 4859425672..8ec566faa9 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.100.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.101.bb
@@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5
10PROVIDES = "drm" 10PROVIDES = "drm"
11DEPENDS = "libpthread-stubs" 11DEPENDS = "libpthread-stubs"
12 12
13SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ 13SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz"
14 file://musl-ioctl.patch" 14SRC_URI[md5sum] = "e6a6f1b88963210b3d62acd7310a1cc7"
15SRC_URI[md5sum] = "f47bc87e28198ba527e6b44ffdd62f65" 15SRC_URI[sha256sum] = "ddf31baa8e49473624860bd166ce654dc349873f7a6c7b3305964249315c78a7"
16SRC_URI[sha256sum] = "c77cc828186c9ceec3e56ae202b43ee99eb932b4a87255038a80e8a1060d0a5d"
17 16
18inherit meson pkgconfig manpages 17inherit meson pkgconfig manpages
19 18