Skip to contentSkip to conversation

rygel: require gobject-introspection-data in DISTRO_FEATURES

PATCH Superseded Martin Jansa 1 participant 2 messages Jun 12, 2021 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 rygel: require gobject-introspection-data in DISTRO_FEATURES

* introduced in libmediaart-2.0 with:
https://git.openembedded.org/meta-openembedded/commit/?id=2b90058c346a5a56dced3c1b7413068027a884f1

---
 meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb   | 5 ++++-
 .../packagegroups/packagegroup-meta-multimedia.bb            | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb +4 -1
index 3fc8450513..01705a8f71 100644
@@ -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"
meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +2 -2
index 73b852a4a9..852295b983 100644
@@ -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)} \
     libmediaart \
     gst-instruments \
     libsrtp \
Signature · 1 line
2.30.2
#2 lore raw

PATCH v2 1/1 rygel: require gobject-introspection-data in DISTRO_FEATURES

In reply to a message not in the archive

* introduced in libmediaart-2.0 with:
https://git.openembedded.org/meta-openembedded/commit/?id=2b90058c346a5a56dced3c1b7413068027a884f1

---
 meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb   | 5 ++++-
 .../packagegroups/packagegroup-meta-multimedia.bb            | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb +4 -1
index 3fc8450513..01705a8f71 100644
@@ -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"
meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +2 -2
index b9f90d2c7f..0601cdd99b 100644
@@ -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 \
Signature · 1 line
2.30.2