summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-01-28 08:28:10 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-01-28 08:34:34 +0000
commit2101e3c3d3daf177d3d3d991ba0498bb67fc02b9 (patch)
tree327757d9441d0191a63505d2ce569b9e3281a132
parent581bec9598943cc9274dfe7db1a73a4c878c3cdd (diff)
downloadefl-2101e3c3d3daf177d3d3d991ba0498bb67fc02b9.tar.gz
webp - promote to default on
i just noticed a pattern... we recommend in our sample confs ... to not disable webp. why keep doing that and why not just make it a dep on by default you need to explicitly disable? make lives easier and less complex. it was a good exercise to write these as it points this out... :)
-rw-r--r--README6
-rwxr-xr-xconfs/freebsd.sh2
-rwxr-xr-xconfs/linux-elogind.sh3
-rwxr-xr-xconfs/linux-nowayland-nosystemd.sh2
-rwxr-xr-xconfs/linux-nowayland.sh2
-rwxr-xr-xconfs/linux.sh2
-rw-r--r--meson_options.txt2
7 files changed, 7 insertions, 12 deletions
diff --git a/README b/README
index 6efd9a4da5..d94127bce0 100644
--- a/README
+++ b/README
@@ -464,11 +464,7 @@ Required by default:
* libspectre
* librsvg
* openmp (clang needs libomp, while gcc uses libgomp)
-
-You might want webp support so disable fewer loaders and remove webp
-from the disablers with:
-
- -Devas-loaders-disabler=json
+ * libwebp
Wayland support:
diff --git a/confs/freebsd.sh b/confs/freebsd.sh
index 1a88fc7295..ac41281bcc 100755
--- a/confs/freebsd.sh
+++ b/confs/freebsd.sh
@@ -1,3 +1,3 @@
#!/bin/sh -e
-meson -Dsystemd=false -Dv4l2=false -Deeze=false -Devas-loaders-disabler=json \
+meson -Dsystemd=false -Dv4l2=false -Deeze=false \
$@ . build
diff --git a/confs/linux-elogind.sh b/confs/linux-elogind.sh
index 077ea58f99..a560793cfd 100755
--- a/confs/linux-elogind.sh
+++ b/confs/linux-elogind.sh
@@ -1,4 +1,3 @@
#!/bin/sh -e
-meson -Dfb=true -Ddrm=true -Dwl=true -Devas-loaders-disabler=json \
- -Dsystemd=false -Delogind=true \
+meson -Dfb=true -Ddrm=true -Dwl=true -Dsystemd=false -Delogind=true \
$@ . build
diff --git a/confs/linux-nowayland-nosystemd.sh b/confs/linux-nowayland-nosystemd.sh
index ea9fde6695..9315fecac4 100755
--- a/confs/linux-nowayland-nosystemd.sh
+++ b/confs/linux-nowayland-nosystemd.sh
@@ -1,3 +1,3 @@
#!/bin/sh -e
-meson -Dfb=true -Dsystemd=false -Devas-loaders-disabler=json \
+meson -Dfb=true -Dsystemd=false\
$@ . build
diff --git a/confs/linux-nowayland.sh b/confs/linux-nowayland.sh
index 4219e980b2..2b080f4c45 100755
--- a/confs/linux-nowayland.sh
+++ b/confs/linux-nowayland.sh
@@ -1,3 +1,3 @@
#!/bin/sh -e
-meson -Dfb=true -Devas-loaders-disabler=json \
+meson -Dfb=true \
$@ . build
diff --git a/confs/linux.sh b/confs/linux.sh
index 223cb0df3e..18b1473421 100755
--- a/confs/linux.sh
+++ b/confs/linux.sh
@@ -1,3 +1,3 @@
#!/bin/sh -e
-meson -Dfb=true -Ddrm=true -Dwl=true -Devas-loaders-disabler=json \
+meson -Dfb=true -Ddrm=true -Dwl=true \
$@ . build
diff --git a/meson_options.txt b/meson_options.txt
index 50eedcc806..338c8f386b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -190,7 +190,7 @@ option('evas-loaders-disabler',
type : 'array',
description : 'List of modular image/vector loaders to disable in efl',
choices : ['gst', 'pdf', 'ps', 'raw', 'svg', 'rsvg', 'xcf', 'bmp', 'dds', 'eet', 'generic', 'gif', 'ico', 'jp2k', 'jpeg', 'pmaps', 'png', 'psd', 'tga', 'tgv', 'tiff', 'wbmp', 'webp', 'xpm', 'json'],
- value : ['webp', 'json']
+ value : ['json']
)
option('ecore-imf-loaders-disabler',