mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 12:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

libdrm: upgrade 2.4.103 -> 2.4.104

Browse Source 
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>
This commit is contained in:
Wang Mingyu
2021-02-08 22:34:10 +08:00
committed by Richard Purdie
parent 485af44c14
commit 11d23de584
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
meta/recipes-graphics/drm/libdrm/0001-meson-Also-search-for-rst2man.py.patch Normal file
View File

@@ -0,0 +1,30 @@
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

8
meta/recipes-graphics/drm/libdrm_2.4.103.bb → meta/recipes-graphics/drm/libdrm_2.4.104.bb
View File

@@ -10,9 +10,11 @@ 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.xz"
SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz \
file://0001-meson-Also-search-for-rst2man.py.patch \
"
SRC_URI[sha256sum] = "3fe0affdba6460166a7323290c18cf68e9b59edcb520722826cb244e9cb50222"
SRC_URI[sha256sum] = "d66ad8b5c2441015ac1333e40137bb803c3bde3612ff040286fcc12158ea1bcb"
inherit meson pkgconfig manpages
@@ -34,7 +36,7 @@ PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind"
PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false"
PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false"
PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev"
PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native"
PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native python3-docutils-native"
ALLOW_EMPTY_${PN}-drivers = "1"
PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \