diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-21 13:06:33 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-21 17:30:31 +0100 |
| commit | d7bc33b5bfc4174e7190dd56e981ae7287b7a258 (patch) | |
| tree | 96390f4ac8f93acdfd804deca8fff0e8cd34c374 /avmedia/Library_avmedia.mk | |
| parent | 87cdb3e51f90267be77d535b3acd368bad2f5999 (diff) | |
Keep GUI with --enable-avmedia and --disable-gui
So I thought I could come up with a rich MediaItem and can get
rid of all the GUI elements. But all the still needed features
require a MediaWindow. Probably not for real, but there are
multiple levels of createPlayer (some static) in MediaWindow
and priv::MediaWindowImpl.
Untangling this will require more time, so just return to the old
--disable-gui state with actually keeping all the GUI elements.
Regression from commit f9e79a91f15e10ededad0f103c4ffe0ca38fcb31
("Fix --disable-avmedia for DESKTOP build")...
Change-Id: I2b04459003d474cd3abf8b086f2f20f17274a7ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127226
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'avmedia/Library_avmedia.mk')
| -rw-r--r-- | avmedia/Library_avmedia.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 83148b915c8d..a337fa9cae73 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -45,6 +45,7 @@ ifeq ($(DISABLE_GUI),) $(eval $(call gb_Library_use_externals,avmedia,\ epoxy \ )) +endif $(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia,services)) @@ -67,7 +68,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\ avmedia/source/viewer/mediawindow_impl \ )) -endif # !DISABLE_GUI endif # AVMEDIA # vim: set noet sw=4 ts=4: |