From 23b62b3391f2e605f59e02abb3c99db2a7b82eb5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 12 Dec 2023 13:57:42 +0100 Subject: rygel: add x11 to DISTRO_FEATURES * it was added in rygel-0.41.0 with: https://github.com/GNOME/rygel/commit/18cd2cff6f64b7a54156ac97e5c4f50eb8fd8d67 * it might need libx11 dependency as well which would probably be pulled by gtk+3 already when x11 is in DISTRO_FEATURES * as shown in: http://errors.yoctoproject.org/Errors/Details/746017/ it requires x11 even when gtk support is disabled, meson-log.txt: Determining dependency 'x11' with pkg-config executable '/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/rygel/0.42.4/recipe-sysroot-native/usr/bin/pkg-config' env[PKG_CONFIG_DIR]: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/rygel/0.42.4/recipe-sysroot/usr/lib/pkgconfig env[PKG_CONFIG_PATH]: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/rygel/0.42.4/recipe-sysroot/usr/lib/pkgconfig:/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/rygel/0.42.4/recipe-sysroot/usr/share/pkgconfig env[PKG_CONFIG_LIBDIR]: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/rygel/0.42.4/recipe-sysroot/usr/lib/pkgconfig env[PKG_CONFIG_DISABLE_UNINSTALLED]: yes env[PKG_CONFIG_SYSROOT_DIR]: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/rygel/0.42.4/recipe-sysroot env[PKG_CONFIG_SYSTEM_LIBRARY_PATH]: /usr/lib:/usr/lib env[PKG_CONFIG_SYSTEM_INCLUDE_PATH]: /usr/include env[PKG_CONFIG]: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/rygel/0.42.4/recipe-sysroot-native/usr/bin/pkg-config ----------- Called: `/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/rygel/0.42.4/recipe-sysroot-native/usr/bin/pkg-config --modversion x11` -> 1 stderr: Package x11 was not found in the pkg-config search path. Perhaps you should add the directory containing `x11.pc' to the PKG_CONFIG_PATH environment variable No package 'x11' found ----------- CMake binary for host machine is cached as not found Dependency lookup for x11 with method 'cmake' failed: CMake binary for machine host machine not found. Giving up. Run-time dependency x11 found: NO (tried pkgconfig) ../rygel-0.42.4/src/rygel/meson.build:9:80: ERROR: Dependency "x11" not found, tried pkgconfig Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb') diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index b18ad6ad1..672c8abc9 100644 --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -62,7 +62,7 @@ RDEPENDS:packagegroup-meta-multimedia-connectivity = "\ gupnp-dlna \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gupnp-tools", "", d)} \ libupnp \ - ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "rygel", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "rygel", "", d), "", d)} \ " RDEPENDS:packagegroup-meta-multimedia-dvb = "\ oscam \ -- cgit v1.2.3-54-g00ecf