diff options
| author |   Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-04-08 02:00:15 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-24 14:07:54 +0100 |
| commit | 015e631cd18d982df03d4c829c0f8229a2face38 (patch) | |
| tree | fb8c2fffdf64cf8bbfda6d9bf226789ac42c077b | |
| parent | be4c224273039a138750c8cf88ef0e0315a92ea5 (diff) | |
| download | openembedded-core-contrib-015e631cd18d982df03d4c829c0f8229a2face38.tar.gz | |
libdrm: upgrade 2.4.100 -> 2.4.101
musl-ioctl.patch
removed since it is included in 2.4.101
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.patch | 35 | ||||
| -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 @@ -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/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 PROVIDES = "drm" DEPENDS = "libpthread-stubs" -SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ - file://musl-ioctl.patch" -SRC_URI[md5sum] = "f47bc87e28198ba527e6b44ffdd62f65" -SRC_URI[sha256sum] = "c77cc828186c9ceec3e56ae202b43ee99eb932b4a87255038a80e8a1060d0a5d" +SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz" +SRC_URI[md5sum] = "e6a6f1b88963210b3d62acd7310a1cc7" +SRC_URI[sha256sum] = "ddf31baa8e49473624860bd166ce654dc349873f7a6c7b3305964249315c78a7" inherit meson pkgconfig manpages |