diff options
| author | TheRock Builder <libo@therock> | 2021-12-03 16:39:43 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-04 05:01:23 +0100 |
| commit | 35cc52f77804eda54d4e466da1b2afbdc1555ef3 (patch) | |
| tree | 1fa38b137ad6a9b4efe24bfd7fe1e52e1385d9c8 /avmedia | |
| parent | 33f3470474dd79a3a0eae1f6cb369e6400b58b6a (diff) | |
Fix --disable-(avmedia|scripting)
So it's not a good idea to change the patch without testing it
again. I'm still hoping for a better usable MediaItem then the
previous dummy. The ODF stores a preview image and it should
allow to export the media.
The scripting fix feels like a workaround. somehow the final
class specifier triggers something that makes the linker fail
with missing destructors for all std::unique_ptr objects
derivated from SbxFactory. Implementing these as virtual
overrides didn't help, neither as {} or = default. So this
removes them in the !"#if HAVE_FEATURE_SCRIPTING" case.
Change-Id: I9f6751f44e0247ed31c27be0ee816239795e9372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126330
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/Library_avmedia.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 420bbded8178..a9a9440346ba 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -16,8 +16,13 @@ $(eval $(call gb_Library_set_include,avmedia,\ )) $(eval $(call gb_Library_use_libraries,avmedia,\ + comphelper \ + cppu \ + cppuhelper \ sal \ svl \ + ucbhelper \ + vcl \ )) $(eval $(call gb_Library_use_sdk_api,avmedia,)) @@ -44,16 +49,11 @@ $(eval $(call gb_Library_use_externals,avmedia,\ $(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia)) $(eval $(call gb_Library_use_libraries,avmedia,\ - comphelper \ - ucbhelper \ - cppu \ - cppuhelper \ i18nlangtag \ sfx \ svt \ tl \ utl \ - vcl \ )) $(eval $(call gb_Library_add_exception_objects,avmedia,\ |