kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "ci: travis: disable the webp loader on CI builds for now" 

This reverts commit 29c491b977.

We went back to a much older version which should be available on all
our CI test systems. Safe to enable again.
This commit is contained in:
Stefan Schmidt 2020-06-16 16:19:04 +02:00
parent d2291f55dc
commit e360ca4863
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.ci/ci-configure.sh
View File

@ -6,8 +6,7 @@ travis_fold start "meson"
travis_time_start "meson"
if [ "$DISTRO" != "" ] ; then
# Why do we need to disable the imf loaders here?
# Once libwebp 1.1.0 is available in more distros we can enable it by default again
OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Devas-loaders-disabler=json,webp"
OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
MONO_LINUX_COPTS=" -Dbindings=cxx,mono -Dmono-beta=true"
@ -99,7 +98,7 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig:$(pwd)/.ci"
mkdir build && meson build -Dopengl=full -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Dgstreamer=false
else # Native Ubuntu Linux Travis builds (non-docker)
OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Devas-loaders-disabler=json,webp"
OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
if [ "$TRAVIS_CPU_ARCH" = "ppc64le" ]; then
OPTS="$OPTS -Dbindings="