From: Stefan Schmidt Date: Tue, 14 Jul 2020 13:56:54 +0000 (+0200) Subject: Revert "ci: travis: make sure we disable avif loader by default in our jobs" X-Git-Tag: submit/tizen/20200719.223823~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1c1eb21047c49389b725587a542277d966a2c64;p=platform%2Fupstream%2Fefl.git Revert "ci: travis: make sure we disable avif loader by default in our jobs" This reverts commit 44a018d37ffdf03627fc5d45aa249c2237bf5dac. With the libavif module patch reverted this also needs to go, until its back. --- diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh index cdb15c4..eb9674b 100755 --- a/.ci/ci-configure.sh +++ b/.ci/ci-configure.sh @@ -18,7 +18,7 @@ if [ "$DISTRO" != "" ] ; then # - Ibus ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \ -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \ - -Devas-loaders-disabler=json,avif -Decore-imf-loaders-disabler= \ + -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= \ -Dharfbuzz=true -Dpixman=true -Dhyphen=true -Defl-one=true \ -Dvnc-server=true -Delua=true -Dbindings=lua,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=true" @@ -27,7 +27,7 @@ if [ "$DISTRO" != "" ] ; then -Dopengl=none -Deina-magic-debug=false -Dbuild-examples=false -Dbuild-tests=false \ -Dcrypto=gnutls -Dglib=false -Dgstreamer=false -Dsystemd=false -Dpulseaudio=false \ -Dnetwork-backend=connman -Dxinput2=false -Dtslib=false \ - -Devas-loaders-disabler=gst,pdf,ps,raw,svg,xcf,bmp,dds,eet,generic,gif,ico,jp2k,json,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm,avif \ + -Devas-loaders-disabler=gst,pdf,ps,raw,svg,xcf,bmp,dds,eet,generic,gif,ico,jp2k,json,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm \ -Decore-imf-loaders-disabler=xim,ibus,scim \ -Dfribidi=false -Dfontconfig=false \ -Dedje-sound-and-video=false -Dembedded-lz4=false -Dlibmount=false -Dv4l2=false \ @@ -38,7 +38,7 @@ if [ "$DISTRO" != "" ] ; then MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \ -Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \ - -Devas-loaders-disabler=json,pdf,ps,raw,svg,rsvg,avif \ + -Devas-loaders-disabler=json,pdf,ps,raw,svg,rsvg \ -Dharfbuzz=true -Dpixman=true -Dembedded-lz4=false " if [ "$1" = "default" ]; then