[Mesa-dev] [PATCH] travis: replace omx feature flag with omx-bellagio one

[Christian König]

Am 16.09.2017 um 19:23 schrieb Andres Gomez:
> Fixes: 6a8aa11c207 ("st/omx_bellagio: Rename state tracker and
> option")
> Signed-off-by: Andres Gomez <agomez at igalia.com>
> Cc: Gurkirpal Singh <gurkirpal204 at gmail.com>
> Cc: Eric Engestrom <eric.engestrom at imgtec.com>
> Cc: Emil Velikov <emil.velikov at collabora.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   .travis.yml | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index 51061d95318..435216fc8f7 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -37,7 +37,7 @@ matrix:
>           - MAKE_CHECK_COMMAND="make check"
>           - DRI_LOADERS="--enable-glx --enable-gbm --enable-egl --with-platforms=x11,drm,surfaceless,wayland --enable-osmesa"
>           - DRI_DRIVERS="i915,i965,radeon,r200,swrast,nouveau"
> -        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
> +        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
>           - GALLIUM_DRIVERS=""
>           - VULKAN_DRIVERS=""
>           - LIBUNWIND_FLAGS="--disable-libunwind"
> @@ -64,7 +64,7 @@ matrix:
>           - OVERRIDE_CXX="g++-4.8"
>           - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
>           - DRI_DRIVERS=""
> -        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
> +        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
>           - GALLIUM_DRIVERS="swr"
>           - VULKAN_DRIVERS=""
>           - LIBUNWIND_FLAGS="--enable-libunwind"
> @@ -93,7 +93,7 @@ matrix:
>           - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
>           - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
>           - DRI_DRIVERS=""
> -        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
> +        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
>           - GALLIUM_DRIVERS="i915,nouveau,pl111,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx"
>           - VULKAN_DRIVERS=""
>           - LIBUNWIND_FLAGS="--enable-libunwind"
> @@ -125,7 +125,7 @@ matrix:
>           - OVERRIDE_CXX=g++-4.7
>           - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
>           - DRI_DRIVERS=""
> -        - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
> +        - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
>           # i915 most likely doesn't work with OpenCL.
>           # Regardless - we're doing a quick build test here.
>           - GALLIUM_DRIVERS="i915"
> @@ -160,7 +160,7 @@ matrix:
>           - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
>           - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
>           - DRI_DRIVERS=""
> -        - GALLIUM_ST="--enable-dri --disable-opencl --enable-xa --enable-nine --enable-xvmc --enable-vdpau --enable-va --enable-omx --enable-gallium-osmesa"
> +        - GALLIUM_ST="--enable-dri --disable-opencl --enable-xa --enable-nine --enable-xvmc --enable-vdpau --enable-va --enable-omx-bellagio --enable-gallium-osmesa"
>           # We need swrast for osmesa and nine.
>           # i915 most likely doesn't work with most ST.
>           # Regardless - we're doing a quick build test here.
> @@ -196,7 +196,7 @@ matrix:
>           - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
>           - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland"
>           - DRI_DRIVERS=""
> -        - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
> +        - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
>           - GALLIUM_DRIVERS=""
>           - VULKAN_DRIVERS="intel,radeon"
>           - LIBUNWIND_FLAGS="--disable-libunwind"