[PATCH 1/4] Revert "gstreamer1.0-python: do not supply unknown g-i options"

[PATCH 1/4] Revert "gstreamer1.0-python: do not supply unknown g-i options"

[Khem Raj]

This reverts commit f4bbbf2cd3e711875489b19f9b55b52ebd7be4bd.
---
 .../gstreamer/gstreamer1.0-python_1.18.5.bb          | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb
index a32805d1298..74dd15b3eb0 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb
@@ -21,14 +21,6 @@ EXTRA_OEMESON += "-Dlibpython-dir=${libdir}"
 
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST:append = " introspection"
 
-inherit meson pkgconfig distutils3-base upstream-version-is-even features_check
-
-# Generating introspection data depends on a combination of native and target
-# introspection tools, and qemu to run the target tools.
-DEPENDS:append:class-target = " gobject-introspection gobject-introspection-native qemu-native prelink-native"
-
-# Even though introspection is disabled on -native, gobject-introspection package is still
-# needed for m4 macros.
-DEPENDS:append:class-native = " gobject-introspection-native"
-DEPENDS:append:class-nativesdk = " gobject-introspection-native"
+inherit meson pkgconfig distutils3-base upstream-version-is-even gobject-introspection features_check
-- 
2.33.1

[PATCH 2/4] Revert "python3-pygobject: do not supply unknown g-i options"

[Khem Raj]

This reverts commit 9c0cc06a3d857124c0e1c1c9342f79ba5a3b10bc.
---
 .../python/python3-pygobject_3.42.0.bb              | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb b/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
index 7ff7c5b4dd5..461ddcfe319 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
@@ -6,19 +6,10 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
 
 GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase distutils3-base upstream-version-is-even
+inherit gnomebase distutils3-base gobject-introspection upstream-version-is-even
 
 DEPENDS += "python3 glib-2.0"
 
-# Generating introspection data depends on a combination of native and target
-# introspection tools, and qemu to run the target tools.
-DEPENDS:append:class-target = " gobject-introspection gobject-introspection-native qemu-native prelink-native"
-
-# Even though introspection is disabled on -native, gobject-introspection package is still
-# needed for m4 macros.
-DEPENDS:append:class-native = " gobject-introspection-native"
-DEPENDS:append:class-nativesdk = " gobject-introspection-native"
-
 SRCNAME="pygobject"
 
 SRC_URI = " \
@@ -27,6 +18,8 @@ SRC_URI = " \
 "
 SRC_URI[sha256sum] = "9b12616e32cfc792f9dc841d9c472a41a35b85ba67d3a6eb427e307a6fe4367b"
 
+UNKNOWN_CONFIGURE_WHITELIST = "introspection"
+
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wayland', 'x11' ], 'cairo', '', d)}"
-- 
2.33.1

[PATCH 3/4] python3-pygobject: Do not add -Dintrospection

[Khem Raj]

meson 0.60 turns unknown options into them hard errors

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/python/python3-pygobject_3.42.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb b/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
index 461ddcfe319..b07969c5efb 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
@@ -6,6 +6,8 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
 
 GNOMEBASEBUILDCLASS = "meson"
+GIR_MESON_OPTION = ""
+
 inherit gnomebase distutils3-base gobject-introspection upstream-version-is-even
 
 DEPENDS += "python3 glib-2.0"
@@ -18,8 +20,6 @@ SRC_URI = " \
 "
 SRC_URI[sha256sum] = "9b12616e32cfc792f9dc841d9c472a41a35b85ba67d3a6eb427e307a6fe4367b"
 
-UNKNOWN_CONFIGURE_WHITELIST = "introspection"
-
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wayland', 'x11' ], 'cairo', '', d)}"
-- 
2.33.1

[PATCH 4/4] gstreamer1.0-python: Do not add -Dintrospection

[Khem Raj]

meson 0.60 turns unknown options into them hard errors

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb
index 74dd15b3eb0..045aea44099 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb
@@ -21,6 +21,6 @@ EXTRA_OEMESON += "-Dlibpython-dir=${libdir}"
 
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
-UNKNOWN_CONFIGURE_WHITELIST:append = " introspection"
+GIR_MESON_OPTION = ""
 
 inherit meson pkgconfig distutils3-base upstream-version-is-even gobject-introspection features_check
-- 
2.33.1

RE: [OE-core] [PATCH 3/4] python3-pygobject: Do not add -Dintrospection

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Khem Raj
> Sent: den 12 november 2021 22:04
> To: openembedded-core@lists.openembedded.org
> Cc: Khem Raj <raj.khem@gmail.com>
> Subject: [OE-core] [PATCH 3/4] python3-pygobject: Do not add -Dintrospection
> 
> meson 0.60 turns unknown options into them hard errors

Remove "them" (and correspondingly for the gstreamer1.0-python patch).

> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

May I suggest squashing this commit with the preceding revert for 
python3-pygobject, and similarly for the two patches for 
gstreamer1.0-python. Otherwise this layer will be broken, e.g., if one 
happens to end up on one of the reverts during a git bisect.

//Peter

> ---
>  meta/recipes-devtools/python/python3-pygobject_3.42.0.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb b/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
> index 461ddcfe319..b07969c5efb 100644
> --- a/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
> +++ b/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
> @@ -6,6 +6,8 @@ LICENSE = "LGPLv2.1"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
> 
>  GNOMEBASEBUILDCLASS = "meson"
> +GIR_MESON_OPTION = ""
> +
>  inherit gnomebase distutils3-base gobject-introspection upstream-version-is-even
> 
>  DEPENDS += "python3 glib-2.0"
> @@ -18,8 +20,6 @@ SRC_URI = " \
>  "
>  SRC_URI[sha256sum] = "9b12616e32cfc792f9dc841d9c472a41a35b85ba67d3a6eb427e307a6fe4367b"
> 
> -UNKNOWN_CONFIGURE_WHITELIST = "introspection"
> -
>  S = "${WORKDIR}/${SRCNAME}-${PV}"
> 
>  PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wayland', 'x11' ], 'cairo', '', d)}"
> --
> 2.33.1