libdrm: upgrade 2.4.104 -> 2.4.105

0001-meson-Also-search-for-rst2man.py.patch
removed since it is included in 2.4.105

(From OE-Core rev: 7871f85a9fe610f600c4234fce38d24808f5a2fd)

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
zhengruoqin
2021-04-15 22:54:16 +08:00
committed by Richard Purdie
parent 9ff374170d
commit 2e95ad1e67
2 changed files with 1 additions and 32 deletions

View File

@@ -1,30 +0,0 @@
From 4129a8c6911b6b0ef3665cb167da6b635c29614d Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@cn.fujitsu.com>
Date: Mon, 8 Feb 2021 17:30:52 +0900
Subject: [PATCH] meson: Also search for rst2man.py
That's what upstream docutils installs by default.
Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/drm/-/commit/62b9a3eee9bdaafa766e92d5bebeb4e59845c45a]
Signed-off-by: Heiko Becker's avatarHeiko Becker <heirecka@exherbo.org>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index a4d8d70..07d2e08 100644
--- a/meson.build
+++ b/meson.build
@@ -261,7 +261,7 @@ else
endif
with_man_pages = get_option('man-pages')
-prog_rst2man = find_program('rst2man', required: with_man_pages == 'true')
+prog_rst2man = find_program('rst2man', 'rst2man.py', required: with_man_pages == 'true')
with_man_pages = with_man_pages != 'false' and prog_rst2man.found()
config.set10('HAVE_VISIBILITY',
--
2.25.1

View File

@@ -11,10 +11,9 @@ PROVIDES = "drm"
DEPENDS = "libpthread-stubs"
SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz \
file://0001-meson-Also-search-for-rst2man.py.patch \
"
SRC_URI[sha256sum] = "d66ad8b5c2441015ac1333e40137bb803c3bde3612ff040286fcc12158ea1bcb"
SRC_URI[sha256sum] = "1d1d024b7cadc63e2b59cddaca94f78864940ab440843841113fbac6afaf2a46"
inherit meson pkgconfig manpages