[Libreoffice-commits] core.git: avmedia/Module_avmedia.mk postprocess/Rdb_services.mk

[Tor Lillqvist]

 avmedia/Module_avmedia.mk   |    7 ++++++-
 postprocess/Rdb_services.mk |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit c0a3bc0570439bad6f2e105cb38b4bd073839e05
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu May 15 18:57:31 2014 +0300

    The AVMedia framework is not deprecated
    
    So no reason to avoid it when building for the Mac App Store
    (i.e. when building a sandboxed LibreOffice). (At least I assume it
    was because of the deprecatedness of QuickTime that it was conditional
    on not building a sandboxed LibreOffice.)
    
    Change-Id: I9d50490aa878ba5e40594b39eac88f23df3ef0a6

diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 6046ab5..f0108e5 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -38,12 +38,17 @@ endif
 ifeq ($(OS),MACOSX)
 ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
 $(eval $(call gb_Module_add_targets,avmedia,\
-	Library_avmediaMacAVF \
 	Library_avmediaQuickTime \
 ))
 endif
 endif
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,avmedia,\
+	Library_avmediaMacAVF \
+))
+endif
+
 ifneq ($(ENABLE_DIRECTX),)
 $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmediawin \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index b22a9d7..5470902 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -121,8 +121,8 @@ $(eval $(call gb_Rdb_add_components,services,\
 	writerperfect/source/impress/wpftimpress \
 	writerperfect/source/writer/wpftwriter \
 	$(if $(filter MACOSX,$(OS)), \
+		$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
 		$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
-			$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
 			$(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
 		) \
 		lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \