summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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:
464 * libspectre 464 * libspectre
465 * librsvg 465 * librsvg
466 * openmp (clang needs libomp, while gcc uses libgomp) 466 * openmp (clang needs libomp, while gcc uses libgomp)
467 467 * libwebp
468You might want webp support so disable fewer loaders and remove webp
469from the disablers with:
470
471 -Devas-loaders-disabler=json
472 468
473Wayland support: 469Wayland support:
474 470
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 @@
1#!/bin/sh -e 1#!/bin/sh -e
2meson -Dsystemd=false -Dv4l2=false -Deeze=false -Devas-loaders-disabler=json \ 2meson -Dsystemd=false -Dv4l2=false -Deeze=false \
3 $@ . build 3 $@ . 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 @@
1#!/bin/sh -e 1#!/bin/sh -e
2meson -Dfb=true -Ddrm=true -Dwl=true -Devas-loaders-disabler=json \ 2meson -Dfb=true -Ddrm=true -Dwl=true -Dsystemd=false -Delogind=true \
3 -Dsystemd=false -Delogind=true \
4 $@ . build 3 $@ . 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 @@
1#!/bin/sh -e 1#!/bin/sh -e
2meson -Dfb=true -Dsystemd=false -Devas-loaders-disabler=json \ 2meson -Dfb=true -Dsystemd=false\
3 $@ . build 3 $@ . 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 @@
1#!/bin/sh -e 1#!/bin/sh -e
2meson -Dfb=true -Devas-loaders-disabler=json \ 2meson -Dfb=true \
3 $@ . build 3 $@ . 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 @@
1#!/bin/sh -e 1#!/bin/sh -e
2meson -Dfb=true -Ddrm=true -Dwl=true -Devas-loaders-disabler=json \ 2meson -Dfb=true -Ddrm=true -Dwl=true \
3 $@ . build 3 $@ . 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',
190 type : 'array', 190 type : 'array',
191 description : 'List of modular image/vector loaders to disable in efl', 191 description : 'List of modular image/vector loaders to disable in efl',
192 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'], 192 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'],
193 value : ['webp', 'json'] 193 value : ['json']
194) 194)
195 195
196option('ecore-imf-loaders-disabler', 196option('ecore-imf-loaders-disabler',