On Thu, 2017-04-27 at 19:38 +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.veli...@collabora.com>
>
> Split into OpenCL and others, since the former is quite time consuming.
>
> v2:
> - explicitly enable/disable components
> - build libvdpau 1.1 requirement
> - enable st/vdpau
> - build libva 1.6.2 (API 0.38) requirement
>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> ---
> .travis.yml | 83
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 83 insertions(+)
>
> diff --git a/.travis.yml b/.travis.yml
> index 57c4a431534..86f88e86b05 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -20,6 +20,8 @@ env:
> - LIBXCB_VERSION=libxcb-1.11
> - LIBXSHMFENCE_VERSION=libxshmfence-1.2
> - LIBTXC_DXTN_VERSION=libtxc_dxtn-1.0.1
> + - LIBVDPAU_VERSION=libvdpau-1.1
> + - LIBVA_VERSION=libva-1.6.2
> - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
> - LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH"
>
> @@ -33,6 +35,7 @@ matrix:
> # XXX: Add wayland platform
> - DRI_LOADERS="--enable-glx --enable-gbm --enable-egl
> --with-platforms=x11,drm,surfaceless --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_DRIVERS=""
> - VULKAN_DRIVERS=""
> addons:
> @@ -55,6 +58,7 @@ matrix:
> - OVERRIDE_CXX="g++-5"
> - 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_DRIVERS="swr"
> - VULKAN_DRIVERS=""
> addons:
> @@ -82,6 +86,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_DRIVERS="i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx"
> - VULKAN_DRIVERS=""
> addons:
> @@ -89,6 +94,8 @@ matrix:
> sources:
> - llvm-toolchain-trusty-3.9
> packages:
> + # LLVM packaging is broken and misses these dependencies
> + - libedit-dev
> # From sources above
> - llvm-3.9-dev
> # Common
> @@ -97,6 +104,71 @@ matrix:
> - libx11-xcb-dev
> - libelf-dev
> - env:
> + # NOTE: Analogous to SWR above, building Clover is quite slow.
> + - LABEL="make Gallium ST Clover"
> + - BUILD=make
> + - MAKEFLAGS=-j2
> + - MAKE_CHECK_COMMAND="true"
> + - LLVM_VERSION=3.6
> + - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
> + - OVERRIDE_CC=gcc-4.7
> + - 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"
> + # i915 most likely doesn't work with OpenCL.
> + # Regardless - we're doing a quick build test here.
> + - GALLIUM_DRIVERS="i915"
> + - VULKAN_DRIVERS=""
> + addons:
> + apt:
> + sources:
> + - ubuntu-toolchain-r-test
> + - llvm-toolchain-trusty-3.6
> + packages:
> + - libclc-dev
> + # LLVM packaging is broken and misses these dependencies
> + - libedit-dev
> + # From sources above
> + - g++-4.7
> + - llvm-3.6-dev
> + - clang-3.6
> + - libclang-3.6-dev
> + # Common
> + - x11proto-xf86vidmode-dev
> + - libexpat1-dev
> + - libx11-xcb-dev
> + - libelf-dev
> + - env:
> + - LABEL="make Gallium ST Other"
> + - BUILD=make
> + - MAKEFLAGS=-j2
> + - MAKE_CHECK_COMMAND="true"
> + - 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"
> + # 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.
> + - GALLIUM_DRIVERS="i915,swrast"
> + - VULKAN_DRIVERS=""
> + addons:
> + apt:
> + packages:
> + # Nine requires gcc 4.6... which is the one we have right ?
> + - libxvmc-dev
> + # Build locally, for now.
> + #- libvdpau-dev
> + #- libva-dev
> + - libomxil-bellagio-dev
> + # LLVM packaging is broken and misses these dependencies
> + - libedit-dev
> + # Common
> + - x11proto-xf86vidmode-dev
> + - libexpat1-dev
> + - libx11-xcb-dev
> + - libelf-dev
> + - env:
> - LABEL="make Vulkan"
> - BUILD=make
> - MAKEFLAGS=-j2
> @@ -108,6 +180,8 @@ matrix:
> # XXX: Platform X11 dependencies are checked when --enable-glx is set
> - DRI_LOADERS="--enable-glx --disable-gbm --enable-egl
> --with-platforms=x11"
> - DRI_DRIVERS=""
> + # XXX: enable DRI for EGL above
> + - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa
> --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx
> --disable-gallium-osmesa"
> - GALLIUM_DRIVERS=""
> - VULKAN_DRIVERS="intel,radeon"
> addons:
> @@ -255,6 +329,14 @@ install:
> (cd $LIBTXC_DXTN_VERSION && ./configure --prefix=$HOME/prefix && make
> install);
> fi
>
> + - wget
> http://people.freedesktop.org/~aplattner/vdpau/$LIBVDPAU_VERSION.tar.bz2
> + - tar -jxvf $LIBVDPAU_VERSION.tar.bz2
> + - (cd $LIBVDPAU_VERSION && ./configure --prefix=$HOME/prefix && make
> install)
> +
> + - wget
> http://www.freedesktop.org/software/vaapi/releases/libva/$LIBVA_VERSION.tar.bz2
> + - tar -jxvf $LIBVA_VERSION.tar.bz2
> + - (cd $LIBVA_VERSION && ./configure --prefix=$HOME/prefix
> --disable-wayland --disable-dummy-driver && make install)
I would build libvdpau and libva only if they are really needed, doing
the above conditional.
In any case, my R-b stands.
--
Br,
Andres
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
