projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getteximage: Return correct error value when texure object is not found
[mesa.git]
/
.travis.yml
diff --git
a/.travis.yml
b/.travis.yml
index 5f489a47fb7963ec49fbf425bae7c869e190edec..fb72a5e9b971debd1714dfd3d4025241b5845a41 100644
(file)
--- a/
.travis.yml
+++ b/
.travis.yml
@@
-11,7
+11,6
@@
addons:
apt:
packages:
- libdrm-dev
apt:
packages:
- libdrm-dev
- - libudev-dev
- x11proto-xf86vidmode-dev
- libexpat1-dev
- libxcb-dri2-0-dev
- x11proto-xf86vidmode-dev
- libexpat1-dev
- libxcb-dri2-0-dev
@@
-33,11
+32,12
@@
env:
- DRI3PROTO_VERSION=dri3proto-1.0
- PRESENTPROTO_VERSION=presentproto-1.0
- LIBPCIACCESS_VERSION=libpciaccess-0.13.4
- DRI3PROTO_VERSION=dri3proto-1.0
- PRESENTPROTO_VERSION=presentproto-1.0
- LIBPCIACCESS_VERSION=libpciaccess-0.13.4
- - LIBDRM_VERSION=libdrm-2.4.
65
+ - LIBDRM_VERSION=libdrm-2.4.
74
- XCBPROTO_VERSION=xcb-proto-1.11
- LIBXCB_VERSION=libxcb-1.11
- LIBXSHMFENCE_VERSION=libxshmfence-1.2
- PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
- XCBPROTO_VERSION=xcb-proto-1.11
- LIBXCB_VERSION=libxcb-1.11
- LIBXSHMFENCE_VERSION=libxshmfence-1.2
- PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
+ - MAKEFLAGS=-j2
matrix:
- BUILD=make
- BUILD=scons
matrix:
- BUILD=make
- BUILD=scons
@@
-48,7
+48,7
@@
install:
# Since libdrm gets updated in configure.ac regularly, try to pick up the
# latest version from there.
# Since libdrm gets updated in configure.ac regularly, try to pick up the
# latest version from there.
- - for line in `grep "^LIBDRM
_
.*_REQUIRED=" configure.ac`; do
+ - for line in `grep "^LIBDRM.*_REQUIRED=" configure.ac`; do
old_ver=`echo $LIBDRM_VERSION | sed 's/libdrm-//'`;
new_ver=`echo $line | sed 's/.*REQUIRED=//'`;
if `echo "$old_ver,$new_ver" | tr ',' '\n' | sort -Vc 2> /dev/null`; then
old_ver=`echo $LIBDRM_VERSION | sed 's/libdrm-//'`;
new_ver=`echo $line | sed 's/.*REQUIRED=//'`;
if `echo "$old_ver,$new_ver" | tr ',' '\n' | sort -Vc 2> /dev/null`; then
@@
-93,7
+93,7
@@
install:
- wget http://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
- tar -jxvf $LIBDRM_VERSION.tar.bz2
- wget http://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
- tar -jxvf $LIBDRM_VERSION.tar.bz2
- - (cd $LIBDRM_VERSION && ./configure --prefix=$HOME/prefix --enable-vc4 && make install)
+ - (cd $LIBDRM_VERSION && ./configure --prefix=$HOME/prefix --enable-vc4
--enable-freedreno --enable-etnaviv-experimental-api
&& make install)
- wget $XORG_RELEASES/lib/$LIBXSHMFENCE_VERSION.tar.bz2
- tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2
- wget $XORG_RELEASES/lib/$LIBXSHMFENCE_VERSION.tar.bz2
- tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2
@@
-104,7
+104,7
@@
script:
./autogen.sh --enable-debug
--with-egl-platforms=x11,drm
--with-dri-drivers=i915,i965,radeon,r200,swrast,nouveau
./autogen.sh --enable-debug
--with-egl-platforms=x11,drm
--with-dri-drivers=i915,i965,radeon,r200,swrast,nouveau
- --with-gallium-drivers=
svga,swrast,vc4,virgl,r300,r600
+ --with-gallium-drivers=
i915,nouveau,r300,r600,freedreno,svga,swrast,vc4,virgl,etnaviv,imx
--disable-llvm-shared-libs
;
make && make check;
--disable-llvm-shared-libs
;
make && make check;