The packaged libtxc-dxtn-s2tc0 will make scons check fail. Manually
remove this package and install libtxc-dxtn instead.
Signed-off-by: Andres Gomez <ago...@igalia.com>
Cc: Eric Anholt <e...@anholt.net>
Cc: Emil Velikov <emil.l.veli...@gmail.com>
---
.travis.yml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 0667c7488d4..8b62642e616 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ env:
global:
- XORG_RELEASES=http://xorg.freedesktop.org/releases/individual
- XCB_RELEASES=http://xcb.freedesktop.org/dist
+ - TXC_DXTN_RELEASES=https://people.freedesktop.org/~cbrill/libtxc_dxtn
- XORGMACROS_VERSION=util-macros-1.19.0
- GLPROTO_VERSION=glproto-1.4.17
- DRI2PROTO_VERSION=dri2proto-2.8
@@ -35,6 +36,7 @@ env:
- XCBPROTO_VERSION=xcb-proto-1.11
- LIBXCB_VERSION=libxcb-1.11
- LIBXSHMFENCE_VERSION=libxshmfence-1.2
+ - LIBTXC_DXTN_VERSION=libtxc_dxtn-1.0.1
- LLVM_VERSION=3.9
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
- PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
@@ -100,6 +102,12 @@ install:
- tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2
- (cd $LIBXSHMFENCE_VERSION && ./configure --prefix=$HOME/prefix && make
install)
+ - wget $TXC_DXTN_RELEASES/$LIBTXC_DXTN_VERSION.tar.bz2
+ - tar -jxvf $LIBTXC_DXTN_VERSION.tar.bz2
+ - (cd $LIBTXC_DXTN_VERSION && ./configure --prefix=$HOME/prefix && make
install)
+
+ - sudo apt-get purge libtxc-dxtn-s2tc0
+
script:
- if test "x$BUILD" = xmake; then
./autogen.sh --enable-debug
--
2.11.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
