avmedia/Library_avmedia.mk | 2 +-
distro-configs/LibreOfficeOssFuzz.conf | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit d7bc33b5bfc4174e7190dd56e981ae7287b7a258
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Tue Dec 21 13:06:33 2021 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Tue Dec 21 17:30:31 2021 +0100
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 <glo...@fbihome.de>
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:
diff --git a/distro-configs/LibreOfficeOssFuzz.conf
b/distro-configs/LibreOfficeOssFuzz.conf
index 5b1d167dbc37..434452a673f0 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -2,7 +2,6 @@
--enable-ld=gold
--disable-dynamic-loading
--disable-runtime-optimizations
---disable-avmedia
--disable-scripting
--disable-cairo-canvas
--disable-coinmp
