Skip to contentSkip to conversation

graphene: remove introspection from PACKAGECONFIG

PATCH Petr Kubizňák - 2N 2 participants 4 messages Mar 7, 2023 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

Could anyone have a look at this patch, please?

Thank you,
Petr

________________________________________
From: [email protected] <[email protected]> on behalf of Petr Kubizňák - 2N <[email protected]>
Sent: Friday, February 17, 2023 8:47 AM
To: [email protected]
Cc: Petr Kubizňák - 2N
Subject: [OE-core][PATCH] graphene: remove introspection from PACKAGECONFIG

Assignment of "introspection" as default PACKAGECONFIG value does not reflect gobject-introspection being globally enabled or disabled. As a result, graphene compilation used to fail when g-i was disabled.

Use standard means to enable or disable introspection based on machine and distro features, as implemented by gobject-introspection class.

---
 meta/recipes-graphics/graphene/graphene_1.10.8.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-graphics/graphene/graphene_1.10.8.bb +4 -3
index 75c8258d99..120ee80b17 100644
@@ -9,14 +9,15 @@ inherit gnomebase gobject-introspection gtk-doc
 
 SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a"
 
-# gtk4 & mutter 41.0 requires graphene build with introspection
 # Disable neon support by default on ARM-32 platforms because of the
 # following upstream bug: https://github.com/ebassi/graphene/issues/215
-PACKAGECONFIG ?= "introspection ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}"
 
-PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled,"
 PACKAGECONFIG[neon] = "-Darm_neon=true,-Darm_neon=false,"
 
+GIR_MESON_ENABLE_FLAG = 'enabled'
+GIR_MESON_DISABLE_FLAG = 'disabled'
+
 GTKDOC_MESON_OPTION = "gtk_doc"
 
 EXTRA_OEMESON = "-Dinstalled_tests=false"

--
2.30.2

#2 lore raw

Has been merged long time ago. Pls rebase to master, then ask.

Alex

Quoted 60 lines · Petr Kubizňák

Could anyone have a look at this patch, please?

Thank you,
Petr

________________________________________
From: [email protected] <[email protected]> on behalf of Petr Kubizňák - 2N <[email protected]>
Sent: Friday, February 17, 2023 8:47 AM
To: [email protected]
Cc: Petr Kubizňák - 2N
Subject: [OE-core][PATCH] graphene: remove introspection from PACKAGECONFIG

Assignment of "introspection" as default PACKAGECONFIG value does not reflect gobject-introspection being globally enabled or disabled. As a result, graphene compilation used to fail when g-i was disabled.

Use standard means to enable or disable introspection based on machine and distro features, as implemented by gobject-introspection class.

---
 meta/recipes-graphics/graphene/graphene_1.10.8.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-graphics/graphene/graphene_1.10.8.bb +4 -4
index 75c8258d99..120ee80b17 100644
@@ -9,14 +9,15 @@ inherit gnomebase gobject-introspection gtk-doc
 
 SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a"
 
-# gtk4 & mutter 41.0 requires graphene build with introspection
 # Disable neon support by default on ARM-32 platforms because of the
 # following upstream bug: https://github.com/ebassi/graphene/issues/215
-PACKAGECONFIG ?= "introspection ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}"
 
-PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled,"
 PACKAGECONFIG[neon] = "-Darm_neon=true,-Darm_neon=false,"
 
+GIR_MESON_ENABLE_FLAG = 'enabled'
+GIR_MESON_DISABLE_FLAG = 'disabled'
+
 GTKDOC_MESON_OPTION = "gtk_doc"
 
 EXTRA_OEMESON = "-Dinstalled_tests=false"
--

2.30.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178095): https://lists.openembedded.org/g/openembedded-core/message/178095
Mute This Topic: https://lists.openembedded.org/mt/97024165/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#3 lore raw

I see, sorry. I expected some kind of "merged" response in this thread.

Cheers,
Petr

________________________________________
From: Alexander Kanavin <[email protected]>
Sent: Tuesday, March 7, 2023 10:31 AM
To: Petr Kubizňák - 2N
Cc: [email protected]
Subject: Re: [OE-core][PATCH] graphene: remove introspection from PACKAGECONFIG

Has been merged long time ago. Pls rebase to master, then ask.

Alex

Quoted 60 lines · Petr Kubizňák

Could anyone have a look at this patch, please?

Thank you,
Petr

________________________________________
From: [email protected] <[email protected]> on behalf of Petr Kubizňák - 2N <[email protected]>
Sent: Friday, February 17, 2023 8:47 AM
To: [email protected]
Cc: Petr Kubizňák - 2N
Subject: [OE-core][PATCH] graphene: remove introspection from PACKAGECONFIG

Assignment of "introspection" as default PACKAGECONFIG value does not reflect gobject-introspection being globally enabled or disabled. As a result, graphene compilation used to fail when g-i was disabled.

Use standard means to enable or disable introspection based on machine and distro features, as implemented by gobject-introspection class.

---
 meta/recipes-graphics/graphene/graphene_1.10.8.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-graphics/graphene/graphene_1.10.8.bb +4 -4
index 75c8258d99..120ee80b17 100644
@@ -9,14 +9,15 @@ inherit gnomebase gobject-introspection gtk-doc
 
 SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a"
 
-# gtk4 & mutter 41.0 requires graphene build with introspection
 # Disable neon support by default on ARM-32 platforms because of the
 # following upstream bug: https://github.com/ebassi/graphene/issues/215
-PACKAGECONFIG ?= "introspection ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}"
 
-PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled,"
 PACKAGECONFIG[neon] = "-Darm_neon=true,-Darm_neon=false,"
 
+GIR_MESON_ENABLE_FLAG = 'enabled'
+GIR_MESON_DISABLE_FLAG = 'disabled'
+
 GTKDOC_MESON_OPTION = "gtk_doc"
 
 EXTRA_OEMESON = "-Dinstalled_tests=false"
--

2.30.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178095): https://lists.openembedded.org/g/openembedded-core/message/178095
Mute This Topic: https://lists.openembedded.org/mt/97024165/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#4 lore raw

We don't send them out as it's too much manual work for integrators.

I'd like to see a bot that sends notifications privately when patches land in master - if you can commit time and make it happen, that'd be great :)

Alex

Quoted 81 lines · Petr Kubizňák

I see, sorry. I expected some kind of "merged" response in this thread.

Cheers,
Petr

________________________________________
From: Alexander Kanavin <[email protected]>
Sent: Tuesday, March 7, 2023 10:31 AM
To: Petr Kubizňák - 2N
Cc: [email protected]
Subject: Re: [OE-core][PATCH] graphene: remove introspection from PACKAGECONFIG

Has been merged long time ago. Pls rebase to master, then ask.

Alex

Quoted 49 lines · Petr Kubizňák

Could anyone have a look at this patch, please?

Thank you,
Petr

________________________________________
From: [email protected] <[email protected]> on behalf of Petr Kubizňák - 2N <[email protected]>
Sent: Friday, February 17, 2023 8:47 AM
To: [email protected]
Cc: Petr Kubizňák - 2N
Subject: [OE-core][PATCH] graphene: remove introspection from PACKAGECONFIG

Assignment of "introspection" as default PACKAGECONFIG value does not reflect gobject-introspection being globally enabled or disabled. As a result, graphene compilation used to fail when g-i was disabled.

Use standard means to enable or disable introspection based on machine and distro features, as implemented by gobject-introspection class.

---
 meta/recipes-graphics/graphene/graphene_1.10.8.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-graphics/graphene/graphene_1.10.8.bb +4 -4
index 75c8258d99..120ee80b17 100644
@@ -9,14 +9,15 @@ inherit gnomebase gobject-introspection gtk-doc
 
 SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a"
 
-# gtk4 & mutter 41.0 requires graphene build with introspection
 # Disable neon support by default on ARM-32 platforms because of the
 # following upstream bug: https://github.com/ebassi/graphene/issues/215
-PACKAGECONFIG ?= "introspection ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}"
 
-PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled,"
 PACKAGECONFIG[neon] = "-Darm_neon=true,-Darm_neon=false,"
 
+GIR_MESON_ENABLE_FLAG = 'enabled'
+GIR_MESON_DISABLE_FLAG = 'disabled'
+
 GTKDOC_MESON_OPTION = "gtk_doc"
 
 EXTRA_OEMESON = "-Dinstalled_tests=false"
--
Quoted 5 lines

2.30.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178098): https://lists.openembedded.org/g/openembedded-core/message/178098
Mute This Topic: https://lists.openembedded.org/mt/97024165/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-