| Message ID | 20180404153818.26179-14-eric.engestrom@imgtec.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Wed, Apr 04, 2018 at 04:38:09PM +0100, Eric Engestrom wrote: > [...] > > -with_omap = false > -_omap = get_option('omap') > -if _omap == 'true' > - if not with_atomics > - error('libdrm_omap requires atomics.') > - endif > - with_omap = true > +with_exynos = false > +_exynos = get_option('exynos') > +if _exynos == 'auto' > + with_exynos = true > +else > + with_exynos = _exynos == 'true' > endif Looks like some patch rebasing went wrong with this one (it simplifies omap, but also adds some exynos stuff)? -- Sebastian
On Wednesday, 2018-04-04 19:55:18 +0200, Sebastian Reichel wrote: > Hi, > > On Wed, Apr 04, 2018 at 04:38:09PM +0100, Eric Engestrom wrote: > > [...] > > > > -with_omap = false > > -_omap = get_option('omap') > > -if _omap == 'true' > > - if not with_atomics > > - error('libdrm_omap requires atomics.') > > - endif > > - with_omap = true > > +with_exynos = false > > +_exynos = get_option('exynos') > > +if _exynos == 'auto' > > + with_exynos = true > > +else > > + with_exynos = _exynos == 'true' > > endif > > Looks like some patch rebasing went wrong with this one (it > simplifies omap, but also adds some exynos stuff)? Indeed, that's a complete rebase fail... Thanks for not letting me push this unaware :) I'll send a v3 of 8-19 next week, after landing the first bits (1-7). I think I'll defer 20-23 to after everything else has landed. > > -- Sebastian
diff --git a/meson.build b/meson.build index 6786a44e3df1a2e00540..29f91ee9f6eb96b05f0d 100644 --- a/meson.build +++ b/meson.build @@ -75,6 +75,7 @@ foreach d : [ ['amdgpu', true, true], ['nouveau', true, true], ['vmwgfx', false, true], + ['omap', true, false], ] driver = d[0] require_atomics = d[1] @@ -95,13 +96,12 @@ foreach d : [ endif endforeach -with_omap = false -_omap = get_option('omap') -if _omap == 'true' - if not with_atomics - error('libdrm_omap requires atomics.') - endif - with_omap = true +with_exynos = false +_exynos = get_option('exynos') +if _exynos == 'auto' + with_exynos = true +else + with_exynos = _exynos == 'true' endif with_freedreno = false
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> --- meson.build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)