summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-06-21 11:51:52 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2019-06-21 11:51:52 +0200
commitccecfb05a65d2c501b9ce77aa8a11d53e5484aa8 (patch)
treeeb35abfb4b5106fd450dd0ada63fe127e49d6cf7
parent593ee304407714dec9152f482600721b763e1e6f (diff)
ci: make sure we disable the new json evas loader in our jobs
This have been just added and we need to update our disabled list for some specific jobs where we mess with the disabled loaders manually.
-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 079886b25b..0b0522cf0d 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -17,7 +17,7 @@ if [ "$DISTRO" != "" ] ; then
17 # - RPM fusion repo for xine and libvlc 17 # - RPM fusion repo for xine and libvlc
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 -Dg-mainloop=true -Dxpresent=true -Dxgesture=false -Dxinput22=true \ 19 -Ddebug-threads=true -Dg-mainloop=true -Dxpresent=true -Dxgesture=false -Dxinput22=true \
20 -Devas-loaders-disabler= -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=libvlc,xine \ 20 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=libvlc,xine \
21 -Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \ 21 -Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \
22 -Dvnc-server=true -Dbindings=luajit -Delogind=false -Dinstall-eo-files=true" 22 -Dvnc-server=true -Dbindings=luajit -Delogind=false -Dinstall-eo-files=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 -Devas-modules=static \ 28 -Dnetwork-backend=connman -Dxinput2=false -Dtslib=false -Devas-modules=static \
29 -Devas-loaders-disabler=gst,pdf,ps,raw,svg,xcf,bmp,dds,eet,generic,gif,ico,jp2k,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm \ 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 -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine \ 30 -Decore-imf-loaders-disabler=xim,ibus,scim -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine \
31 -Demotion-generic-loaders-disabler=vlc -Dfribidi=false -Dfontconfig=false \ 31 -Demotion-generic-loaders-disabler=vlc -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=pdf,ps,raw,svg -Devas-modules=static -Dbindings=luajit \ 40 -Devas-loaders-disabler=json,pdf,ps,raw,svg -Devas-modules=static -Dbindings=luajit \
41 -Dbuild-examples=false -Dbuild-tests=false" 41 -Dbuild-examples=false -Dbuild-tests=false"
42 42
43 if [ "$1" = "options-enabled" ]; then 43 if [ "$1" = "options-enabled" ]; then