Mesa (master): meson: fix pipe-loaders after omx changes

[Dylan Baker]

Module: Mesa
Branch: master
Commit: 2a7027f79a8ce09d315606c228d2eb393938d2fd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a7027f79a8ce09d315606c228d2eb393938d2fd

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Tue Mar 13 16:03:41 2018 -0700

meson: fix pipe-loaders after omx changes

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 <robdclark at gmail.com>
Fixes: 34e852d5b50772199797ea839fc8d6b3805633ff
       ("meson: Re-add auto option for omx")
Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
Tested-by: Rob Clark <robdclark at gmail.com
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

---

 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 25b26a34ca..7466d98f2d 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