stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=e360ca4863b4ada144b69c2d092e01f056cadcfa

commit e360ca4863b4ada144b69c2d092e01f056cadcfa
Author: Stefan Schmidt <[email protected]>
Date:   Tue Jun 16 16:19:04 2020 +0200

    Revert "ci: travis: disable the webp loader on CI builds for now"
    
    This reverts commit 29c491b977543e9ef86147604ab3a297ece18327.
    
    We went back to a much older version which should be available on all
    our CI test systems. Safe to enable again.
---
 .ci/ci-configure.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index b6e99e9f96..dced2544ff 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -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="

-- 


Reply via email to