summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-07-14 15:56:54 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-07-14 15:56:54 +0200
commit42e3411ed7dacc652bd1c64d94941d7ac6aa67c4 (patch)
tree88dc5b634f3da83af8e603a4fd22a5248a77a190
parentf0aede60522033859be46f077212d179ff5bfaa5 (diff)
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.
-rwxr-xr-x.ci/ci-configure.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 0b2f5a64c1..dced2544ff 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -17,7 +17,7 @@ if [ "$DISTRO" != "" ] ; then
17 # - Ibus 17 # - Ibus
18 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \ 18 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \
19 -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \ 19 -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \
20 -Devas-loaders-disabler=json,avif -Decore-imf-loaders-disabler= \ 20 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= \
21 -Dharfbuzz=true -Dpixman=true -Dhyphen=true -Defl-one=true \ 21 -Dharfbuzz=true -Dpixman=true -Dhyphen=true -Defl-one=true \
22 -Dvnc-server=true -Delua=true -Dbindings=lua,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=true" 22 -Dvnc-server=true -Delua=true -Dbindings=lua,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=true"
23 23
@@ -26,7 +26,7 @@ if [ "$DISTRO" != "" ] ; then
26 -Dopengl=none -Deina-magic-debug=false -Dbuild-examples=false -Dbuild-tests=false \ 26 -Dopengl=none -Deina-magic-debug=false -Dbuild-examples=false -Dbuild-tests=false \
27 -Dcrypto=gnutls -Dglib=false -Dgstreamer=false -Dsystemd=false -Dpulseaudio=false \ 27 -Dcrypto=gnutls -Dglib=false -Dgstreamer=false -Dsystemd=false -Dpulseaudio=false \
28 -Dnetwork-backend=connman -Dxinput2=false -Dtslib=false \ 28 -Dnetwork-backend=connman -Dxinput2=false -Dtslib=false \
29 -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 \ 29 -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 \
30 -Decore-imf-loaders-disabler=xim,ibus,scim \ 30 -Decore-imf-loaders-disabler=xim,ibus,scim \
31 -Dfribidi=false -Dfontconfig=false \ 31 -Dfribidi=false -Dfontconfig=false \
32 -Dedje-sound-and-video=false -Dembedded-lz4=false -Dlibmount=false -Dv4l2=false \ 32 -Dedje-sound-and-video=false -Dembedded-lz4=false -Dlibmount=false -Dv4l2=false \
@@ -37,7 +37,7 @@ if [ "$DISTRO" != "" ] ; then
37 37
38 MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \ 38 MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \
39 -Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \ 39 -Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \
40 -Devas-loaders-disabler=json,pdf,ps,raw,svg,rsvg,avif \ 40 -Devas-loaders-disabler=json,pdf,ps,raw,svg,rsvg \
41 -Dharfbuzz=true -Dpixman=true -Dembedded-lz4=false " 41 -Dharfbuzz=true -Dpixman=true -Dembedded-lz4=false "
42 42
43 if [ "$1" = "default" ]; then 43 if [ "$1" = "default" ]; then