On Tuesday, 2018-03-13 16:05:18 -0700, Dylan Baker wrote: > with_gallium_omx used to be a boolean, but now it's a string. That means > it needs to be compared to 'disabled' instead of false. > > CC: Rob Clark <robdcl...@gmail.com> > Fixes: 34e852d5b50772199797ea839fc8d6b3805633ff > ("meson: Re-add auto option for omx") > Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> And a quick grep confirms this was the only place that was still using `with_gallium_omx` as a bool. > --- > src/gallium/targets/pipe-loader/meson.build | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/gallium/targets/pipe-loader/meson.build > b/src/gallium/targets/pipe-loader/meson.build > index 25b26a34cac..7466d98f2d4 100644 > --- a/src/gallium/targets/pipe-loader/meson.build > +++ b/src/gallium/targets/pipe-loader/meson.build > @@ -1,4 +1,4 @@ > -# Copyright © 2017 Intel Corporation > +# Copyright © 2017-2018 Intel Corporation > > # Permission is hereby granted, free of charge, to any person obtaining a > copy > # of this software and associated documentation files (the "Software"), to > deal > @@ -27,13 +27,14 @@ pipe_loader_incs = [ > inc_gallium_winsys, inc_gallium_aux, > ] > > -if (with_gallium_va or with_gallium_vdpau or with_gallium_omx or > +if (with_gallium_va or with_gallium_vdpau or with_gallium_omx != 'disabled' > or > with_gallium_xvmc or with_dri) > pipe_loader_link_with += libgalliumvl > else > pipe_loader_link_with += libgalliumvl_stubs > endif > -if with_gallium_va or with_gallium_vdpau or with_gallium_omx or > with_gallium_xvmc > +if (with_gallium_va or with_gallium_vdpau or with_gallium_omx != 'disabled' > or > + with_gallium_xvmc) > pipe_loader_link_with += libgalliumvlwinsys > endif > > -- > 2.16.2 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev