[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - avmedia/Module_avmedia.mk postprocess/Rdb_services.mk

[Douglas Mencken]

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

New commits:
commit ef4b7cd046cebfc0f872647bc9c46af0ef4792c4
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Sun Oct 5 08:11:22 2014 -0400

    avmediaMacAVF is not available on OS X 10.5/10.6
    
    Related commit: 4fa8282816cb39692678e9da6b6693e821a3039b
    
    Change-Id: Ice433ac738096c4142cc78ce793f2b2f1e2a1708

diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index f0108e5..6a97e69 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -44,10 +44,14 @@ endif
 endif
 
 ifeq ($(OS),MACOSX)
+ifneq (1050,$(MACOSX_SDK_VERSION))
+ifneq (1060,$(MACOSX_SDK_VERSION))
 $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmediaMacAVF \
 ))
 endif
+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 1e84bd4..b88e763 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -124,7 +124,9 @@ $(eval $(call gb_Rdb_add_components,services,\
 	writerperfect/source/writer/wpftwriter \
 	writerperfect/source/calc/wpftcalc \
 	$(if $(filter MACOSX,$(OS)), \
-		$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
+		$(if $(filter 1050 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) \
 		) \