summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.ci/ci-configure.sh5
1 files 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"
6travis_time_start "meson" 6travis_time_start "meson"
7if [ "$DISTRO" != "" ] ; then 7if [ "$DISTRO" != "" ] ; then
8 # Why do we need to disable the imf loaders here? 8 # Why do we need to disable the imf loaders here?
9 # Once libwebp 1.1.0 is available in more distros we can enable it by default again 9 OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
10 OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Devas-loaders-disabler=json,webp"
11 10
12 MONO_LINUX_COPTS=" -Dbindings=cxx,mono -Dmono-beta=true" 11 MONO_LINUX_COPTS=" -Dbindings=cxx,mono -Dmono-beta=true"
13 12
@@ -99,7 +98,7 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
99 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig:$(pwd)/.ci" 98 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig:$(pwd)/.ci"
100 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 99 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
101else # Native Ubuntu Linux Travis builds (non-docker) 100else # Native Ubuntu Linux Travis builds (non-docker)
102 OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Devas-loaders-disabler=json,webp" 101 OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
103 102
104 if [ "$TRAVIS_CPU_ARCH" = "ppc64le" ]; then 103 if [ "$TRAVIS_CPU_ARCH" = "ppc64le" ]; then
105 OPTS="$OPTS -Dbindings=" 104 OPTS="$OPTS -Dbindings="