| Message ID | 20190920163849.8124-4-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/{mesa3d, mesa3d-headers}: bump version to 19.1.7 | expand |
On 20/09/2019 18:38, Bernd Kuhls wrote: > From: Romain Naour <romain.naour@smile.fr> > > The meson build system now check if dri swrast is enabled > when OSMesa classic is enabled. > > See: > https://cgit.freedesktop.org/mesa/mesa/commit/?id=cbbd5bb889a2c271a504c379f36a7cb717a85af4 > > Signed-off-by: Romain Naour <romain.naour@smile.fr> > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > package/mesa3d/Config.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 13739f54c5..77ac0469e9 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -267,10 +267,14 @@ comment "Off-screen Rendering" > > config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC > bool "OSMesa (classic) library" > + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST I you do this, you also need to add it to Config.in.legacy. Since we shouldn't use 'depends' there, you have to make the select conditional. Regards, Arnout > help > The OSMesa classic API provides functions for > making off-screen renderings. > > +comment "OSMesa classic requires dri (classic) swrast" > + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST > + > if BR2_PACKAGE_MESA3D_DRIVER > > comment "Additional API Support" >
On 21/09/2019 16:50, Arnout Vandecappelle wrote: > > On 20/09/2019 18:38, Bernd Kuhls wrote: >> From: Romain Naour <romain.naour@smile.fr> >> >> The meson build system now check if dri swrast is enabled >> when OSMesa classic is enabled. >> >> See: >> https://cgit.freedesktop.org/mesa/mesa/commit/?id=cbbd5bb889a2c271a504c379f36a7cb717a85af4 >> >> Signed-off-by: Romain Naour <romain.naour@smile.fr> >> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> >> --- >> package/mesa3d/Config.in | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in >> index 13739f54c5..77ac0469e9 100644 >> --- a/package/mesa3d/Config.in >> +++ b/package/mesa3d/Config.in >> @@ -267,10 +267,14 @@ comment "Off-screen Rendering" >> >> config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC >> bool "OSMesa (classic) library" >> + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST > I you do this, you also need to add it to Config.in.legacy. Since we shouldn't > use 'depends' there, you have to make the select conditional. Applied to master with this change, thanks. Regards, Arnout > > Regards, > Arnout > >> help >> The OSMesa classic API provides functions for >> making off-screen renderings. >> >> +comment "OSMesa classic requires dri (classic) swrast" >> + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST >> + >> if BR2_PACKAGE_MESA3D_DRIVER >> >> comment "Additional API Support" >>
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 13739f54c5..77ac0469e9 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -267,10 +267,14 @@ comment "Off-screen Rendering" config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC bool "OSMesa (classic) library" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST help The OSMesa classic API provides functions for making off-screen renderings. +comment "OSMesa classic requires dri (classic) swrast" + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST + if BR2_PACKAGE_MESA3D_DRIVER comment "Additional API Support"