* [Buildroot] [PATCH v2, 1/1] package/vulkan-loader: fix x11 handling
@ 2023-09-21 16:48 Fabrice Fontaine
2024-01-22 22:46 ` Adam Duskett
2024-01-23 16:04 ` Yann E. MORIN
0 siblings, 2 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2023-09-21 16:48 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Adam Duskett
Fix the following build failure raised since the addition of the package
in commit 6aa1bc31678ff9f8013084fda34b9f941cc63fc3:
In file included from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.h:24,
from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.c:23:
/home/buildroot/autobuild/run/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/vulkan/vulkan.h:71:10: fatal error: X11/extensions/Xrandr.h: No such file or directory
71 | #include <X11/extensions/Xrandr.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/55ddfd44393e3bcc2f25bad2f9ecb7e1b142a985
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Drop select
package/vulkan-loader/vulkan-loader.mk | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk
index f6dd9d0ac3..b1545a4972 100644
--- a/package/vulkan-loader/vulkan-loader.mk
+++ b/package/vulkan-loader/vulkan-loader.mk
@@ -26,13 +26,16 @@ endif
ifeq ($(BR2_PACKAGE_LIBXCB),y)
VULKAN_LOADER_DEPENDENCIES += libxcb
-VULKAN_LOADER_CONF_OPTS += \
- -DBUILD_WSI_XCB_SUPPORT=ON \
- -DBUILD_WSI_XLIB_SUPPORT=ON
+VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=ON
else
-VULKAN_LOADER_CONF_OPTS += \
- -DBUILD_WSI_XCB_SUPPORT=OFF \
- -DBUILD_WSI_XLIB_SUPPORT=OFF
+VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy)
+VULKAN_LOADER_DEPENDENCIES += xlib_libX11 xlib_libXrandr
+VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XLIB_SUPPORT=ON
+else
+VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XLIB_SUPPORT=OFF
endif
ifeq ($(BR2_PACKAGE_WAYLAND),y)
--
2.40.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Buildroot] [PATCH v2, 1/1] package/vulkan-loader: fix x11 handling
2023-09-21 16:48 [Buildroot] [PATCH v2, 1/1] package/vulkan-loader: fix x11 handling Fabrice Fontaine
@ 2024-01-22 22:46 ` Adam Duskett
2024-01-23 16:04 ` Yann E. MORIN
1 sibling, 0 replies; 4+ messages in thread
From: Adam Duskett @ 2024-01-22 22:46 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Adam Duskett, buildroot
All;
Reviewed-by: Adam Duskett <adam.duskett@amarulasolutions.com>
Tested-by: Adam Duskett <adam.duskett@amarulasolutions.com>
On Thu, Sep 21, 2023 at 10:48 AM Fabrice Fontaine
<fontaine.fabrice@gmail.com> wrote:
>
> Fix the following build failure raised since the addition of the package
> in commit 6aa1bc31678ff9f8013084fda34b9f941cc63fc3:
>
> In file included from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.h:24,
> from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.c:23:
> /home/buildroot/autobuild/run/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/vulkan/vulkan.h:71:10: fatal error: X11/extensions/Xrandr.h: No such file or directory
> 71 | #include <X11/extensions/Xrandr.h>
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
>
> Fixes:
> - http://autobuild.buildroot.org/results/55ddfd44393e3bcc2f25bad2f9ecb7e1b142a985
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Thomas Petazzoni):
> - Drop select
>
> package/vulkan-loader/vulkan-loader.mk | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk
> index f6dd9d0ac3..b1545a4972 100644
> --- a/package/vulkan-loader/vulkan-loader.mk
> +++ b/package/vulkan-loader/vulkan-loader.mk
> @@ -26,13 +26,16 @@ endif
>
> ifeq ($(BR2_PACKAGE_LIBXCB),y)
> VULKAN_LOADER_DEPENDENCIES += libxcb
> -VULKAN_LOADER_CONF_OPTS += \
> - -DBUILD_WSI_XCB_SUPPORT=ON \
> - -DBUILD_WSI_XLIB_SUPPORT=ON
> +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=ON
> else
> -VULKAN_LOADER_CONF_OPTS += \
> - -DBUILD_WSI_XCB_SUPPORT=OFF \
> - -DBUILD_WSI_XLIB_SUPPORT=OFF
> +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy)
> +VULKAN_LOADER_DEPENDENCIES += xlib_libX11 xlib_libXrandr
> +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XLIB_SUPPORT=ON
> +else
> +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XLIB_SUPPORT=OFF
> endif
>
> ifeq ($(BR2_PACKAGE_WAYLAND),y)
> --
> 2.40.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v2, 1/1] package/vulkan-loader: fix x11 handling
2023-09-21 16:48 [Buildroot] [PATCH v2, 1/1] package/vulkan-loader: fix x11 handling Fabrice Fontaine
2024-01-22 22:46 ` Adam Duskett
@ 2024-01-23 16:04 ` Yann E. MORIN
2024-02-04 21:25 ` Peter Korsgaard
1 sibling, 1 reply; 4+ messages in thread
From: Yann E. MORIN @ 2024-01-23 16:04 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Adam Duskett, buildroot
Fabrice, All,
On 2023-09-21 18:48 +0200, Fabrice Fontaine spake thusly:
> Fix the following build failure raised since the addition of the package
> in commit 6aa1bc31678ff9f8013084fda34b9f941cc63fc3:
>
> In file included from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.h:24,
> from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.c:23:
> /home/buildroot/autobuild/run/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/vulkan/vulkan.h:71:10: fatal error: X11/extensions/Xrandr.h: No such file or directory
> 71 | #include <X11/extensions/Xrandr.h>
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
>
> Fixes:
> - http://autobuild.buildroot.org/results/55ddfd44393e3bcc2f25bad2f9ecb7e1b142a985
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Your commits always contain the description of the failure (which is
mildly interesting), but often lacks the actual reason for the change.
In this case, it would have been interesting to state that xcb and xlib
support are orthogonal, but that for xlib, xrandr is also required, as
Adam noticed in his commit log [0].
I totally forgot to amend the commit before I push, though, sorry...
[0] https://lore.kernel.org/buildroot/20240122223047.736966-1-adam.duskett@amarulasolutions.com/
Regards,
Yann E. MORIN.
> ---
> Changes v1 -> v2 (after review of Thomas Petazzoni):
> - Drop select
>
> package/vulkan-loader/vulkan-loader.mk | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk
> index f6dd9d0ac3..b1545a4972 100644
> --- a/package/vulkan-loader/vulkan-loader.mk
> +++ b/package/vulkan-loader/vulkan-loader.mk
> @@ -26,13 +26,16 @@ endif
>
> ifeq ($(BR2_PACKAGE_LIBXCB),y)
> VULKAN_LOADER_DEPENDENCIES += libxcb
> -VULKAN_LOADER_CONF_OPTS += \
> - -DBUILD_WSI_XCB_SUPPORT=ON \
> - -DBUILD_WSI_XLIB_SUPPORT=ON
> +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=ON
> else
> -VULKAN_LOADER_CONF_OPTS += \
> - -DBUILD_WSI_XCB_SUPPORT=OFF \
> - -DBUILD_WSI_XLIB_SUPPORT=OFF
> +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy)
> +VULKAN_LOADER_DEPENDENCIES += xlib_libX11 xlib_libXrandr
> +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XLIB_SUPPORT=ON
> +else
> +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XLIB_SUPPORT=OFF
> endif
>
> ifeq ($(BR2_PACKAGE_WAYLAND),y)
> --
> 2.40.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v2, 1/1] package/vulkan-loader: fix x11 handling
2024-01-23 16:04 ` Yann E. MORIN
@ 2024-02-04 21:25 ` Peter Korsgaard
0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2024-02-04 21:25 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: Fabrice Fontaine, Adam Duskett, buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> Fabrice, All,
> On 2023-09-21 18:48 +0200, Fabrice Fontaine spake thusly:
>> Fix the following build failure raised since the addition of the package
>> in commit 6aa1bc31678ff9f8013084fda34b9f941cc63fc3:
>>
>> In file included from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.h:24,
>> from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.c:23:
>> /home/buildroot/autobuild/run/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/vulkan/vulkan.h:71:10: fatal error: X11/extensions/Xrandr.h: No such file or directory
>> 71 | #include <X11/extensions/Xrandr.h>
>> | ^~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> Fixes:
>> - http://autobuild.buildroot.org/results/55ddfd44393e3bcc2f25bad2f9ecb7e1b142a985
>>
>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> Applied to master, thanks.
> Your commits always contain the description of the failure (which is
> mildly interesting), but often lacks the actual reason for the change.
> In this case, it would have been interesting to state that xcb and xlib
> support are orthogonal, but that for xlib, xrandr is also required, as
> Adam noticed in his commit log [0].
Committed to 2023.11.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-04 21:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-21 16:48 [Buildroot] [PATCH v2, 1/1] package/vulkan-loader: fix x11 handling Fabrice Fontaine
2024-01-22 22:46 ` Adam Duskett
2024-01-23 16:04 ` Yann E. MORIN
2024-02-04 21:25 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox