diff options
Diffstat (limited to 'external/poky/meta/recipes-graphics/drm')
| -rw-r--r-- | external/poky/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch | 35 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/drm/libdrm_2.4.101.bb (renamed from external/poky/meta/recipes-graphics/drm/libdrm_2.4.94.bb) | 9 |
2 files changed, 4 insertions, 40 deletions
diff --git a/external/poky/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch b/external/poky/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch deleted file mode 100644 index e3d6c5b8..00000000 --- a/external/poky/meta/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/external/poky/meta/recipes-graphics/drm/libdrm_2.4.94.bb b/external/poky/meta/recipes-graphics/drm/libdrm_2.4.101.bb index d6542921..8ec566fa 100644 --- a/external/poky/meta/recipes-graphics/drm/libdrm_2.4.94.bb +++ b/external/poky/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 PROVIDES = "drm" DEPENDS = "libpthread-stubs" -SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ - file://musl-ioctl.patch" -SRC_URI[md5sum] = "e9803233838007047f39eb385c70d9e0" -SRC_URI[sha256sum] = "b73c59b0a3760502c428ba81de49cd4807657d26be5e697eba3a87dd021d16be" +SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz" +SRC_URI[md5sum] = "e6a6f1b88963210b3d62acd7310a1cc7" +SRC_URI[sha256sum] = "ddf31baa8e49473624860bd166ce654dc349873f7a6c7b3305964249315c78a7" inherit meson pkgconfig manpages @@ -54,7 +53,7 @@ FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*" FILES_${PN}-kms = "${libdir}/libkms*.so.*" FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" -FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.*" +FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" BBCLASSEXTEND = "native nativesdk" |