From 28de6640a37837e75d4e4b56e74d93347113d2d5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 11 Nov 2023 10:49:55 -0800 Subject: rygel: Upgrade to 0.40.4 -> 0.42.4 Switch to using libsoup-3 and meson for build system Disable media-export plugin, since it fails to build rygel-media-export-dvd-parser.vala:91.27-91.39: error: The name `uri_copy' does not exist in the context of `Soup' (libsoup-3.0) | 91 | var new_uri = Soup.uri_copy(file_uri, | | ^~~~~~~~~~~~~ | libsoup-3.0.vapi:4.1-4.14: note: `Soup' was declared here | 4 | namespace Soup { | | ^~~~~~~~~~~~~~ Signed-off-by: Khem Raj --- .../recipes-connectivity/rygel/rygel_0.40.4.bb | 92 ---------------------- .../recipes-connectivity/rygel/rygel_0.42.4.bb | 92 ++++++++++++++++++++++ 2 files changed, 92 insertions(+), 92 deletions(-) delete mode 100644 meta-multimedia/recipes-connectivity/rygel/rygel_0.40.4.bb create mode 100644 meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.40.4.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.40.4.bb deleted file mode 100644 index a5df37637d..0000000000 --- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.40.4.bb +++ /dev/null @@ -1,92 +0,0 @@ -SUMMARY = "A UPnP AV media server and renderer" -DESCRIPTION = "Rygel is a home media solution (UPnP AV MediaServer) that \ -allow you to easily share audio, video and pictures to other devices. \ -Additionally, media player software may use Rygel to become a MediaRenderer \ -that may be controlled remotely by a UPnP or DLNA Controller." -HOMEPAGE = "http://live.gnome.org/Rygel" - -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 \ - gstreamer1.0-plugins-base libgee libsoup-2.4 libmediaart-2.0 \ - libunistring sqlite3 intltool-native gst-editing-services" - -RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback shared-mime-info" -RRECOMMENDS:${PN} = "rygel-plugin-media-export" - -inherit gnomebase features_check vala gobject-introspection gettext systemd meson - -# gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" - -SRC_URI[archive.sha256sum] = "736d8adbe8615f6cbc8fcfff9845dc985fd10e16629da236b4b52dbedf0a348b" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' - -EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}" -PACKAGECONFIG:append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}" - -PACKAGECONFIG ?= "external mpris ruih media-export gst-launch" - -PACKAGECONFIG[external] = "" -PACKAGECONFIG[mpris] = "" -PACKAGECONFIG[ruih] = "" -PACKAGECONFIG[media-export] = "" -PACKAGECONFIG[gst-launch] = "" -PACKAGECONFIG[lms] = "" -PACKAGECONFIG[tracker3] = "" -PACKAGECONFIG[gtk+3] = ",-Dgtk=false,gtk+3" - -RYGEL_PLUGINS = "" -RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'external', ',external', '', d)}" -RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'mpris', ',mpris', '', d)}" -RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'ruih', ',ruih', '', d)}" -RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'gst-launch', ',gst-launch', '', d)}" -RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'lms', ',lms', '', d)}" -RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'media-export', ',media-export', '', d)}" -RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'tracker3', ',tracker3', '', d)}" -RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'playbin', ',playbin', '', d)}" - -LIBV = "2.6" - -CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion" - -def strip_comma(s): - return s.strip(',') - -do_install:append() { - # Remove .la files for loadable modules - rm -f ${D}/${libdir}/rygel-${LIBV}/engines/*.la - rm -f ${D}/${libdir}/rygel-${LIBV}/plugins/*.la - if [ -e ${D}${nonarch_libdir}/systemd/user/rygel.service ]; then - mkdir -p ${D}${systemd_unitdir}/system - mv ${D}${nonarch_libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system - rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/user \ - ${D}${nonarch_libdir}/systemd \ - ${D}${nonarch_libdir} - fi -} - -FILES:${PN} += "${libdir}/rygel-${LIBV}/engines ${datadir}/dbus-1 ${datadir}/icons" -FILES:${PN}-dbg += "${libdir}/rygel-${LIBV}/engines/.debug ${libdir}/rygel-${LIBV}/plugins/.debug" - -PACKAGES += "${PN}-meta" -ALLOW_EMPTY:${PN}-meta = "1" - -PACKAGES_DYNAMIC = "${PN}-plugin-*" - -SYSTEMD_SERVICE:${PN} = "rygel.service" - -python populate_packages:prepend () { - rygel_libdir = d.expand('${libdir}/rygel-${LIBV}') - postinst = d.getVar('plugin_postinst') - pkgs = [] - - pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), r'librygel-(.*)\.so$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) - pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), r'(.*)\.plugin$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) - - metapkg = d.getVar('PN') + '-meta' - d.setVar('RDEPENDS:' + metapkg, ' '.join(pkgs)) -} diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb new file mode 100644 index 0000000000..9662296399 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb @@ -0,0 +1,92 @@ +SUMMARY = "A UPnP AV media server and renderer" +DESCRIPTION = "Rygel is a home media solution (UPnP AV MediaServer) that \ +allow you to easily share audio, video and pictures to other devices. \ +Additionally, media player software may use Rygel to become a MediaRenderer \ +that may be controlled remotely by a UPnP or DLNA Controller." +HOMEPAGE = "http://live.gnome.org/Rygel" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 \ + gstreamer1.0-plugins-base libgee libsoup libmediaart-2.0 \ + libunistring sqlite3 intltool-native gst-editing-services" + +RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback shared-mime-info" +RRECOMMENDS:${PN} = "rygel-plugin-media-export" + +inherit gnomebase features_check vala gobject-introspection gettext systemd + +# gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" + +SRC_URI[archive.sha256sum] = "6310dfaa2d332b66119b9b020fad6a4bd27d9bc61faf780ca5ca0b62813303f7" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}" +PACKAGECONFIG:append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}" + +PACKAGECONFIG ?= "external mpris ruih gst-launch" + +PACKAGECONFIG[external] = "" +PACKAGECONFIG[mpris] = "" +PACKAGECONFIG[ruih] = "" +PACKAGECONFIG[media-export] = "" +PACKAGECONFIG[gst-launch] = "" +PACKAGECONFIG[lms] = "" +PACKAGECONFIG[tracker3] = "" +PACKAGECONFIG[gtk+3] = ",-Dgtk=false,gtk+3" + +RYGEL_PLUGINS = "" +RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'external', ',external', '', d)}" +RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'mpris', ',mpris', '', d)}" +RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'ruih', ',ruih', '', d)}" +RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'gst-launch', ',gst-launch', '', d)}" +RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'lms', ',lms', '', d)}" +RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'media-export', ',media-export', '', d)}" +RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'tracker3', ',tracker3', '', d)}" +RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'playbin', ',playbin', '', d)}" + +LIBV = "2.8" + +CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion" + +def strip_comma(s): + return s.strip(',') + +do_install:append() { + # Remove .la files for loadable modules + rm -f ${D}/${libdir}/rygel-${LIBV}/engines/*.la + rm -f ${D}/${libdir}/rygel-${LIBV}/plugins/*.la + if [ -e ${D}${nonarch_libdir}/systemd/user/rygel.service ]; then + mkdir -p ${D}${systemd_unitdir}/system + mv ${D}${nonarch_libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system + rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/user \ + ${D}${nonarch_libdir}/systemd \ + ${D}${nonarch_libdir} + fi +} + +FILES:${PN} += "${libdir}/rygel-${LIBV}/engines ${datadir}/dbus-1 ${datadir}/icons" +FILES:${PN}-dbg += "${libdir}/rygel-${LIBV}/engines/.debug ${libdir}/rygel-${LIBV}/plugins/.debug" + +PACKAGES += "${PN}-meta" +ALLOW_EMPTY:${PN}-meta = "1" + +PACKAGES_DYNAMIC = "${PN}-plugin-*" + +SYSTEMD_SERVICE:${PN} = "rygel.service" + +python populate_packages:prepend () { + rygel_libdir = d.expand('${libdir}/rygel-${LIBV}') + postinst = d.getVar('plugin_postinst') + pkgs = [] + + pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), r'librygel-(.*)\.so$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), r'(.*)\.plugin$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + + metapkg = d.getVar('PN') + '-meta' + d.setVar('RDEPENDS:' + metapkg, ' '.join(pkgs)) +} -- cgit v1.2.3-54-g00ecf