aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorzhengruoqin <zhengrq.fnst@fujitsu.com>2021-04-15 22:54:16 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-18 11:29:05 +0100
commit7871f85a9fe610f600c4234fce38d24808f5a2fd (patch)
treef24235be8570924cf31281b913da6b43e8d4f5d2 /meta/recipes-graphics
parent7017725b14888c9668efcad92bca46b4d1ce9a68 (diff)
downloadopenembedded-core-contrib-7871f85a9fe610f600c4234fce38d24808f5a2fd.tar.gz
openembedded-core-contrib-7871f85a9fe610f600c4234fce38d24808f5a2fd.tar.bz2
openembedded-core-contrib-7871f85a9fe610f600c4234fce38d24808f5a2fd.zip
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 Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/drm/libdrm/0001-meson-Also-search-for-rst2man.py.patch30
-rw-r--r--meta/recipes-graphics/drm/libdrm_2.4.105.bb (renamed from meta/recipes-graphics/drm/libdrm_2.4.104.bb)3
2 files changed, 1 insertions, 32 deletions
diff --git a/meta/recipes-graphics/drm/libdrm/0001-meson-Also-search-for-rst2man.py.patch b/meta/recipes-graphics/drm/libdrm/0001-meson-Also-search-for-rst2man.py.patch
deleted file mode 100644
index 67fafd40c3..0000000000
--- a/meta/recipes-graphics/drm/libdrm/0001-meson-Also-search-for-rst2man.py.patch
+++ /dev/null
@@ -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
-
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.104.bb b/meta/recipes-graphics/drm/libdrm_2.4.105.bb
index ff869d6db9..8cb82ad123 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.104.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.105.bb
@@ -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