diff options
author | Markus Volk <f_l_k@t-online.de> | 2024-04-24 20:02:33 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-04-28 08:55:01 -0700 |
commit | 1de297f7b1a2577a1bb2e4538614022a2970a2d1 (patch) | |
tree | 13ebdd627011307944c3a051a2f69d3276276660 | |
parent | fb31a0706fe32bd2b43fced28caaf836dadb3fc2 (diff) | |
download | meta-openembedded-1de297f7b1a2577a1bb2e4538614022a2970a2d1.tar.gz |
rygel: update 0.42.4 -> 0.42.5
- dont convert to systemd system service. rygel should be started as
a user service. This is also a requirement to get it working in
gnome-control-center
- build with PACKAGECONFIG media-export to make rygel work out of the box
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb (renamed from meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb) | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb index 4fbdce086..e79bd77a5 100644 --- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb +++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb | |||
@@ -20,7 +20,7 @@ inherit gnomebase features_check vala gobject-introspection gettext systemd | |||
20 | # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured | 20 | # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured |
21 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" | 21 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" |
22 | 22 | ||
23 | SRC_URI[archive.sha256sum] = "6310dfaa2d332b66119b9b020fad6a4bd27d9bc61faf780ca5ca0b62813303f7" | 23 | SRC_URI[archive.sha256sum] = "1133602d2e6710aade6b22aa98d93384c8d56396f344763413e96e0110b7d89f" |
24 | 24 | ||
25 | GIR_MESON_ENABLE_FLAG = 'enabled' | 25 | GIR_MESON_ENABLE_FLAG = 'enabled' |
26 | GIR_MESON_DISABLE_FLAG = 'disabled' | 26 | GIR_MESON_DISABLE_FLAG = 'disabled' |
@@ -28,7 +28,7 @@ GIR_MESON_DISABLE_FLAG = 'disabled' | |||
28 | EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}" | 28 | EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}" |
29 | PACKAGECONFIG:append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}" | 29 | PACKAGECONFIG:append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}" |
30 | 30 | ||
31 | PACKAGECONFIG ?= "external mpris ruih gst-launch" | 31 | PACKAGECONFIG ?= "external mpris ruih gst-launch media-export" |
32 | 32 | ||
33 | PACKAGECONFIG[external] = "" | 33 | PACKAGECONFIG[external] = "" |
34 | PACKAGECONFIG[mpris] = "" | 34 | PACKAGECONFIG[mpris] = "" |
@@ -60,16 +60,9 @@ do_install:append() { | |||
60 | # Remove .la files for loadable modules | 60 | # Remove .la files for loadable modules |
61 | rm -f ${D}/${libdir}/rygel-${LIBV}/engines/*.la | 61 | rm -f ${D}/${libdir}/rygel-${LIBV}/engines/*.la |
62 | rm -f ${D}/${libdir}/rygel-${LIBV}/plugins/*.la | 62 | rm -f ${D}/${libdir}/rygel-${LIBV}/plugins/*.la |
63 | if [ -e ${D}${nonarch_libdir}/systemd/user/rygel.service ]; then | ||
64 | mkdir -p ${D}${systemd_unitdir}/system | ||
65 | mv ${D}${nonarch_libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system | ||
66 | rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/user \ | ||
67 | ${D}${nonarch_libdir}/systemd \ | ||
68 | ${D}${nonarch_libdir} | ||
69 | fi | ||
70 | } | 63 | } |
71 | 64 | ||
72 | FILES:${PN} += "${libdir}/rygel-${LIBV}/engines ${datadir}/dbus-1 ${datadir}/icons" | 65 | FILES:${PN} += "${libdir}/rygel-${LIBV}/engines ${systemd_user_unitdir} ${datadir}/dbus-1 ${datadir}/icons" |
73 | FILES:${PN}-dbg += "${libdir}/rygel-${LIBV}/engines/.debug ${libdir}/rygel-${LIBV}/plugins/.debug" | 66 | FILES:${PN}-dbg += "${libdir}/rygel-${LIBV}/engines/.debug ${libdir}/rygel-${LIBV}/plugins/.debug" |
74 | 67 | ||
75 | PACKAGES += "${PN}-meta" | 68 | PACKAGES += "${PN}-meta" |
@@ -77,8 +70,6 @@ ALLOW_EMPTY:${PN}-meta = "1" | |||
77 | 70 | ||
78 | PACKAGES_DYNAMIC = "${PN}-plugin-*" | 71 | PACKAGES_DYNAMIC = "${PN}-plugin-*" |
79 | 72 | ||
80 | SYSTEMD_SERVICE:${PN} = "rygel.service" | ||
81 | |||
82 | python populate_packages:prepend () { | 73 | python populate_packages:prepend () { |
83 | rygel_libdir = d.expand('${libdir}/rygel-${LIBV}') | 74 | rygel_libdir = d.expand('${libdir}/rygel-${LIBV}') |
84 | postinst = d.getVar('plugin_postinst') | 75 | postinst = d.getVar('plugin_postinst') |