| Message ID | 20240827134417.4022710-1-martin.jansa@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-oe] vdpauinfo: require x11 in DISTRO_FEATURES | expand |
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index d6d8cfd32b..71fb1c2ac8 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -606,7 +606,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \ tslib \ unclutter-xfixes \ - libvdpau \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libvdpau vdpauinfo", "", d)} \ xcursorgen \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \ yad \ diff --git a/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb b/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb index 99afe74507..3f44e537a4 100644 --- a/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb +++ b/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb @@ -6,6 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b6e110c362fe46168199f3490e52c3c" DEPENDS = "libvdpau" +# libvdpau is available only with x11 +inherit features_check +REQUIRED_DISTRO_FEATURES = "x11" + RDEPENDS:${PN} = "libvdpau" SRCREV = "d3c5bd63bf8878d59b22d618d2bb5116db392d28"
It depends on libvdpau and libvdpau has: inherit features_check REQUIRED_DISTRO_FEATURES = "x11" since: commit 0055684612edddae0f041e984c8497c5e5b32e74 Author: Armin Kuster <akuster808@gmail.com> Date: Tue Mar 6 17:27:30 2018 -0800 Subject: libvdpau: only include when x11 in DISTRO_FEATURES the same restriction should be repeated here to avoid: ERROR: Nothing PROVIDES 'libvdpau' (but meta-oe/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb DEPENDS on or otherwise requires it) libvdpau was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES) Also add it to packagegroup-meta-oe and fix libvdpau there. Signed-off-by: Martin Jansa <martin.jansa@gmail.com> --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)