[Buildroot] [PATCH 1/2] package/wlroot: vulkan renderer depends on vulkan loader

[Buildroot] [PATCH 1/2] package/wlroot: vulkan renderer depends on vulkan loader

[Adam Duskett]

Without the vulkan-loader package present, the configure step fails with the
following error message:
```
Run-time dependency vulkan found: NO (tried pkgconfig and system)
Message: Install "vulkan" or pass "-Dvulkan=disabled" to disable it.
```

The above error is due to the lack of the vulkan.pc file provided by the
vulkan-loader package. A search of autobuild failures containing
BR2_PACKAGE_WLROOTS=y and BR2_PACKAGE_MESA3D_VULKAN_DRIVER=y shows two build
failures. However, the failure reasons happened before wlroots could compile.
One for gerbera-1.10.0 and another for host-rust-1.64.0.

Add a dependency on the vulkan-loader package to resolve the above issue.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 package/wlroots/wlroots.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk
index bb5c8f497d..fdd2fb8250 100644
--- a/package/wlroots/wlroots.mk
+++ b/package/wlroots/wlroots.mk
@@ -41,9 +41,9 @@ else
 WLROOTS_CONF_OPTS += -Dxwayland=disabled
 endif
 
-ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),y)
+ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER)$(BR2_PACKAGE_VULKAN_LOADER),yy)
 WLROOTS_RENDERERS += vulkan
-WLROOTS_DEPENDENCIES += mesa3d
+WLROOTS_DEPENDENCIES += mesa3d vulkan-loader
 endif
 
 WLROOTS_CONF_OPTS += \
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status

[Adam Duskett]

package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has been
rejected upstream, and the initial pull request was moved to the
freedesktop gitlab. Update the patch to reflect these changes.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 .checkpackageignore                                           | 1 -
 .../wlroots/0001-Add-feature-macros-to-more-C-files-.patch    | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.checkpackageignore b/.checkpackageignore
index 914dd6fb63..1ada9fa261 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1407,7 +1407,6 @@ package/wilc-driver/0005-Fix-cast-warnings.patch Upstream
 package/wipe/0001-musl.patch Upstream
 package/wireless_tools/0001-remove-bzero.patch Upstream
 package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch Upstream
-package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch Upstream
 package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch Upstream
 package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch Upstream
 package/wpa_supplicant/ifupdown.sh Shellcheck
diff --git a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch b/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch
index 0ba078708a..0e1ae9d87a 100644
--- a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch
+++ b/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch
@@ -5,8 +5,10 @@ Subject: [PATCH] Add feature macros to more C files
 
 These source files use "struct timespec", which is POSIX 1993.09.
 
-Signed-off-by: Paul Cercueil <paul@crapouillou.net>
+Upstream: Rejected (Upstream does not want these workarounds)
+see: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2493
 
