| Message ID | 20230709075543.400474-1-bernd@kuhls.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] package/mesa3d-demos: needs C++ | expand |
On Sun, 9 Jul 2023 09:55:42 +0200 Bernd Kuhls <bernd@kuhls.net> wrote: > Reference: > https://gitlab.freedesktop.org/mesa/demos/-/blob/main/meson.build#L21 > > Fixes: > http://autobuild.buildroot.net/results/90e/90e98fa0f37462cadea0fcbff9feabad5554587d/ > > Signed-off-by: Bernd Kuhls <bernd@kuhls.net> > --- > package/mesa3d-demos/Config.in | 4 ++++ > package/piglit/Config.in | 2 +- > 2 files changed, 5 insertions(+), 1 deletion(-) Both applied. For the version bump, I see the patch does not have an Upstream: tag. Has is been submitted upstream? If not, why? Thanks! Thomas
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes: > Reference: > https://gitlab.freedesktop.org/mesa/demos/-/blob/main/meson.build#L21 > Fixes: > http://autobuild.buildroot.net/results/90e/90e98fa0f37462cadea0fcbff9feabad5554587d/ > Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Committed to 2023.02.x and 2023.05.x, thanks.
diff --git a/package/mesa3d-demos/Config.in b/package/mesa3d-demos/Config.in index b716cf5799..2947915c92 100644 --- a/package/mesa3d-demos/Config.in +++ b/package/mesa3d-demos/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MESA3D_DEMOS bool "mesa3d-demos" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \ || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL @@ -10,3 +11,6 @@ config BR2_PACKAGE_MESA3D_DEMOS OpenGL demos from the Mesa 3D project. http://mesa3d.org + +comment "mesa3d-demos needs a toolchain with C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 5e957a555a..22d1c7c28e 100644 --- a/package/piglit/Config.in +++ b/package/piglit/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_PIGLIT BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \ BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \ BR2_PACKAGE_WAFFLE_SUPPORTS_GBM - depends on BR2_INSTALL_LIBSTDCPP # python-numpy + depends on BR2_INSTALL_LIBSTDCPP # mesa3d-demos, python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBPNG
Reference: https://gitlab.freedesktop.org/mesa/demos/-/blob/main/meson.build#L21 Fixes: http://autobuild.buildroot.net/results/90e/90e98fa0f37462cadea0fcbff9feabad5554587d/ Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- package/mesa3d-demos/Config.in | 4 ++++ package/piglit/Config.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)