aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-06-12 22:10:19 +0200
committerKhem Raj <raj.khem@gmail.com>2021-06-12 15:11:39 -0700
commit189cdf4337aa2098eb447e82264143392a947334 (patch)
tree2408c4894e5249fe34f862d279de686a57a59cd4
parentd03e76e2884c7af1075b42c09781f67e93bea51c (diff)
downloadmeta-openembedded-189cdf4337aa2098eb447e82264143392a947334.tar.gz
meta-openembedded-189cdf4337aa2098eb447e82264143392a947334.tar.bz2
meta-openembedded-189cdf4337aa2098eb447e82264143392a947334.zip
rygel: require gobject-introspection-data in DISTRO_FEATURES
* introduced in libmediaart-2.0 with: https://git.openembedded.org/meta-openembedded/commit/?id=2b90058c346a5a56dced3c1b7413068027a884f1 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb5
-rw-r--r--meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb4
2 files changed, 6 insertions, 3 deletions
diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb
index 3fc845051..01705a8f7 100644
--- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb
+++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb
@@ -12,7 +12,10 @@ DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstream
RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback shared-mime-info"
RRECOMMENDS_${PN} = "rygel-plugin-media-export"
-inherit gnomebase vala gobject-introspection gettext systemd
+inherit gnomebase vala gobject-introspection gettext systemd features_check
+
+# gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
SRC_URI[archive.md5sum] = "7f95401903a3f855b464d5152b9d4c07"
SRC_URI[archive.sha256sum] = "08c21a577f7bdad26446a75ffa32778b26842c3b1188165f0b19818559747d00"
diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
index b9f90d2c7..0601cdd99 100644
--- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
+++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
@@ -85,7 +85,7 @@ RDEPENDS_packagegroup-meta-multimedia-connectivity = "\
${@bb.utils.contains("DISTRO_FEATURES", "x11", "gupnp-tools", "", d)} \
gupnp \
libupnp \
- rygel \
+ ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "rygel", "", d)} \
"
RDEPENDS_packagegroup-meta-multimedia-dvb = "\
oscam \
@@ -99,7 +99,7 @@ RDEPENDS_packagegroup-meta-multimedia-mkv = "\
RDEPENDS_packagegroup-meta-multimedia-support = "\
crossguid \
- libmediaart-2.0 \
+ ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "libmediaart-2.0", "", d)} \
gst-instruments \
libsrtp \
srt \