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

[Douglas Mencken]

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

New commits:
commit b536cabf97288061d7b91e131b16d2a525352571
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Wed Jul 2 19:43:12 2014 -0400

    fix build errors related to AVFoundation @ OS X <10.7
    
    AVFoundation framework is available in OS X v10.7 and later
    
    related commits:
      7822b5535cccc68e5b454d04a66a6b4f27675ec6
      0b49cc5b03b39aa1dfddf924c6eaf8cb42e791a8
    
    Change-Id: If771fca79c41d70e51eab533faec7bb9997803b7
    Reviewed-on: https://gerrit.libreoffice.org/9769
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/Repository.mk b/Repository.mk
index 1c4298b..53d124b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -228,7 +228,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	acc \
 	$(call gb_Helper_optional,AVMEDIA,avmedia) \
 	$(if $(filter MACOSX,$(OS)),\
-		$(if $(filter-out 1060,$(MACOSX_SDK_VERSION)),avmediaMacAVF) \
+		$(if $(filter-out 1050 1060,$(MACOSX_SDK_VERSION)),avmediaMacAVF) \
 		$(if $(ENABLE_MACOSX_SANDBOX),,avmediaQuickTime) \
 	) \
 	$(if $(DISABLE_SCRIPTING),,basctl) \
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index bd0382d..6a97e69 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -44,12 +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 a1fe9bc..98667ad 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -122,7 +122,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	writerperfect/source/writer/wpftwriter \
 	writerperfect/source/calc/wpftcalc \
 	$(if $(filter MACOSX,$(OS)), \
-		$(if $(filter 1060,$(MACOSX_SDK_VERSION)),, \
+		$(if $(filter 1050 1060,$(MACOSX_SDK_VERSION)),, \
 			$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
 		) \
 		$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \