diff options
Diffstat (limited to 'poky/meta/recipes-graphics/drm')
| -rw-r--r-- | poky/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch | 35 | ||||
| -rw-r--r-- | poky/meta/recipes-graphics/drm/libdrm_2.4.100.bb (renamed from poky/meta/recipes-graphics/drm/libdrm_2.4.101.bb) | 7 |
2 files changed, 39 insertions, 3 deletions
diff --git a/poky/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch b/poky/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch new file mode 100644 index 0000000000..e3d6c5b853 --- /dev/null +++ b/poky/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch @@ -0,0 +1,35 @@ +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/poky/meta/recipes-graphics/drm/libdrm_2.4.101.bb b/poky/meta/recipes-graphics/drm/libdrm_2.4.100.bb index 8ec566faa9..4859425672 100644 --- a/poky/meta/recipes-graphics/drm/libdrm_2.4.101.bb +++ b/poky/meta/recipes-graphics/drm/libdrm_2.4.100.bb @@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5 PROVIDES = "drm" DEPENDS = "libpthread-stubs" -SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz" -SRC_URI[md5sum] = "e6a6f1b88963210b3d62acd7310a1cc7" -SRC_URI[sha256sum] = "ddf31baa8e49473624860bd166ce654dc349873f7a6c7b3305964249315c78a7" +SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ + file://musl-ioctl.patch" +SRC_URI[md5sum] = "f47bc87e28198ba527e6b44ffdd62f65" +SRC_URI[sha256sum] = "c77cc828186c9ceec3e56ae202b43ee99eb932b4a87255038a80e8a1060d0a5d" inherit meson pkgconfig manpages |