diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2020-07-14 10:54:57 +0100 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2020-07-14 10:55:44 +0100 |
commit | f620e0edd17dc7ea3d93ac26146da2698b372d51 (patch) | |
tree | 2ec3e593ab5d366d5e1671e31003cf1132d965e3 /src/lib/evas | |
parent | 44a018d37ffdf03627fc5d45aa249c2237bf5dac (diff) |
Revert "Evas: add avif evas loader"
This reverts commit dd23a6c84aee249aa5316b48af6956072233bb97.
i didn't mean to push this yet...
Diffstat (limited to '')
-rw-r--r-- | src/lib/evas/common/evas_image_load.c | 4 | ||||
-rw-r--r-- | src/lib/evas/file/evas_module.c | 4 | ||||
-rw-r--r-- | src/lib/evas/meson.build | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/evas/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c index 5d3e3aa30f..1d28253c7e 100644 --- a/src/lib/evas/common/evas_image_load.c +++ b/src/lib/evas/common/evas_image_load.c | |||
@@ -66,8 +66,6 @@ static const struct ext_loader_s loaders[] = | |||
66 | 66 | ||
67 | MATCHING(".dds", "dds"), | 67 | MATCHING(".dds", "dds"), |
68 | 68 | ||
69 | MATCHING(".avif", "avif"), | ||
70 | |||
71 | /* xcf - gefenric */ | 69 | /* xcf - gefenric */ |
72 | MATCHING(".xcf", "generic"), | 70 | MATCHING(".xcf", "generic"), |
73 | MATCHING(".xcf.gz", "generic"), | 71 | MATCHING(".xcf.gz", "generic"), |
@@ -165,7 +163,7 @@ static const struct ext_loader_s loaders[] = | |||
165 | static const char *loaders_name[] = | 163 | static const char *loaders_name[] = |
166 | { /* in order of most likely needed */ | 164 | { /* in order of most likely needed */ |
167 | "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "webp", "pmaps", | 165 | "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "webp", "pmaps", |
168 | "bmp", "tga", "wbmp", "ico", "psd", "jp2k", "dds", "avif", "generic" | 166 | "bmp", "tga", "wbmp", "ico", "psd", "jp2k", "dds", "generic" |
169 | }; | 167 | }; |
170 | 168 | ||
171 | struct evas_image_foreach_loader_data | 169 | struct evas_image_foreach_loader_data |
diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c index b99118698e..a1e8b623af 100644 --- a/src/lib/evas/file/evas_module.c +++ b/src/lib/evas/file/evas_module.c | |||
@@ -196,7 +196,6 @@ EVAS_EINA_STATIC_MODULE_DEFINE(vg_loader, json); | |||
196 | #endif | 196 | #endif |
197 | 197 | ||
198 | #if !EVAS_MODULE_NO_IMAGE_LOADERS | 198 | #if !EVAS_MODULE_NO_IMAGE_LOADERS |
199 | EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, avif); | ||
200 | EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, bmp); | 199 | EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, bmp); |
201 | EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, dds); | 200 | EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, dds); |
202 | EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, eet); | 201 | EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, eet); |
@@ -288,9 +287,6 @@ static const struct { | |||
288 | #endif | 287 | #endif |
289 | #endif | 288 | #endif |
290 | #if !EVAS_MODULE_NO_IMAGE_LOADERS | 289 | #if !EVAS_MODULE_NO_IMAGE_LOADERS |
291 | #ifdef EVAS_STATIC_BUILD_AVIF | ||
292 | EVAS_EINA_STATIC_MODULE_USE(image_loader, avif), | ||
293 | #endif | ||
294 | #ifdef EVAS_STATIC_BUILD_BMP | 290 | #ifdef EVAS_STATIC_BUILD_BMP |
295 | EVAS_EINA_STATIC_MODULE_USE(image_loader, bmp), | 291 | EVAS_EINA_STATIC_MODULE_USE(image_loader, bmp), |
296 | #endif | 292 | #endif |
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build index 315aa57a63..fca88309ad 100644 --- a/src/lib/evas/meson.build +++ b/src/lib/evas/meson.build | |||
@@ -10,10 +10,8 @@ giflib = cc.find_library('gif') | |||
10 | webp = dependency('libwebp', version: ['>=0.5.0'], required: get_option('evas-loaders-disabler').contains('webp') == false) | 10 | webp = dependency('libwebp', version: ['>=0.5.0'], required: get_option('evas-loaders-disabler').contains('webp') == false) |
11 | webpdemux = dependency('libwebpdemux', version: ['>=0.5.0'], required: get_option('evas-loaders-disabler').contains('webp') == false) | 11 | webpdemux = dependency('libwebpdemux', version: ['>=0.5.0'], required: get_option('evas-loaders-disabler').contains('webp') == false) |
12 | libopenjp2 = dependency('libopenjp2', required: get_option('evas-loaders-disabler').contains('jp2k') == false) | 12 | libopenjp2 = dependency('libopenjp2', required: get_option('evas-loaders-disabler').contains('jp2k') == false) |
13 | libavif = dependency('libavif', required: get_option('evas-loaders-disabler').contains('avif') == false) | ||
14 | 13 | ||
15 | evas_image_loaders_file = [ | 14 | evas_image_loaders_file = [ |
16 | ['avif', 'shared', [libavif]], | ||
17 | ['bmp', 'shared', []], | 15 | ['bmp', 'shared', []], |
18 | ['eet', 'static', [eet]], | 16 | ['eet', 'static', [eet]], |
19 | ['generic', 'shared', [rt]], | 17 | ['generic', 'shared', [rt]], |