diff options
| author | Douglas Mencken <dougmencken@gmail.com> | 2016-09-25 04:49:44 -0400 |
|---|---|---|
| committer | jan iversen <jani@documentfoundation.org> | 2016-10-14 06:42:49 +0000 |
| commit | 78310ffb41cd00a1d0a7ab15a5c44cae02c08184 (patch) | |
| tree | 07f273c201c6249e4594898134678e2fa402323d | |
| parent | 833d952a5735f5128ab4e8af0b9c60218254e3bd (diff) | |
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@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | avmedia/Module_avmedia.mk | 2 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index 47a1ad0f1c34..7c8597618807 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 a037b4d5d019..3aebcab202ac 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 f56e55bccb67..e22623be9417 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) \ ) \ ) \ |