summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2021-02-08 22:34:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-09 08:56:10 +0000
commit11d23de58425ab23bc37c9ea160284a00ec9f89d (patch)
treebdc94d7d374f7d5450d8e97532bf66282ae716ad /meta
parent485af44c1459c1c24e35d7709f91fdd2bfbf1bc4 (diff)
downloadpoky-11d23de58425ab23bc37c9ea160284a00ec9f89d.tar.gz
libdrm: upgrade 2.4.103 -> 2.4.104
Add 0001-meson-Also-search-for-rst2man.py.patch to fix bug of program rst2man cannot be found. Add dependency python3-docutils-native to manpages. (From OE-Core rev: 600b75cef2807ccb3f89f24c77d02cd6e0a99e1f) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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.104.bb (renamed from meta/recipes-graphics/drm/libdrm_2.4.103.bb)8
2 files changed, 35 insertions, 3 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
new file mode 100644
index 0000000000..67fafd40c3
--- /dev/null
+++ b/meta/recipes-graphics/drm/libdrm/0001-meson-Also-search-for-rst2man.py.patch
@@ -0,0 +1,30 @@
1From 4129a8c6911b6b0ef3665cb167da6b635c29614d Mon Sep 17 00:00:00 2001
2From: Wang Mingyu <wangmy@cn.fujitsu.com>
3Date: Mon, 8 Feb 2021 17:30:52 +0900
4Subject: [PATCH] meson: Also search for rst2man.py
5
6That's what upstream docutils installs by default.
7
8Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/drm/-/commit/62b9a3eee9bdaafa766e92d5bebeb4e59845c45a]
9
10Signed-off-by: Heiko Becker's avatarHeiko Becker <heirecka@exherbo.org>
11---
12 meson.build | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/meson.build b/meson.build
16index a4d8d70..07d2e08 100644
17--- a/meson.build
18+++ b/meson.build
19@@ -261,7 +261,7 @@ else
20 endif
21
22 with_man_pages = get_option('man-pages')
23-prog_rst2man = find_program('rst2man', required: with_man_pages == 'true')
24+prog_rst2man = find_program('rst2man', 'rst2man.py', required: with_man_pages == 'true')
25 with_man_pages = with_man_pages != 'false' and prog_rst2man.found()
26
27 config.set10('HAVE_VISIBILITY',
28--
292.25.1
30
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.103.bb b/meta/recipes-graphics/drm/libdrm_2.4.104.bb
index 1028d618ae..ff869d6db9 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.103.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.104.bb
@@ -10,9 +10,11 @@ LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5
10PROVIDES = "drm" 10PROVIDES = "drm"
11DEPENDS = "libpthread-stubs" 11DEPENDS = "libpthread-stubs"
12 12
13SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz" 13SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz \
14 file://0001-meson-Also-search-for-rst2man.py.patch \
15 "
14 16
15SRC_URI[sha256sum] = "3fe0affdba6460166a7323290c18cf68e9b59edcb520722826cb244e9cb50222" 17SRC_URI[sha256sum] = "d66ad8b5c2441015ac1333e40137bb803c3bde3612ff040286fcc12158ea1bcb"
16 18
17inherit meson pkgconfig manpages 19inherit meson pkgconfig manpages
18 20
@@ -34,7 +36,7 @@ PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind"
34PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false" 36PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false"
35PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false" 37PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false"
36PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" 38PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev"
37PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native" 39PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native python3-docutils-native"
38 40
39ALLOW_EMPTY_${PN}-drivers = "1" 41ALLOW_EMPTY_${PN}-drivers = "1"
40PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ 42PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \