[meta-gnome][PATCH 1/3] gupnp: dont package source

[meta-gnome][PATCH 1/3] gupnp: dont package source

[Markus Volk]

Source code contains reference to tmpdir. Dont package to avoid
reproducibility issue

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb | 1 +
 meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb
index f2e27622c..c7fee78a8 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb
+++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb
@@ -28,5 +28,6 @@ PACKAGECONFIG[sniffer] = "-Dsniffer=true,-Dsniffer=false,gtk4,"
 REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'sniffer', 'opengl', '', d)}"
 
 PACKAGES =+ "gssdp-tools"
+PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 
 FILES:gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade"
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
index f1628d82e..80d0b3e2d 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
@@ -18,4 +18,5 @@ gupnp_sysroot_preprocess () {
 
 FILES:${PN}-dev += "${bindir}/gupnp-binding-tool*"
 
+PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 RDEPENDS:${PN}-dev += "python3-core python3-xml"
-- 
2.44.0

[meta-gnome][PATCH 2/3] rygel: update 0.42.4 -> 0.42.5

[Markus Volk]

- 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 <f_l_k@t-online.de>
---
 .../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')
-- 
2.44.0

Re: [oe] [meta-gnome][PATCH 1/3] gupnp: dont package source

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 2238 bytes --]

On Wed, Apr 24, 2024 at 3:23 PM Markus Volk via lists.openembedded.org
<f_l_k=t-online.de@lists.openembedded.org> wrote:

> Source code contains reference to tmpdir. Dont package to avoid
> reproducibility issue


Can we root cause it instead ? Removing sources from debug info might fix
this issue but degrade debugging experience

>
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb | 1 +
>  meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb
> b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb
> index f2e27622c..c7fee78a8 100644
> --- a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb
> +++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb
> @@ -28,5 +28,6 @@ PACKAGECONFIG[sniffer] =
> "-Dsniffer=true,-Dsniffer=false,gtk4,"
>  REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG',
> 'sniffer', 'opengl', '', d)}"
>
>  PACKAGES =+ "gssdp-tools"
> +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
>
>  FILES:gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade"
> diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
> b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
> index f1628d82e..80d0b3e2d 100644
> --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
> +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
> @@ -18,4 +18,5 @@ gupnp_sysroot_preprocess () {
>
>  FILES:${PN}-dev += "${bindir}/gupnp-binding-tool*"
>
> +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
>  RDEPENDS:${PN}-dev += "python3-core python3-xml"
> --
> 2.44.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#110125):
> https://lists.openembedded.org/g/openembedded-devel/message/110125
> Mute This Topic: https://lists.openembedded.org/mt/105709729/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 4129 bytes --]

Re: [oe] [meta-gnome][PATCH 1/3] gupnp: dont package source

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

On Wed, Apr 24 2024 at 04:40:21 PM +02:00:00, Khem Raj 
<raj.khem@gmail.com> wrote:
> Can we root cause it instead ? Removing sources from debug info might 
> fix this issue but degrade debugging experience

I will take a look at it


[-- Attachment #2: Type: text/html, Size: 340 bytes --]

Re: [oe] [meta-gnome][PATCH 1/3] gupnp: dont package source

[Ross Burton]

> On 24 Apr 2024, at 16:14, Markus Volk via lists.openembedded.org <f_l_k=t-online.de@lists.openembedded.org> wrote:
> 
> On Wed, Apr 24 2024 at 04:40:21 PM +02:00:00, Khem Raj <raj.khem@gmail.com> wrote:
>> Can we root cause it instead ? Removing sources from debug info might fix this issue but degrade debugging experience 
> 
> 
> I will take a look at it

The usual culprit is build paths in generated files (like glib-generated headers), which is often a trivial fix to use basename instead.

Ross

Re: [oe] [meta-gnome][PATCH 1/3] gupnp: dont package source

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 1007 bytes --]

On Wed, Apr 24 2024 at 03:42:47 PM +00:00:00, Ross Burton 
<Ross.Burton@arm.com> wrote:
> The usual culprit is build paths in generated files (like 
> glib-generated headers), which is often a trivial fix to use basename 
> instead.
> 
> Ross

Thats right, But it looks like basename wouldn't help here. 
glib-mkenums adds  headers from ${S}:

/* enumerations from 
"/home/flk/poky/build/tmp/work/corei7-64-poky-linux/gupnp/1.6.6/build/../gupnp-1.6.6/libgupnp/gupnp-error.h" 
*/
#include 
"/home/flk/poky/build/tmp/work/corei7-64-poky-linux/gupnp/1.6.6/build/../gupnp-1.6.6/libgupnp/gupnp-error.h"

/* enumerations from 
"/home/flk/poky/build/tmp/work/corei7-64-poky-linux/gupnp/1.6.6/build/../gupnp-1.6.6/libgupnp/gupnp-service-introspection.h" 
*/
#include 
"/home/flk/poky/build/tmp/work/corei7-64-poky-linux/gupnp/1.6.6/build/../gupnp-1.6.6/libgupnp/gupnp-service-introspection.h"

I guess build will break, if the headers are not found. So we need to 
compile, before the buildpaths can be removed?




[-- Attachment #2: Type: text/html, Size: 1303 bytes --]

Re: [oe] [meta-gnome][PATCH 1/3] gupnp: dont package source

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

On Wed, Apr 24 2024 at 06:03:18 PM +02:00:00, Markus Volk 
<f_l_k@t-online.de> wrote:
> I guess build will break

No it doesn't, using @basename@ fixes the issue.

Now it looks like:
/* enumerations from "gupnp-error.h" */
#include "gupnp-error.h"

I'll send this to upstream first. Lets see if this would work for all


[-- Attachment #2: Type: text/html, Size: 491 bytes --]

Re: [oe] [meta-gnome][PATCH 1/3] gupnp: dont package source

[Ross Burton]

On 24 Apr 2024, at 17:31, Markus Volk <f_l_k@t-online.de> wrote:
> 
> On Wed, Apr 24 2024 at 06:03:18 PM +02:00:00, Markus Volk <f_l_k@t-online.de> wrote:
>> I guess build will break
> 
> 
> No it doesn't, using @basename@ fixes the issue.
> 
> Now it looks like:
> /* enumerations from "gupnp-error.h" */
> #include "gupnp-error.h"
> 
> I'll send this to upstream first. Lets see if this would work for all

Yeah that’s the correct fix.

Ross 

Re: [oe] [meta-gnome][PATCH 1/3] gupnp: dont package source

[Khem Raj]

On Wed, Apr 24, 2024 at 6:31 PM Markus Volk <f_l_k@t-online.de> wrote:
>
> On Wed, Apr 24 2024 at 06:03:18 PM +02:00:00, Markus Volk <f_l_k@t-online.de> wrote:
>
> I guess build will break
>
>
> No it doesn't, using @basename@ fixes the issue.
>
> Now it looks like:
> /* enumerations from "gupnp-error.h" */
> #include "gupnp-error.h"
>
> I'll send this to upstream first. Lets see if this would work for all

you are on right path see a similar fix I did in past

https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/merge_requests/125/commits