[PATCH] mesa: Add xcb-fixes to loader when using x11 and dri3

[PATCH] mesa: Add xcb-fixes to loader when using x11 and dri3

[Tom Hochstein]

Backport fix for undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 meta/recipes-graphics/mesa/mesa.inc           |  1 +
 ...xes-to-loader-when-using-x11-and-dri.patch | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 meta/recipes-graphics/mesa/mesa/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 15f54c5acd..246ed936e7 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -21,6 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
            file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
+           file://0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch \
            "
 
 SRC_URI[sha256sum] = "d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a"
diff --git a/meta/recipes-graphics/mesa/mesa/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch b/meta/recipes-graphics/mesa/mesa/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch
new file mode 100644
index 0000000000..9ee72880a2
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch
@@ -0,0 +1,36 @@
+From cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c Mon Sep 17 00:00:00 2001
+From: Duncan Hopkins <duncan@duncanhopkins.me.uk>
+Date: Thu, 15 Oct 2020 12:14:57 +0100
+Subject: [PATCH] meson: Add xcb-fixes to loader when using x11 and dri3. Fixes
+ undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c
+
+loader_dr3_helper.c uses xcb_xfixes_create_region() that requires dep_xcb_xfixes to link. This is dependent on with_platform_x11 and with_dri3.
+But the source meson file does not set this up dependent on with_dri3.
+The build was initialsed using platforms=x11 and gallium-drivers=zink,swrast.
+
+Reviewed-by: Eric Anholt <eric@anholt.net>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7164>
+
+Upstream-Status: Backport [cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c]
+
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index cfe02fa6373..3cb3c904927 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1782,7 +1782,8 @@ if with_platform_x11
+       dep_xxf86vm = dependency('xxf86vm')
+     endif
+   endif
+-  if (with_egl or (
++  if (with_egl or 
++      with_dri3 or (
+       with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or
+       with_gallium_omx != 'disabled'))
+     dep_xcb_xfixes = dependency('xcb-xfixes')
+-- 
+2.17.1
+
-- 
2.17.1

Re: [OE-core] [PATCH] mesa: Add xcb-fixes to loader when using x11 and dri3

[Andrey Zhizhikin]

On Thu, Nov 5, 2020 at 9:39 PM Tom Hochstein <tom.hochstein@nxp.com> wrote:
>
> Backport fix for undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c.
>
> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> ---
>  meta/recipes-graphics/mesa/mesa.inc           |  1 +
>  ...xes-to-loader-when-using-x11-and-dri.patch | 36 +++++++++++++++++++
>  2 files changed, 37 insertions(+)
>  create mode 100644 meta/recipes-graphics/mesa/mesa/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch
>
> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
> index 15f54c5acd..246ed936e7 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -21,6 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
>             file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
>             file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
>             file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
> +           file://0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch \
>             "
>
>  SRC_URI[sha256sum] = "d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a"
> diff --git a/meta/recipes-graphics/mesa/mesa/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch b/meta/recipes-graphics/mesa/mesa/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch
> new file mode 100644
> index 0000000000..9ee72880a2
> --- /dev/null
> +++ b/meta/recipes-graphics/mesa/mesa/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch

I believe all patch files are located in `files` folder, while this
patch tries to put it into `mesa` folder which does not exist yet? Is
it intended here?

> @@ -0,0 +1,36 @@
> +From cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c Mon Sep 17 00:00:00 2001
> +From: Duncan Hopkins <duncan@duncanhopkins.me.uk>
> +Date: Thu, 15 Oct 2020 12:14:57 +0100
> +Subject: [PATCH] meson: Add xcb-fixes to loader when using x11 and dri3. Fixes
> + undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c
> +
> +loader_dr3_helper.c uses xcb_xfixes_create_region() that requires dep_xcb_xfixes to link. This is dependent on with_platform_x11 and with_dri3.
> +But the source meson file does not set this up dependent on with_dri3.
> +The build was initialsed using platforms=x11 and gallium-drivers=zink,swrast.
> +
> +Reviewed-by: Eric Anholt <eric@anholt.net>
> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7164>
> +
> +Upstream-Status: Backport [cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c]
> +
> +---
> + meson.build | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/meson.build b/meson.build
> +index cfe02fa6373..3cb3c904927 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -1782,7 +1782,8 @@ if with_platform_x11
> +       dep_xxf86vm = dependency('xxf86vm')
> +     endif
> +   endif
> +-  if (with_egl or (
> ++  if (with_egl or
> ++      with_dri3 or (
> +       with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or
> +       with_gallium_omx != 'disabled'))
> +     dep_xcb_xfixes = dependency('xcb-xfixes')
> +--
> +2.17.1
> +
> --
> 2.17.1
>
>
> 
>


-- 
Regards,
Andrey.

Re: [OE-core] [PATCH] mesa: Add xcb-fixes to loader when using x11 and dri3

[Tom Hochstein]

> -----Original Message-----
> From: Andrey Zhizhikin <andrey.z@gmail.com>
> Sent: Thursday, November 12, 2020 3:23 PM
> 
> I believe all patch files are located in `files` folder, while this
> patch tries to put it into `mesa` folder which does not exist yet? Is
> it intended here?
> 

It was a mistake, thanks for catching it. V2 submitted.

Tom