+Signed-off-by: Paul Cercueil <paul@crapouillou.net>
 [Retrieved from: https://github.com/swaywm/wlroots/pull/2493]
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 ---
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status

[Thomas Petazzoni via buildroot]

Hello Adam,

+Paul Cercueil in Cc, see below.

On Sun, 21 Jan 2024 13:42:52 -0700
Adam Duskett <adam.duskett@amarulasolutions.com> wrote:

> package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has been
> rejected upstream, and the initial pull request was moved to the
> freedesktop gitlab. Update the patch to reflect these changes.
> 
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>

Thanks, applied!

Paul: could you follow-up with upstream (either wlroots, or uclibc, or
both) to try to find an acceptable solution so that some day we can
drop this patch?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status

[Paul Cercueil]

I honestly forgot about this.

I'll send a new patch upstream.

-Paul

Le lundi 05 février 2024 à 22:29 +0100, Thomas Petazzoni a écrit :
> Hello Adam,
> 
> +Paul Cercueil in Cc, see below.
> 
> On Sun, 21 Jan 2024 13:42:52 -0700
> Adam Duskett <adam.duskett@amarulasolutions.com> wrote:
> 
> > package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has
> > been
> > rejected upstream, and the initial pull request was moved to the
> > freedesktop gitlab. Update the patch to reflect these changes.
> > 
> > Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> 
> Thanks, applied!
> 
> Paul: could you follow-up with upstream (either wlroots, or uclibc,
> or
> both) to try to find an acceptable solution so that some day we can
> drop this patch?
> 
> Thanks a lot!
> 
> Thomas

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status

[Paul Cercueil]

Patches were merged upstream, both in wlroots and uClibc:

https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4540
https://mailman.openadk.org/mailman3/hyperkitty/list/devel@uclibc-ng.org/thread/OMMGSP7PDXQDOQNUXTKRG5DWELAD2CII/

Cheers,
-Paul


Le lundi 05 février 2024 à 22:29 +0100, Thomas Petazzoni a écrit :
> Hello Adam,
> 
> +Paul Cercueil in Cc, see below.
> 
> On Sun, 21 Jan 2024 13:42:52 -0700
> Adam Duskett <adam.duskett@amarulasolutions.com> wrote:
> 
> > package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has
> > been
> > rejected upstream, and the initial pull request was moved to the
> > freedesktop gitlab. Update the patch to reflect these changes.
> > 
> > Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> 
> Thanks, applied!
> 
> Paul: could you follow-up with upstream (either wlroots, or uclibc,
> or
> both) to try to find an acceptable solution so that some day we can
> drop this patch?
> 
> Thanks a lot!
> 
> Thomas

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status

[Peter Korsgaard]

>>>>> "Adam" == Adam Duskett <adam.duskett@amarulasolutions.com> writes:

 > package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has been
 > rejected upstream, and the initial pull request was moved to the
 > freedesktop gitlab. Update the patch to reflect these changes.

 > Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>

Committed to 2023.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/wlroot: vulkan renderer depends on vulkan loader

[Thomas Petazzoni via buildroot]

On Sun, 21 Jan 2024 13:42:51 -0700
Adam Duskett <adam.duskett@amarulasolutions.com> wrote:

> Without the vulkan-loader package present, the configure step fails with the
> following error message:
> ```
> Run-time dependency vulkan found: NO (tried pkgconfig and system)
> Message: Install "vulkan" or pass "-Dvulkan=disabled" to disable it.
> ```
> 
> The above error is due to the lack of the vulkan.pc file provided by the
> vulkan-loader package. A search of autobuild failures containing
> BR2_PACKAGE_WLROOTS=y and BR2_PACKAGE_MESA3D_VULKAN_DRIVER=y shows two build
> failures. However, the failure reasons happened before wlroots could compile.
> One for gerbera-1.10.0 and another for host-rust-1.64.0.
> 
> Add a dependency on the vulkan-loader package to resolve the above issue.
> 
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> ---
>  package/wlroots/wlroots.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/wlroot: vulkan renderer depends on vulkan loader

[Peter Korsgaard]

>>>>> "Adam" == Adam Duskett <adam.duskett@amarulasolutions.com> writes:

 > Without the vulkan-loader package present, the configure step fails with the
 > following error message:
 > ```
 > Run-time dependency vulkan found: NO (tried pkgconfig and system)
 > Message: Install "vulkan" or pass "-Dvulkan=disabled" to disable it.
 > ```

 > The above error is due to the lack of the vulkan.pc file provided by the
 > vulkan-loader package. A search of autobuild failures containing
 > BR2_PACKAGE_WLROOTS=y and BR2_PACKAGE_MESA3D_VULKAN_DRIVER=y shows two build
 > failures. However, the failure reasons happened before wlroots could compile.
 > One for gerbera-1.10.0 and another for host-rust-1.64.0.

 > Add a dependency on the vulkan-loader package to resolve the above issue.

 > Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>

Committed to 2023.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot