diff mbox series

[meta-arago,master,v2,2/2] meson: Add patch to fix Qt6 private header detection for cross-compilation

Message ID 20260116143722.2135247-2-j-sahu@ti.com
State New
Headers show
Series [meta-arago,master,v2,1/2] gstreamer1.0-plugins-good: Add QT6 PACKAGECONFIG support | expand

Commit Message

Telukula Jeevan Kumar Sahu Jan. 16, 2026, 2:37 p.m. UTC 
GStreamer commit 6efccf0ee18a[0] introduced dependency on Qt private headers
for building Qt6 qmlgl plugins. This exposed a bug in meson's Qt dependency
detection where it checks the build host filesystem instead of the sysroot
for private header paths.

Add patch to fix meson's inability to check Qt private header paths in the
sysroot during cross-compilation that sets PKG_CONFIG_SYSROOT_DIR and prepends
sysroot to Qt private header paths.

[0]: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/6efccf0ee18a3cf7f426a5acceaa716e7c41f5dd

Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com>
---
 .../recipes-devtools/meson/meson-qt6.inc      |  5 ++
 ...respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch | 72 +++++++++++++++++++
 .../recipes-devtools/meson/meson_%.bbappend   |  4 ++
 3 files changed, 81 insertions(+)
 create mode 100644 meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson-qt6.inc
 create mode 100644 meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch
 create mode 100644 meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson_%.bbappend

Comments

Ryan Eatmon Jan. 16, 2026, 3:06 p.m. UTC | #1 
On 1/16/2026 8:37 AM, Telukula Jeevan Kumar Sahu wrote:
> GStreamer commit 6efccf0ee18a[0] introduced dependency on Qt private headers
> for building Qt6 qmlgl plugins. This exposed a bug in meson's Qt dependency
> detection where it checks the build host filesystem instead of the sysroot
> for private header paths.
> 
> Add patch to fix meson's inability to check Qt private header paths in the
> sysroot during cross-compilation that sets PKG_CONFIG_SYSROOT_DIR and prepends
> sysroot to Qt private header paths.
> 
> [0]: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/6efccf0ee18a3cf7f426a5acceaa716e7c41f5dd
> 
> Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com>
> ---
>   .../recipes-devtools/meson/meson-qt6.inc      |  5 ++
>   ...respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch | 72 +++++++++++++++++++
>   .../recipes-devtools/meson/meson_%.bbappend   |  4 ++
>   3 files changed, 81 insertions(+)
>   create mode 100644 meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson-qt6.inc
>   create mode 100644 meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch
>   create mode 100644 meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson_%.bbappend
> 
> diff --git a/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson-qt6.inc b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson-qt6.inc
> new file mode 100644
> index 00000000..4a6cd19b
> --- /dev/null
> +++ b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson-qt6.inc

Same as the other patch, change -qt6 to -arago to follow the convention.


