From ee25c66efffbb0adaff17119a8161ca9daa52eb8 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Tue, 6 Aug 2019 20:47:07 +0900 Subject: [PATCH] build: Seprate same svg extension loaders between image and vector. Currently, vector and image support svg format via different rountine. Our vector loader implemenst on its own drawing mechanism for svg, but in case of image loader, it depends on rsvg library. By Comparing both, our vector svg is winner at performance wise. we can remove rsvg routine later. For now, these two loader names are conflicted, we should separate their names with svg and rsvg. --- meson_options.txt | 4 ++-- src/generic/evas/meson.build | 2 +- src/generic/evas/{svg => rsvg}/main.c | 0 src/generic/evas/{svg => rsvg}/meson.build | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename src/generic/evas/{svg => rsvg}/main.c (100%) rename src/generic/evas/{svg => rsvg}/meson.build (100%) diff --git a/meson_options.txt b/meson_options.txt index c51e12bd18..8f5deb17a5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -201,8 +201,8 @@ option('evas-modules', option('evas-loaders-disabler', type : 'array', - description : 'List of modular image loaders to disable in efl', - choices : ['gst', 'pdf', 'ps', 'raw', 'svg', 'xcf', 'bmp', 'dds', 'eet', 'generic', 'gif', 'ico', 'jp2k', 'jpeg', 'pmaps', 'png', 'psd', 'tga', 'tgv', 'tiff', 'wbmp', 'webp', 'xpm', 'json'], + 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'] ) diff --git a/src/generic/evas/meson.build b/src/generic/evas/meson.build index a6c924f90e..2e5b58ae4c 100644 --- a/src/generic/evas/meson.build +++ b/src/generic/evas/meson.build @@ -1,7 +1,7 @@ generic_loaders = ['gst', 'pdf', 'ps', 'raw', -'svg', +'rsvg', 'xcf'] generic_src = [] diff --git a/src/generic/evas/svg/main.c b/src/generic/evas/rsvg/main.c similarity index 100% rename from src/generic/evas/svg/main.c rename to src/generic/evas/rsvg/main.c diff --git a/src/generic/evas/svg/meson.build b/src/generic/evas/rsvg/meson.build similarity index 100% rename from src/generic/evas/svg/meson.build rename to src/generic/evas/rsvg/meson.build