From patchwork Wed Apr 24 13:23:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 42856 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED3E3C10F15 for ; Wed, 24 Apr 2024 13:23:36 +0000 (UTC) Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by mx.groups.io with SMTP id smtpd.web11.16205.1713965009576080622 for ; Wed, 24 Apr 2024 06:23:29 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.18, mailfrom: f_l_k@t-online.de) Received: from fwd77.aul.t-online.de (fwd77.aul.t-online.de [10.223.144.103]) by mailout04.t-online.de (Postfix) with SMTP id ECB04186AB for ; Wed, 24 Apr 2024 15:23:05 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.163.39.163]) by fwd77.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1rzcaX-1fkw8g0; Wed, 24 Apr 2024 15:23:05 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCH 2/3] rygel: update 0.42.4 -> 0.42.5 Date: Wed, 24 Apr 2024 15:23:28 +0200 Message-ID: <20240424132329.2706-2-f_l_k@t-online.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424132329.2706-1-f_l_k@t-online.de> References: <20240424132329.2706-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1713964985-277FDD34-CC9F8DE3/0/0 CLEAN NORMAL X-TOI-MSGID: 9d1bb942-0eed-4f9f-b031-b9e46bb284de List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 24 Apr 2024 13:23:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110126 - dont convert to systemd system service. rygel is meant to 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 --- .../rygel/{rygel_0.42.4.bb => rygel_0.42.5.bb} | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) rename meta-multimedia/recipes-connectivity/rygel/{rygel_0.42.4.bb => rygel_0.42.5.bb} (83%) diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb similarity index 83% rename from meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb rename to 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 # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" -SRC_URI[archive.sha256sum] = "6310dfaa2d332b66119b9b020fad6a4bd27d9bc61faf780ca5ca0b62813303f7" +SRC_URI[archive.sha256sum] = "1133602d2e6710aade6b22aa98d93384c8d56396f344763413e96e0110b7d89f" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' @@ -28,7 +28,7 @@ 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 mpris ruih gst-launch media-export" PACKAGECONFIG[external] = "" PACKAGECONFIG[mpris] = "" @@ -60,16 +60,9 @@ 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} += "${libdir}/rygel-${LIBV}/engines ${systemd_user_unitdir} ${datadir}/dbus-1 ${datadir}/icons" FILES:${PN}-dbg += "${libdir}/rygel-${LIBV}/engines/.debug ${libdir}/rygel-${LIBV}/plugins/.debug" PACKAGES += "${PN}-meta" @@ -77,8 +70,6 @@ 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')