> @@ -0,0 +1,5 @@
> +FILESEXTRAPATHS:prepend := "${THISDIR}/meson:"
> +
> +SRC_URI:append = " \
> +    file://0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch \
> +"
> diff --git a/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch
> new file mode 100644
> index 00000000..ff14dc1c
> --- /dev/null
> +++ b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch
> @@ -0,0 +1,72 @@
> +From 39f0e9c9b620b4289da61422022e507144a681b0 Mon Sep 17 00:00:00 2001
> +From: Telukula Jeevan Kumar Sahu <j-sahu@ti.com>
> +Date: Fri, 9 Jan 2026 17:44:57 +0530
> +Subject: [PATCH] qt: respect PKG_CONFIG_SYSROOT_DIR for cross-compilation
> +
> +When cross-compiling with Yocto/OpenEmbedded, pkg-config returns paths
> +without the sysroot prefix (e.g., /usr/include/QtCore), but the actual
> +files are in the recipe-sysroot. The _qt_get_private_includes() function
> +checks the host filesystem instead of the sysroot for Qt private headers.
> +
> +This patch adds PKG_CONFIG_SYSROOT_DIR support to prepend sysroot when
> +checking directory existence and when returning paths. Changes only
> +activate when PKG_CONFIG_SYSROOT_DIR is set, preserving native builds.
> +
> +Also fixes dirname assignment to use full path instead of basename.
> +
> +Related issue: https://github.com/mesonbuild/meson/issues/15456
> +
> +Upstream-Status: Inappropriate [Yocto-specific sysroot handling]
> +
> +Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com>
> +---
> + mesonbuild/dependencies/qt.py | 21 ++++++++++++++++-----
> + 1 file changed, 16 insertions(+), 5 deletions(-)
> +
> +diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py
> +index c245e5c..a3846ec 100644
> +--- a/mesonbuild/dependencies/qt.py
> ++++ b/mesonbuild/dependencies/qt.py
> +@@ -42,16 +42,24 @@ def _qt_get_private_includes(mod_inc_dir: str, module: str, mod_version: str) ->
> +     if int(mod_version.split('.')[0]) < 5:
> +         return []
> +
> ++    # Respect PKG_CONFIG_SYSROOT_DIR for cross-compilation
> ++    sysroot = os.environ.get('PKG_CONFIG_SYSROOT_DIR', '')
> +     private_dir = os.path.join(mod_inc_dir, mod_version)
> +     # fallback, let's try to find a directory with the latest version
> +-    if os.path.isdir(mod_inc_dir) and not os.path.exists(private_dir):
> +-        dirs = [filename for filename in os.listdir(mod_inc_dir)
> +-                if os.path.isdir(os.path.join(mod_inc_dir, filename))]
> ++    # Check in sysroot for cross-compilation
> ++    check_mod_inc = os.path.join(sysroot, mod_inc_dir.lstrip('/')) if sysroot else mod_inc_dir
> ++    check_private = os.path.join(sysroot, private_dir.lstrip('/')) if sysroot else private_dir
> ++    if os.path.isdir(check_mod_inc) and not os.path.exists(check_private):
> ++        dirs = [filename for filename in os.listdir(check_mod_inc)
> ++                if os.path.isdir(os.path.join(check_mod_inc, filename))]
> +
> +         for dirname in sorted(dirs, reverse=True):
> +             if len(dirname.split('.')) == 3:
> +-                private_dir = dirname
> ++                private_dir = os.path.join(mod_inc_dir, dirname)
> +                 break
> ++    # Prepend sysroot to returned paths for cross-compilation
> ++    if sysroot and not private_dir.startswith(sysroot):
> ++        private_dir = os.path.join(sysroot, private_dir.lstrip('/'))
> +     return [private_dir, Path(private_dir, f'Qt{module}').as_posix()]
> +
> +
> +@@ -192,7 +200,10 @@ class QtPkgConfigDependency(_QtBase, PkgConfigDependency, metaclass=abc.ABCMeta)
> +             if self.private_headers:
> +                 qt_inc_dir = mod.get_variable(pkgconfig='includedir')
> +                 mod_private_dir = os.path.join(qt_inc_dir, 'Qt' + m)
> +-                if not os.path.isdir(mod_private_dir):
> ++                # Check in sysroot for cross-compilation
> ++                sysroot = os.environ.get('PKG_CONFIG_SYSROOT_DIR', '')
> ++                check_dir = os.path.join(sysroot, mod_private_dir.lstrip('/')) if sysroot else mod_private_dir
> ++                if not os.path.isdir(check_dir):
> +                     # At least some versions of homebrew don't seem to set this
> +                     # up correctly. /usr/local/opt/qt/include/Qt + m_name is a
> +                     # symlink to /usr/local/opt/qt/include, but the pkg-config
> +--
> +2.34.1
> diff --git a/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson_%.bbappend b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson_%.bbappend
> new file mode 100644
> index 00000000..1512fdf6
> --- /dev/null
> +++ b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson_%.bbappend
> @@ -0,0 +1,4 @@
> +MESON_QT6 = ""
> +MESON_QT6:arago = "meson-qt6.inc"

Same as the other patch, change _QT6 to _ARAGO to follow the convention.

> +
> +require ${MESON_QT6}
diff mbox series

Patch

