p96705831
/
efl
forked from openkylin/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed debian/source/format to native

This commit is contained in:
luoyaoming 2022-09-15 10:48:30 +08:00
parent 5dc793c6d0
commit bf233a79de
12 changed files with 1 additions and 818 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
debian/patches/0004-build-bring-back-loaders-and-savers-as-modules-and-o.patch vendored
View File

@ -1,204 +0,0 @@
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Sat, 5 Oct 2019 13:14:39 +0100
Subject: build - bring back loaders and savers as modules and/or static
so the evas modules able to be static or not was a bit pointless as it
could inline all evas modules (or none) not just the most common or
not, but ecore evas modules were still modules, so it really wasn't
being useful.
image loaders ans savers omn the other hand were *ALL* being
statically built in without exception. this was kind of a regression
in the build system in the move to meson. some were static due to
micro optimizations and performance inlining the most common to save a
little extra loading + linking + page fragmentation for loaders you
are likely to need in most cases as well as save the drity pages from
linking in their dependencies (libgif, libtiff, libwebp and all their
dependencies too etc. etc.). this now brings back the ability to
decide which are static and which are shared modules (not exposed to
the user as options for meson - fixed in meson.build files which i
think is good enough given the purpose of this).
---
src/modules/evas/image_loaders/meson.build | 75 +++++++++++++++++-------------
src/modules/evas/image_savers/meson.build | 52 ++++++++++++---------
src/modules/evas/meson.build | 16 +++++++
3 files changed, 89 insertions(+), 54 deletions(-)
--- a/src/modules/evas/image_loaders/meson.build
+++ b/src/modules/evas/image_loaders/meson.build
@@ -1,42 +1,51 @@
evas_image_loaders_file = [
- ['bmp', []],
- ['eet', [eet]],
- ['generic', [rt]],
- ['gif', [giflib]],
- ['ico', []],
- ['jpeg', [jpeg]],
- ['pmaps', []],
- ['png', [png]],
- ['psd', []],
- ['tga', []],
- ['tgv', [rg_etc, lz4]],
- ['tiff', [tiff]],
- ['wbmp', []],
- ['webp', [webp]],
- ['xpm', []],
+ evas_loader_saver_mod_bmp,
+ evas_loader_saver_mod_eet,
+ evas_loader_saver_mod_generic,
+ evas_loader_saver_mod_gif,
+ evas_loader_saver_mod_ico,
+ evas_loader_saver_mod_jpeg,
+ evas_loader_saver_mod_pmaps,
+ evas_loader_saver_mod_png,
+ evas_loader_saver_mod_psd,
+ evas_loader_saver_mod_tga,
+ evas_loader_saver_mod_tgv,
+ evas_loader_saver_mod_tiff,
+ evas_loader_saver_mod_wbmp,
+ evas_loader_saver_mod_webp,
+ evas_loader_saver_mod_xpm
]
foreach loader_inst : evas_image_loaders_file
- loader = loader_inst[0]
- loader_deps = loader_inst[1]
-
-
+ loader = loader_inst[0]
+ loader_type = loader_inst[1]
+ loader_deps = loader_inst[2]
if get_option('evas-loaders-disabler').contains(loader) == false
- file = join_paths(loader, 'evas_image_load_'+loader+'.c')
-
- tmp = static_library('image_loader_'+loader, file,
- include_directories : config_dir,
- dependencies : [evas_pre] + loader_deps
- )
-
- evas_static_list += [declare_dependency(
- sources: file,
- dependencies: loader_deps,
- )]
-
- config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
+ file = join_paths(loader, 'evas_image_load_'+loader+'.c')
+ if loader_type == 'shared'
+ evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
+ mod_install_dir = join_paths(evas_package_modules, 'image_loaders', loader, version_name)
+ shared_module(loader, file,
+ include_directories : config_dir,
+ dependencies : [evas_pre] + loader_deps,
+ install : true,
+ install_dir : mod_install_dir,
+ name_suffix : sys_mod_extension
+ )
+ module_files += join_paths(mod_install_dir, 'lib'+loader + '.' + sys_mod_extension)
+ else
+ config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
+ tmp = static_library('image_loader_'+loader, file,
+ include_directories : config_dir,
+ dependencies : [evas_pre] + loader_deps
+ )
+ evas_static_list += [declare_dependency(
+ sources: file,
+ dependencies: loader_deps,
+ )]
+ endif
else
message('Image loader '+loader+' disabled')
endif
-endforeach
\ No newline at end of file
+endforeach
--- a/src/modules/evas/image_savers/meson.build
+++ b/src/modules/evas/image_savers/meson.build
@@ -1,31 +1,41 @@
-
evas_image_savers_file = [
-['eet', [eet]],
-['jpeg', [jpeg]],
-['png', [png]],
-['tgv', [rg_etc, lz4]],
-['tiff', [tiff]],
-['webp', []]
+ evas_loader_saver_mod_eet,
+ evas_loader_saver_mod_jpeg,
+ evas_loader_saver_mod_png,
+ evas_loader_saver_mod_tgv,
+ evas_loader_saver_mod_tiff,
+ evas_loader_saver_mod_webp
]
foreach loader_inst : evas_image_savers_file
loader = loader_inst[0]
- loader_deps = loader_inst[1]
-
+ loader_type = loader_inst[1]
+ loader_deps = loader_inst[2]
if get_option('evas-loaders-disabler').contains(loader) == false
+ config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
file = join_paths(loader, 'evas_image_save_'+loader+'.c')
-
- tmp = static_library('image_saver_'+loader, file,
- include_directories : config_dir,
- dependencies : [evas_pre] + loader_deps
- )
-
- evas_static_list += [declare_dependency(
- sources: file,
- dependencies: loader_deps,
- )]
-
- config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
+ if loader_type == 'shared'
+ evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
+ mod_install_dir = join_paths(evas_package_modules, 'image_savers', loader, version_name)
+ shared_module(loader, file,
+ include_directories : config_dir,
+ dependencies : [evas_pre] + loader_deps,
+ install : true,
+ install_dir : mod_install_dir,
+ name_suffix : sys_mod_extension
+ )
+ module_files += join_paths(mod_install_dir, 'lib'+loader + '.' + sys_mod_extension)
+ else
+ config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
+ tmp = static_library('image_saver_'+loader, file,
+ include_directories : config_dir,
+ dependencies : [evas_pre] + loader_deps
+ )
+ evas_static_list += [declare_dependency(
+ sources: file,
+ dependencies: loader_deps,
+ )]
+ endif
else
message('Image saver '+loader+' disabled')
endif
--- a/src/modules/evas/meson.build
+++ b/src/modules/evas/meson.build
@@ -5,6 +5,22 @@
json = dependency('rlottie', required: get_option('evas-loaders-disabler').contains('json') == false)
webp = dependency('libwebp', required: get_option('evas-loaders-disabler').contains('webp') == false)
+evas_loader_saver_mod_bmp = ['bmp', 'shared', []]
+evas_loader_saver_mod_eet = ['eet', 'static', [eet]]
+evas_loader_saver_mod_generic = ['generic', 'shared', [rt]]
+evas_loader_saver_mod_gif = ['gif', 'shared', [giflib]]
+evas_loader_saver_mod_ico = ['ico', 'shared', []]
+evas_loader_saver_mod_jpeg = ['jpeg', 'static', [jpeg]]
+evas_loader_saver_mod_pmaps = ['pmaps', 'shared', []]
+evas_loader_saver_mod_png = ['png', 'static', [png]]
+evas_loader_saver_mod_psd = ['psd', 'shared', []]
+evas_loader_saver_mod_tga = ['tga', 'shared', []]
+evas_loader_saver_mod_tgv = ['tgv', 'shared', [rg_etc, lz4]]
+evas_loader_saver_mod_tiff = ['tiff', 'shared', [tiff]]
+evas_loader_saver_mod_wbmp = ['wbmp', 'shared', []]
+evas_loader_saver_mod_webp = ['webp', 'shared', [webp]]
+evas_loader_saver_mod_xpm = ['xpm', 'shared', []]
+
#there are a few modules that should NEVER be build as a module but rather be build as static lib and linked in later
evas_static_list = []

321
debian/patches/0005-build-images-loaders-and-saver-modules-need-to-link-.patch vendored
View File

@ -1,321 +0,0 @@
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Sat, 5 Oct 2019 18:35:00 +0100
Subject: build - images loaders and saver modules need to link to evas
if your platform is picky enough it won't want to leave unresolved
symbols (which wshould be resovled at runtime from the host lib) so we
need to link these modules to evas. the problem is due to the
complicated build of some modules being static and some shared, evas
is declared with evas_goal and this has to be declared after static
modules are declared but since i was declaring static and shared at
the same time from a table this breaks. so i have to move all the
static and shared module stuff into evas_goal into 2 phases. one phase
for the static and one for the shared after evas is delcared so evas
as a target exists to link to.
---
meson.build | 2 +
src/lib/evas_goal/meson.build | 143 +++++++++++++++++++++++++++++
src/modules/evas/image_loaders/meson.build | 51 ----------
src/modules/evas/image_savers/meson.build | 42 ---------
src/modules/evas/meson.build | 25 -----
5 files changed, 145 insertions(+), 118 deletions(-)
delete mode 100644 src/modules/evas/image_loaders/meson.build
delete mode 100644 src/modules/evas/image_savers/meson.build
--- a/meson.build
+++ b/meson.build
@@ -247,6 +247,8 @@
ecore_evas_wayland_engine_include_dir = []
+evas_static_list = []
+
evas_lib = ['evas' ,[], false, true, false, false, true, true, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
evas_img_modules = ['evas' ,[], true, false, false, false, false, false, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
evas_engines = [join_paths('evas', 'engines'),[], true, false, false, false, false, false, [], []]
--- a/src/lib/evas_goal/meson.build
+++ b/src/lib/evas_goal/meson.build
@@ -1,3 +1,98 @@
+#fixed dependencies by efl
+png = dependency('libpng')
+tiff = dependency('libtiff-4', required: get_option('evas-loaders-disabler').contains('tiff') == false)
+giflib = cc.find_library('gif')
+webp = dependency('libwebp', required: get_option('evas-loaders-disabler').contains('webp') == false)
+
+evas_loader_saver_mod_bmp = ['bmp', 'shared', []]
+evas_loader_saver_mod_eet = ['eet', 'static', [eet]]
+evas_loader_saver_mod_generic = ['generic', 'shared', [rt]]
+evas_loader_saver_mod_gif = ['gif', 'shared', [giflib]]
+evas_loader_saver_mod_ico = ['ico', 'shared', []]
+evas_loader_saver_mod_jpeg = ['jpeg', 'static', [jpeg]]
+evas_loader_saver_mod_pmaps = ['pmaps', 'shared', []]
+evas_loader_saver_mod_png = ['png', 'static', [png]]
+evas_loader_saver_mod_psd = ['psd', 'shared', []]
+evas_loader_saver_mod_tga = ['tga', 'shared', []]
+evas_loader_saver_mod_tgv = ['tgv', 'shared', [rg_etc, lz4]]
+evas_loader_saver_mod_tiff = ['tiff', 'shared', [tiff]]
+evas_loader_saver_mod_wbmp = ['wbmp', 'shared', []]
+evas_loader_saver_mod_webp = ['webp', 'shared', [webp]]
+evas_loader_saver_mod_xpm = ['xpm', 'shared', []]
+
+evas_image_loaders_file = [
+ evas_loader_saver_mod_bmp,
+ evas_loader_saver_mod_eet,
+ evas_loader_saver_mod_generic,
+ evas_loader_saver_mod_gif,
+ evas_loader_saver_mod_ico,
+ evas_loader_saver_mod_jpeg,
+ evas_loader_saver_mod_pmaps,
+ evas_loader_saver_mod_png,
+ evas_loader_saver_mod_psd,
+ evas_loader_saver_mod_tga,
+ evas_loader_saver_mod_tgv,
+ evas_loader_saver_mod_tiff,
+ evas_loader_saver_mod_wbmp,
+ evas_loader_saver_mod_webp,
+ evas_loader_saver_mod_xpm
+]
+
+evas_image_savers_file = [
+ evas_loader_saver_mod_eet,
+ evas_loader_saver_mod_jpeg,
+ evas_loader_saver_mod_png,
+ evas_loader_saver_mod_tgv,
+ evas_loader_saver_mod_tiff,
+ evas_loader_saver_mod_webp
+]
+
+foreach loader_inst : evas_image_loaders_file
+ loader = loader_inst[0]
+ loader_type = loader_inst[1]
+ loader_deps = loader_inst[2]
+ if get_option('evas-loaders-disabler').contains(loader) == false
+ if loader_type == 'static'
+ config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
+ file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
+ config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
+ tmp = static_library('image_loader_'+loader, file,
+ include_directories : config_dir,
+ dependencies : [evas_pre] + loader_deps
+ )
+ evas_static_list += [declare_dependency(
+ sources: file,
+ dependencies: loader_deps,
+ )]
+ endif
+ else
+ message('Image loader '+loader+' disabled')
+ endif
+endforeach
+
+foreach loader_inst : evas_image_savers_file
+ loader = loader_inst[0]
+ loader_type = loader_inst[1]
+ loader_deps = loader_inst[2]
+ if get_option('evas-loaders-disabler').contains(loader) == false
+ if loader_type == 'static'
+ config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
+ file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
+ config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
+ tmp = static_library('image_saver_'+loader, file,
+ include_directories : config_dir,
+ dependencies : [evas_pre] + loader_deps
+ )
+ evas_static_list += [declare_dependency(
+ sources: file,
+ dependencies: loader_deps,
+ )]
+ endif
+ else
+ message('Image saver '+loader+' disabled')
+ endif
+endforeach
+
evas_lib = library('evas',
'empty.c',
#all the source code is coming from evas_pre_lib_dep
@@ -34,3 +129,51 @@
version : version_major + '.' + version_minor + '.' + version_micro,
libraries : [eina, ecore, ector, emile, lua],
)
+
+foreach loader_inst : evas_image_loaders_file
+ loader = loader_inst[0]
+ loader_type = loader_inst[1]
+ loader_deps = loader_inst[2]
+ if get_option('evas-loaders-disabler').contains(loader) == false
+ if loader_type == 'shared'
+ config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
+ file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
+ evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
+ mod_install_dir = join_paths(evas_package_modules, 'image_loaders', loader, version_name)
+ shared_module('shared_loader_'+loader, file,
+ include_directories : config_dir,
+ dependencies : [eina, evas] + loader_deps,
+ install : true,
+ install_dir : mod_install_dir,
+ name_suffix : sys_mod_extension
+ )
+ module_files += join_paths(mod_install_dir, 'libshared_loader_'+loader + '.' + sys_mod_extension)
+ endif
+ else
+ message('Image loader '+loader+' disabled')
+ endif
+endforeach
+
+foreach loader_inst : evas_image_savers_file
+ loader = loader_inst[0]
+ loader_type = loader_inst[1]
+ loader_deps = loader_inst[2]
+ if get_option('evas-loaders-disabler').contains(loader) == false
+ if loader_type == 'shared'
+ config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
+ file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
+ evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
+ mod_install_dir = join_paths(evas_package_modules, 'image_savers', loader, version_name)
+ shared_module('shared_saver_'+loader, file,
+ include_directories : config_dir,
+ dependencies : [eina, evas] + loader_deps,
+ install : true,
+ install_dir : mod_install_dir,
+ name_suffix : sys_mod_extension
+ )
+ module_files += join_paths(mod_install_dir, 'libshared_saver_'+loader + '.' + sys_mod_extension)
+ endif
+ else
+ message('Image saver '+loader+' disabled')
+ endif
+endforeach
--- a/src/modules/evas/image_loaders/meson.build
+++ /dev/null
@@ -1,51 +0,0 @@
-evas_image_loaders_file = [
- evas_loader_saver_mod_bmp,
- evas_loader_saver_mod_eet,
- evas_loader_saver_mod_generic,
- evas_loader_saver_mod_gif,
- evas_loader_saver_mod_ico,
- evas_loader_saver_mod_jpeg,
- evas_loader_saver_mod_pmaps,
- evas_loader_saver_mod_png,
- evas_loader_saver_mod_psd,
- evas_loader_saver_mod_tga,
- evas_loader_saver_mod_tgv,
- evas_loader_saver_mod_tiff,
- evas_loader_saver_mod_wbmp,
- evas_loader_saver_mod_webp,
- evas_loader_saver_mod_xpm
-]
-
-foreach loader_inst : evas_image_loaders_file
- loader = loader_inst[0]
- loader_type = loader_inst[1]
- loader_deps = loader_inst[2]
- if get_option('evas-loaders-disabler').contains(loader) == false
- config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
- file = join_paths(loader, 'evas_image_load_'+loader+'.c')
- if loader_type == 'shared'
- evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
- mod_install_dir = join_paths(evas_package_modules, 'image_loaders', loader, version_name)
- shared_module(loader, file,
- include_directories : config_dir,
- dependencies : [evas_pre] + loader_deps,
- install : true,
- install_dir : mod_install_dir,
- name_suffix : sys_mod_extension
- )
- module_files += join_paths(mod_install_dir, 'lib'+loader + '.' + sys_mod_extension)
- else
- config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
- tmp = static_library('image_loader_'+loader, file,
- include_directories : config_dir,
- dependencies : [evas_pre] + loader_deps
- )
- evas_static_list += [declare_dependency(
- sources: file,
- dependencies: loader_deps,
- )]
- endif
- else
- message('Image loader '+loader+' disabled')
- endif
-endforeach
--- a/src/modules/evas/image_savers/meson.build
+++ /dev/null
@@ -1,42 +0,0 @@
-evas_image_savers_file = [
- evas_loader_saver_mod_eet,
- evas_loader_saver_mod_jpeg,
- evas_loader_saver_mod_png,
- evas_loader_saver_mod_tgv,
- evas_loader_saver_mod_tiff,
- evas_loader_saver_mod_webp
-]
-
-foreach loader_inst : evas_image_savers_file
- loader = loader_inst[0]
- loader_type = loader_inst[1]
- loader_deps = loader_inst[2]
- if get_option('evas-loaders-disabler').contains(loader) == false
- config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
- file = join_paths(loader, 'evas_image_save_'+loader+'.c')
- if loader_type == 'shared'
- evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
- mod_install_dir = join_paths(evas_package_modules, 'image_savers', loader, version_name)
- shared_module(loader, file,
- include_directories : config_dir,
- dependencies : [evas_pre] + loader_deps,
- install : true,
- install_dir : mod_install_dir,
- name_suffix : sys_mod_extension
- )
- module_files += join_paths(mod_install_dir, 'lib'+loader + '.' + sys_mod_extension)
- else
- config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
- tmp = static_library('image_saver_'+loader, file,
- include_directories : config_dir,
- dependencies : [evas_pre] + loader_deps
- )
- evas_static_list += [declare_dependency(
- sources: file,
- dependencies: loader_deps,
- )]
- endif
- else
- message('Image saver '+loader+' disabled')
- endif
-endforeach
--- a/src/modules/evas/meson.build
+++ b/src/modules/evas/meson.build
@@ -1,31 +1,6 @@
#fixed dependencies by efl
-png = dependency('libpng')
-tiff = dependency('libtiff-4', required: get_option('evas-loaders-disabler').contains('tiff') == false)
-giflib = cc.find_library('gif')
json = dependency('rlottie', required: get_option('evas-loaders-disabler').contains('json') == false)
-webp = dependency('libwebp', required: get_option('evas-loaders-disabler').contains('webp') == false)
-evas_loader_saver_mod_bmp = ['bmp', 'shared', []]
-evas_loader_saver_mod_eet = ['eet', 'static', [eet]]
-evas_loader_saver_mod_generic = ['generic', 'shared', [rt]]
-evas_loader_saver_mod_gif = ['gif', 'shared', [giflib]]
-evas_loader_saver_mod_ico = ['ico', 'shared', []]
-evas_loader_saver_mod_jpeg = ['jpeg', 'static', [jpeg]]
-evas_loader_saver_mod_pmaps = ['pmaps', 'shared', []]
-evas_loader_saver_mod_png = ['png', 'static', [png]]
-evas_loader_saver_mod_psd = ['psd', 'shared', []]
-evas_loader_saver_mod_tga = ['tga', 'shared', []]
-evas_loader_saver_mod_tgv = ['tgv', 'shared', [rg_etc, lz4]]
-evas_loader_saver_mod_tiff = ['tiff', 'shared', [tiff]]
-evas_loader_saver_mod_wbmp = ['wbmp', 'shared', []]
-evas_loader_saver_mod_webp = ['webp', 'shared', [webp]]
-evas_loader_saver_mod_xpm = ['xpm', 'shared', []]
-
-#there are a few modules that should NEVER be build as a module but rather be build as static lib and linked in later
-evas_static_list = []
-
-subdir('image_loaders')
-subdir('image_savers')
subdir('model_savers')
subdir('model_loaders')
subdir('vg_savers')

46
debian/patches/0006-build-efl-run-in-tree-make-exception-for-image-loade.patch vendored
View File

@ -1,46 +0,0 @@
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Sat, 5 Oct 2019 20:00:38 +0100
Subject: build - efl run in tree - make exception for image loaders/savers
due to meson's insistence on naming even moudles libmodule.so, and our
complexity of build as in the previous commits ... have a special case
for in tree module loading for these.
---
src/lib/evas/file/evas_module.c | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
--- a/src/lib/evas/file/evas_module.c
+++ b/src/lib/evas/file/evas_module.c
@@ -599,12 +599,27 @@
{
if (run_in_tree == 1)
{
- char subsystem[PATH_MAX];
+ // special cases due to compleixty of meson build and
+ // putting these in odd places in the tree - do special
+ // name lookups for build in tree module lookups
+ if (type == EVAS_MODULE_TYPE_IMAGE_LOADER)
+ {
+ snprintf(buffer, sizeof(buffer),
+ PACKAGE_BUILD_DIR"/src/lib/evas_goal/libshared_loader_%s"MOD_SUFFIX, name);
+ }
+ else if (type == EVAS_MODULE_TYPE_IMAGE_SAVER)
+ {
+ snprintf(buffer, sizeof(buffer),
+ PACKAGE_BUILD_DIR"/src/lib/evas_goal/libshared_saver_%s"MOD_SUFFIX, name);
+ }
+ else
+ {
+ char subsystem[PATH_MAX];
- snprintf(subsystem, sizeof(subsystem), "evas/%s", type_str);
- bs_mod_get(buffer, sizeof(buffer), subsystem, name);
- if (!evas_file_path_exists(buffer))
- buffer[0] = '\0';
+ snprintf(subsystem, sizeof(subsystem), "evas/%s", type_str);
+ bs_mod_get(buffer, sizeof(buffer), subsystem, name);
+ }
+ if (!evas_file_path_exists(buffer)) buffer[0] = '\0';
}
}
#endif

27
debian/patches/10_remove_google_analytics.diff vendored
View File

@ -1,27 +0,0 @@
Description: Remove remote js from html docs
The html docs load remote google analytics scripts. Since this can leak local
user actions, remove it.
Author: Ross Vandegrift <ross@kallisti.us>
Origin: other
Forwarded: no
Last-Update: 2018-10-11
--- a/doc/head.html
+++ b/doc/head.html
@@ -4,15 +4,7 @@
<head>
<title>$title</title>
- <!-- Global site tag (gtag.js) - Google Analytics -->
- <script async src="https://www.googletagmanager.com/gtag/js?id=UA-110876574-1"></script>
- <script>
- window.dataLayer = window.dataLayer || [];
- function gtag(){dataLayer.push(arguments);}
- gtag('js', new Date());
-
- gtag('config', 'UA-110876574-1');
- </script>
+ <!-- Google Analytics js removed from Debian packages -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="favicon.png" type="image/x-icon">

20
debian/patches/15_try_curl-gnutls.diff vendored
View File

@ -1,20 +0,0 @@
Description: Try to dlopen curl-gnutls
Since we link with gnutls, try to dlopen curl-gnutls (in addition to the
OpenSSL variant).
Author: Andreas Metzler <ametzler@debian.org>
Origin: other
Forwarded: no
Last-Update: 2016-08-19
--- a/src/lib/ecore_con/ecore_con_url_curl.c
+++ b/src/lib/ecore_con/ecore_con_url_curl.c
@@ -282,6 +282,9 @@
if (!_c->mod)
ERR("Could not find libcurl.5.dylib, libcurl.4.dylib, libcurl.so.5, libcurl.so.4");
#else
+# ifdef HAVE_GNUTLS
+ LOAD("libcurl-gnutls.so.4"); // try this one first
+# endif /* ifdef HAVE_GNUTLS */
LOAD("libcurl.so.5"); // try only
LOAD("libcurl.so.4"); // try only
if (!_c->mod)

19
debian/patches/20_disable_doxygen_timestamps.diff vendored
View File

@ -1,19 +0,0 @@
Description: disable doxygen html timestamps
This should improve repducibility of efl-doc.
Author: Ross Vandegrift <ross@kallisti.us>
Origin: other
Forwarded: no
Last-Update: 2018-06-16
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -904,7 +904,7 @@
# page will contain the date and time when the page was generated. Setting
# this to NO can help when comparing the output of multiple runs.
-HTML_TIMESTAMP = YES
+HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the

48
debian/patches/25_edje_check_luaold.diff vendored
View File

@ -1,48 +0,0 @@
Description: correct edje pkg-config generation for luaold
edje.pc gets its lua Requies entry from -Dlua-interpreter. But it
should get the appropriate versioned entry instead.
Author: Ross Vandegrift <ross@kallisti.us>
Origin: other
Forwarded: no
Last-Update: 2019-12-24
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/meson.build
+++ b/meson.build
@@ -268,6 +268,27 @@
]
endif
+luaold_interpreters = [
+ ['lua', ['>=5.1.0','<5.3.0']],
+ ['lua51', ['>=5.1.0','<5.2.0']],
+ ['lua-5.1', ['>=5.1.0','<5.2.0']],
+ ['lua5.1', ['>=5.1.0','<5.2.0']],
+ ['lua52', ['>=5.2.0','<5.3.0']],
+ ['lua-5.2', ['>=5.2.0','<5.3.0']],
+ ['lua5.2', ['>=5.2.0','<5.3.0']],
+]
+
+if get_option('lua-interpreter') == 'lua'
+ foreach l : luaold_interpreters
+ lua = dependency(l[0], version: l[1], required:false)
+ if lua.found() == true
+ break
+ endif
+ endforeach
+else
+ lua = dependency(get_option('lua-interpreter'))
+endif
+
subprojects = [
# name | option | mod | lib | bin | bench | tests | examples | pkg-config options | name of static libs
['evil' ,[] , false, true, false, false, false, false, [], []],
@@ -306,7 +327,7 @@
['efreet' ,[] , false, false, true, false, false, false, ['eina', 'efl', 'eo'], []],
['ecore_imf_evas' ,[] , false, true, false, false, false, false, ['eina', 'efl', 'eo'], []],
['ephysics' ,['physics'] , false, true, false, false, false, false, ['eina', 'efl', 'eo'], []],
-['edje' ,[] , false, true, true, false, true, true, ['evas', 'eo', 'efl', get_option('lua-interpreter')], []],
+['edje' ,[] , false, true, true, false, true, true, ['evas', 'eo', 'efl', lua], []],
['emotion' ,[] , true, true, false, false, true, true, ['eina', 'efl', 'eo'], []],
['ethumb' ,[] , true, true, true, false, false, false, ['eina', 'efl', 'eo'], []],
['ethumb_client' ,[] , false, true, true, false, false, true, ['eina', 'efl', 'eo', 'ethumb'], []],

27
debian/patches/30_drop_crashing_widget_previews.diff vendored
View File

@ -1,27 +0,0 @@
Description: skip a few elm widget previews
These preview generations crash sometimes, and the issue seems triggered by
build chroots. Disable it until this issue is figured out.
Author: Ross Vandegrift <ross@kallisti.us>
Origin: other
Forwarded: no
Last-Update: 2010-11-02
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -26,7 +26,7 @@
['clock', 'preview-00.png', 'widget_preview_clock', '200', '100'],
['colorselector', 'preview-00.png', 'widget_preview_colorselector', '320', '300'],
['conformant', 'preview-00.png', 'widget_preview_conformant', '200', '400'],
- ['combobox', 'preview-00.png', 'widget_preview_combobox', '300', '300'],
+ # ['combobox', 'preview-00.png', 'widget_preview_combobox', '300', '300'],
['ctxpopup', 'preview-00.png', 'widget_preview_ctxpopup', '200', '130'],
['datetime', 'preview-00.png', 'widget_preview_datetime1', '360', '60'],
['datetime', 'preview-01.png', 'widget_preview_datetime2', '200', '60'],
@@ -37,7 +37,7 @@
['entry', 'preview-01.png', 'widget_preview_entry2', '160', '50'],
['entry', 'preview-02.png', 'widget_preview_entry3', '160', '50'],
['entry', 'preview-03.png', 'widget_preview_entry4', '160', '50'],
- ['fileselector', 'preview-00.png', 'widget_preview_fileselector', '300', '300'],
+ # ['fileselector', 'preview-00.png', 'widget_preview_fileselector', '300', '300'],
['fileselector_button', 'preview-00.png', 'widget_preview_fileselector_button1', '200', '50'],
['fileselector_button', 'preview-01.png', 'widget_preview_fileselector_button2', '200', '50'],
['fileselector_button', 'preview-02.png', 'widget_preview_fileselector_button3', '160', '50'],

19
debian/patches/45_disable_doc_pack.diff vendored
View File

@ -1,19 +0,0 @@
Description: Don't build extra binary doc package
make doc builds a binary tar.gz of the docs. It takes a while, and we
don't need it to build efl-doc.
Author: Ross Vandegrift <ross@kallisti.us>
Forwarded: no
Last-Update: 2019-10-12
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -190,7 +190,7 @@
run_target('doc',
command: ['echo', 'Documentation sucessfully build!'],
- depends: compress_target,
+ depends: doc_target,
)
doxyfile_conf = configuration_data()

76
debian/patches/99-fix-shader-regen.diff vendored
View File

@ -1,76 +0,0 @@
Description: fix issues in shader code regeneration scripts
The EFL tarballs ship some generated source code that the Debian
package should re-generate on build. This patch includes fixes to that
process.
Author: Ross Vandegrift <ross@kallisti.us>
Origin: other
Forwarded: no
Last-Update: 2019-12-23
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/lib/ector/gl/shader/gen_shaders.sh
+++ b/src/lib/ector/gl/shader/gen_shaders.sh
@@ -6,19 +6,6 @@
OUTPUT="$DIR/ector_gl_shaders.x"
-# Skip generation if there is no diff (or no git)
-if ! git rev-parse 2>> /dev/null >> /dev/null ; then exit 0 ; fi
-if git diff --quiet --exit-code -- "$DIR"
-then
- for f in gen_shaders.sh fragment.glsl vertex.glsl include.glsl; do
- if [ "$DIR/$f" -nt "$OUTPUT" ]; then
- touch "$OUTPUT"
- break
- fi
- done
- exit 0
-fi
-
# Write header
rm -f "$OUTPUT.tmp"
cat <<EOF >> $OUTPUT.tmp
@@ -31,7 +18,8 @@
m4 "$DIR/include.glsl" "$DIR/$SHD.glsl" > "$SHD.tmp"
OIFS="$IFS"
- IFS=$'\n'
+ IFS=$'
+'
echo -n "static const char ${SHD}_glsl[] =" >> "$OUTPUT.tmp"
for LINE in `cat "$SHD.tmp"` ; do
printf "\n \"$LINE\\\n\"" >> "$OUTPUT.tmp"
--- a/src/modules/evas/engines/gl_common/shader/gen_shaders.sh
+++ b/src/modules/evas/engines/gl_common/shader/gen_shaders.sh
@@ -13,14 +13,6 @@
# Skip generation if file can not be written to
if [ -e ${OUTPUT} ] && [ ! -w ${OUTPUT} ] ; then exit 0; fi
-# Skip generation if there is no diff (or no git)
-if ! git rev-parse 2>> /dev/null >> /dev/null ; then exit 0 ; fi
-if git diff --quiet --exit-code -- "$DIR"
-then
- touch "$OUTPUT"
- exit 0
-fi
-
exec 1<&-
exec 1>"$OUTPUT"
--- a/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh
+++ b/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh
@@ -13,14 +13,6 @@
# Skip generation if file can not be written to
if [ -e ${OUTPUT} ] && [ ! -w ${OUTPUT} ] ; then exit 0; fi
-# Skip generation if there is no diff (or no git)
-if ! git rev-parse 2>> /dev/null >> /dev/null ; then exit 0 ; fi
-if git diff --quiet --exit-code -- "$DIR"
-then
- touch "$OUTPUT"
- exit 0
-fi
-
exec 1<&-
exec 1>"$OUTPUT"

10
debian/patches/series vendored
View File

@ -1,10 +0,0 @@
10_remove_google_analytics.diff
15_try_curl-gnutls.diff
20_disable_doxygen_timestamps.diff
25_edje_check_luaold.diff
30_drop_crashing_widget_previews.diff
45_disable_doc_pack.diff
99-fix-shader-regen.diff
0004-build-bring-back-loaders-and-savers-as-modules-and-o.patch
0005-build-images-loaders-and-saver-modules-need-to-link-.patch
0006-build-efl-run-in-tree-make-exception-for-image-loade.patch

2
debian/source/format vendored
View File

@ -1 +1 @@
3.0 (quilt)
3.0 (native)