avmedia/Module_avmedia.mk | 2 ++
postprocess/Rdb_services.mk | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 0a829b062ce710e75aff89543d88898a1733f8fd
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu May 15 19:24:19 2014 +0300
The AVFoundation framework appeared in OS X 10.7
Change-Id: I76eb213ff4cb93196ea81dd43a465da61c0cdee2
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index f0108e5..bd0382d 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -44,10 +44,12 @@ endif
endif
ifeq ($(OS),MACOSX)
+ifneq (1060,$(MACOSX_SDK_VERSION))
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaMacAVF \
))
endif
+endif
ifneq ($(ENABLE_DIRECTX),)
$(eval $(call gb_Module_add_targets,avmedia,\
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 5470902..9ebe6d2 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -121,7 +121,9 @@ $(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 1060,$(MACOSX_SDK_VERSION)),, \
+ $(call
gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
+ ) \
$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
$(call
gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