diff --git a/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson-qt6.inc b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson-qt6.inc
new file mode 100644
index 00000000..4a6cd19b
--- /dev/null
+++ b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson-qt6.inc
@@ -0,0 +1,5 @@ 
+FILESEXTRAPATHS:prepend := "${THISDIR}/meson:"
+
+SRC_URI:append = " \
+    file://0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch \
+"
diff --git a/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch
new file mode 100644
index 00000000..ff14dc1c
--- /dev/null
+++ b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch
@@ -0,0 +1,72 @@ 
+From 39f0e9c9b620b4289da61422022e507144a681b0 Mon Sep 17 00:00:00 2001
+From: Telukula Jeevan Kumar Sahu <j-sahu@ti.com>
+Date: Fri, 9 Jan 2026 17:44:57 +0530
+Subject: [PATCH] qt: respect PKG_CONFIG_SYSROOT_DIR for cross-compilation
+
+When cross-compiling with Yocto/OpenEmbedded, pkg-config returns paths
+without the sysroot prefix (e.g., /usr/include/QtCore), but the actual
+files are in the recipe-sysroot. The _qt_get_private_includes() function
+checks the host filesystem instead of the sysroot for Qt private headers.
+
+This patch adds PKG_CONFIG_SYSROOT_DIR support to prepend sysroot when
+checking directory existence and when returning paths. Changes only
+activate when PKG_CONFIG_SYSROOT_DIR is set, preserving native builds.
+
+Also fixes dirname assignment to use full path instead of basename.
+
+Related issue: https://github.com/mesonbuild/meson/issues/15456
+
+Upstream-Status: Inappropriate [Yocto-specific sysroot handling]
+
+Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com>
+---
+ mesonbuild/dependencies/qt.py | 21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py
+index c245e5c..a3846ec 100644
+--- a/mesonbuild/dependencies/qt.py
++++ b/mesonbuild/dependencies/qt.py
+@@ -42,16 +42,24 @@ def _qt_get_private_includes(mod_inc_dir: str, module: str, mod_version: str) ->
+     if int(mod_version.split('.')[0]) < 5:
+         return []
+
++    # Respect PKG_CONFIG_SYSROOT_DIR for cross-compilation
++    sysroot = os.environ.get('PKG_CONFIG_SYSROOT_DIR', '')
+     private_dir = os.path.join(mod_inc_dir, mod_version)
+     # fallback, let's try to find a directory with the latest version
+-    if os.path.isdir(mod_inc_dir) and not os.path.exists(private_dir):
+-        dirs = [filename for filename in os.listdir(mod_inc_dir)
+-                if os.path.isdir(os.path.join(mod_inc_dir, filename))]
++    # Check in sysroot for cross-compilation
++    check_mod_inc = os.path.join(sysroot, mod_inc_dir.lstrip('/')) if sysroot else mod_inc_dir
++    check_private = os.path.join(sysroot, private_dir.lstrip('/')) if sysroot else private_dir
++    if os.path.isdir(check_mod_inc) and not os.path.exists(check_private):
++        dirs = [filename for filename in os.listdir(check_mod_inc)
++                if os.path.isdir(os.path.join(check_mod_inc, filename))]
+
+         for dirname in sorted(dirs, reverse=True):
+             if len(dirname.split('.')) == 3:
+-                private_dir = dirname
++                private_dir = os.path.join(mod_inc_dir, dirname)
+                 break
++    # Prepend sysroot to returned paths for cross-compilation
++    if sysroot and not private_dir.startswith(sysroot):
++        private_dir = os.path.join(sysroot, private_dir.lstrip('/'))
+     return [private_dir, Path(private_dir, f'Qt{module}').as_posix()]
+
+
+@@ -192,7 +200,10 @@ class QtPkgConfigDependency(_QtBase, PkgConfigDependency, metaclass=abc.ABCMeta)
+             if self.private_headers:
+                 qt_inc_dir = mod.get_variable(pkgconfig='includedir')
+                 mod_private_dir = os.path.join(qt_inc_dir, 'Qt' + m)
+-                if not os.path.isdir(mod_private_dir):
++                # Check in sysroot for cross-compilation
++                sysroot = os.environ.get('PKG_CONFIG_SYSROOT_DIR', '')
++                check_dir = os.path.join(sysroot, mod_private_dir.lstrip('/')) if sysroot else mod_private_dir
++                if not os.path.isdir(check_dir):
+                     # At least some versions of homebrew don't seem to set this
+                     # up correctly. /usr/local/opt/qt/include/Qt + m_name is a
+                     # symlink to /usr/local/opt/qt/include, but the pkg-config
+--
+2.34.1
diff --git a/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson_%.bbappend b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson_%.bbappend
new file mode 100644
index 00000000..1512fdf6
--- /dev/null
+++ b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson_%.bbappend
@@ -0,0 +1,4 @@ 
+MESON_QT6 = ""
+MESON_QT6:arago = "meson-qt6.inc"
+
+require ${MESON_QT6}