[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, 3 insertions(+), 3 deletions(-)

New commits:
commit 78310ffb41cd00a1d0a7ab15a5c44cae02c08184
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Sun Sep 25 04:49:44 2016 -0400

    The logic is “ no QuickTime™ in the 10.12 SDK & beyond ”
    
    instead of “ QuickTime only in 10.8 10.9 10.10 & 10.11 ”
    
    related commits are
      a4e81b7c313e5cb0e0f23a8605502b4b0b7f599e
      bfbbbd87d33c0d51a9ff844f2175400b753ba5b9
    
    Change-Id: Ie65abb736aa11ad063edeaed798d2e03db1684fe
    Reviewed-on: https://gerrit.libreoffice.org/29268
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/Repository.mk b/Repository.mk
index 47a1ad0..7c85976 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -283,7 +283,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(if $(filter MACOSX,$(OS)),\
 		avmediaMacAVF \
 		$(if $(ENABLE_MACOSX_SANDBOX),,\
-			$(if $(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)),avmediaQuickTime) \
+			$(if $(shell test $(MACOSX_SDK_VERSION) -ge 101200 || echo not),avmediaQuickTime) \
 		) \
 	) \
 	$(call gb_Helper_optional,SCRIPTING, \
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index a037b4d..3aebcab 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -37,7 +37,7 @@ endif
 
 ifeq ($(OS),MACOSX)
 ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
-ifneq ($(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)),)
+ifneq ($(shell test $(MACOSX_SDK_VERSION) -ge 101200; echo $$?),0)
 $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmediaQuickTime \
 ))
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index f56e55b..e22623b 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -127,7 +127,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	$(if $(filter MACOSX,$(OS)), \
 		$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
 		$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
-			$(if $(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)), \
+			$(if $(shell test $(MACOSX_SDK_VERSION) -ge 101200 || echo nope), \
 				$(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
 			) \
 		) \